Upgrade sonar-scala to 7.8.0. (#17)

sonar-scala · Dec 24, 2019 · ce8f984 · ce8f984
1 parent 1ae2971
commit ce8f984
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # sonar-scala-docker
 
 [![GitHub version](https://img.shields.io/badge/release-v3.7.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
-[![GitHub version lts](<https://img.shields.io/badge/release_(LTS_7.9)-v4.0.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
-[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(LTS_6.7)-v2.12.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
+[![GitHub version lts](<https://img.shields.io/badge/release_(for_SonarQube_LTS_7.9)-v4.1.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
+[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(for_SonarQube_LTS_6.7)-v2.12.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
 [![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
 
 Docker images and docker-compose recipes for out-of-the-box
@@ -36,7 +36,7 @@ You can also use a standalone docker image which contains SonarQube server with
 bundled sonar-scala plugin,
 [`mwizner/sonarqube-scala-plugins:3.7.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
 and
-[`mwizner/sonarqube-scala-plugins:4.0.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
+[`mwizner/sonarqube-scala-plugins:4.1.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
 for the current LTS version. Alternatively, we also provide an image for the old
 6.7 LTS version -
 [`mwizner/sonarqube-scala-plugins:2.12.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
@@ -85,7 +85,7 @@ scapegoat support)
 |Version | SonarQube | sonar-scala | sonar-scala-extra|
 |--------|-----------|-------------|------------------|
 [3.7.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/3.7.0) | 7.8 [documentation](https://docs.sonarqube.org/7.8), [changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14939) | [7.6.0](https://github.com/mwz/sonar-scala/releases/tag/v7.6.0)
-[4.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.0.0) | 7.9.1 LTS [documentation](https://docs.sonarqube.org/7.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029) | [7.7.0](https://github.com/mwz/sonar-scala/releases/tag/v7.7.0)
+[4.1.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.1.0) | 7.9.1 LTS [documentation](https://docs.sonarqube.org/7.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029) | [7.8.0](https://github.com/mwz/sonar-scala/releases/tag/v7.8.0)
 [2.12.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.12.0) | 6.7.7 LTS [documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation), [changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14865) | [6.8.0](https://github.com/mwz/sonar-scala/releases/tag/v6.8.0)
 <!-- prettier-ignore-end -->
 
@@ -146,6 +146,12 @@ scapegoat support)
         <td><a href="https://github.com/mwz/sonar-scala/releases/tag/v7.0.0">7.0.0</td>
         <td></td>
     </tr>
+    <tr>
+        <td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.0.0">4.0.0</a></td>
+        <td>7.9.1 LTS <a href="https://docs.sonarqube.org/7.9">documentation</a>, <a href="https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029">changelog</a></td>
+        <td><a href="https://github.com/mwz/sonar-scala/releases/tag/v7.7.0">7.7.0</td>
+        <td></td>
+    </tr>
     <tr>
         <td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.12.0">2.12.0</a></td>
         <td>6.7.7 LTS <a href="https://docs.sonarqube.org/display/SONARQUBE67/Documentation">documentation</a>, <a href="https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14865">changelog</a></td>
@@ -242,6 +248,7 @@ way to automate analysis of Scala projects with SonarQube.
 <details>
   <summary>Expand to see the changelog.</summary>
   <ul>
+    <li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>
     <li><strong>4.0.0</strong> - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.</li>
     <li><strong>3.7.0</strong> - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.</li>
     <li><strong>3.6.0</strong> - Upgraded sonar-scala to 7.5.0 & SonarQube to 7.7.</li>

diff --git a/README.tpl.md b/README.tpl.md
@@ -1,8 +1,8 @@
 # sonar-scala-docker
 
 [![GitHub version](https://img.shields.io/badge/release-v{{current.version}}-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
-[![GitHub version lts](<https://img.shields.io/badge/release_(LTS_7.9)-v{{lts.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
-[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(LTS_6.7)-v{{lts67.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
+[![GitHub version lts](<https://img.shields.io/badge/release_(for_SonarQube_LTS_7.9)-v{{lts.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
+[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(for_SonarQube_LTS_6.7)-v{{lts67.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
 [![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
 
 Docker images and docker-compose recipes for out-of-the-box
@@ -132,6 +132,7 @@ way to automate analysis of Scala projects with SonarQube.
 <details>
   <summary>Expand to see the changelog.</summary>
   <ul>
+    <li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>
     <li><strong>4.0.0</strong> - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.</li>
     <li><strong>3.7.0</strong> - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.</li>
     <li><strong>3.6.0</strong> - Upgraded sonar-scala to 7.5.0 & SonarQube to 7.7.</li>

diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md
@@ -1,10 +1,10 @@
 Docker images with out-of-the-box
 [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and
 [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) instance with
-support for [Scala](http://www.scala-lang.org),
-[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin) (code coverage
-metrics) and [Scalastyle](http://www.scalastyle.org) +
-[Scapegoat](https://github.com/sksamuel/scapegoat) (static code analysis).
+support for **[Scala](http://www.scala-lang.org)**,
+**[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin)** (code
+coverage metrics) and **[Scalastyle](http://www.scalastyle.org)** +
+**[Scapegoat](https://github.com/sksamuel/scapegoat)** (static code analysis).
 
 ## Available versions
 
@@ -22,11 +22,11 @@ sonar-scala provides Scapegoat support from version `6.5.0` onwards.
   `3.7.0-full`
   [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.7.0-full/Dockerfile),
   [Release 3.7.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.7.0)
-- `4.0.0` (7.9 LTS)
-  [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.0.0/Dockerfile),
-  `4.0.0-full` (7.9 LTS)
-  [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.0.0-full/Dockerfile),
-  [Release 4.0.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.0.0)
+- `4.1.0` (7.9 LTS)
+  [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0/Dockerfile),
+  `4.1.0-full` (7.9 LTS)
+  [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0-full/Dockerfile),
+  [Release 4.1.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.1.0)
 - `2.12.0` (6.7 LTS)
   [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.12.0/Dockerfile),
   `2.12.0-full` (6.7 LTS)
@@ -43,8 +43,8 @@ Version | SonarQube | sonar-scala |
 --------|-----------|-------------|
 3.7.0 || 7.6.0 |
 3.7.0-full | 7.8 | 7.6.0 |
-4.0.0 || 7.7.0 |
-4.0.0-full | 7.9.1 LTS | 7.7.0 |
+4.1.0 || 7.8.0 |
+4.1.0-full | 7.9.1 LTS | 7.8.0 |
 2.12.0 || 6.8.0 |
 2.12.0-full | 6.7.7 LTS | 6.8.0 |
 <!-- prettier-ignore-end -->

diff --git a/README_DOCKERHUB.tpl.md b/README_DOCKERHUB.tpl.md
@@ -1,10 +1,10 @@
 Docker images with out-of-the-box
 [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and
 [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) instance with
-support for [Scala](http://www.scala-lang.org),
-[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin) (code coverage
-metrics) and [Scalastyle](http://www.scalastyle.org) +
-[Scapegoat](https://github.com/sksamuel/scapegoat) (static code analysis).
+support for **[Scala](http://www.scala-lang.org)**,
+**[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin)** (code
+coverage metrics) and **[Scalastyle](http://www.scalastyle.org)** +
+**[Scapegoat](https://github.com/sksamuel/scapegoat)** (static code analysis).
 
 ## Available versions
 

diff --git a/dev/build.sh b/dev/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-export SONAR_SCALA_VERSION=7.7.0-SNAPSHOT
+export SONAR_SCALA_VERSION=7.9.0-SNAPSHOT
 cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.12-assembly.jar .
 docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .
diff --git a/docker-compose-lts.yml b/docker-compose-lts.yml
@@ -21,7 +21,7 @@ services:
     depends_on:
       - db-lts
   db-lts:
-    image: postgres:10.10-alpine
+    image: postgres:10.11-alpine
     networks:
       - sonarnet_lts
     environment:
@@ -31,7 +31,7 @@ services:
       - postgresql_lts:/var/lib/postgresql
       - postgresql_lts_data:/var/lib/postgresql/data
   plugins-lts:
-    image: mwizner/sonarqube-scala-plugins:4.0.0
+    image: mwizner/sonarqube-scala-plugins:4.1.0
     volumes:
       - sonarqube_lts_plugins:/opt/sonarqube/extensions/plugins
     command: /bin/true

diff --git a/lts/Dockerfile b/lts/Dockerfile
@@ -4,7 +4,7 @@
 FROM bitnami/minideb:stretch
 RUN install_packages curl ca-certificates
 
-ENV SONAR_SCALA_VERSION 7.7.0
+ENV SONAR_SCALA_VERSION 7.8.0
 
 RUN groupadd -r sonarqube && useradd -r -g sonarqube sonarqube
 WORKDIR /opt/sonarqube/extensions/plugins

diff --git a/lts/full/Dockerfile b/lts/full/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM sonarqube:7.9.1-community
 
-ENV SONAR_SCALA_VERSION 7.7.0
+ENV SONAR_SCALA_VERSION 7.8.0
 
 WORKDIR /opt/sonarqube/extensions/plugins
 RUN rm sonar-scala-plugin-* && curl -L -o "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \

diff --git a/vars.json b/vars.json
@@ -7,11 +7,11 @@
     "sonarScala": "7.6.0"
   },
   "lts": {
-    "version": "4.0.0",
+    "version": "4.1.0",
     "sonar": "7.9.1 LTS",
     "sonarDocs": "https://docs.sonarqube.org/7.9",
     "sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029",
-    "sonarScala": "7.7.0"
+    "sonarScala": "7.8.0"
   },
   "lts67": {
     "version": "2.12.0",
@@ -80,6 +80,13 @@
       }
     ],
     "lts": [
+      {
+        "version": "4.0.0",
+        "sonar": "7.9.1 LTS",
+        "sonarDocs": "https://docs.sonarqube.org/7.9",
+        "sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029",
+        "sonarScala": "7.7.0"
+      },
       {
         "version": "2.12.0",
         "sonar": "6.7.7 LTS",