diff --git a/README.md b/README.md index 96ba53d..461c648 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 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://github.com/mwz/sonarqube-scala-docker/releases) +[![GitHub version lts]()](https://github.com/mwz/sonarqube-scala-docker/releases) [![GitHub version lts 6.7]()](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) @@ -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)(or `mwizner/sonarqube-scala-plugins:latest-full`) and -[`mwizner/sonarqube-scala-plugins:4.1.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) +[`mwizner/sonarqube-scala-plugins:4.2.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) (or `mwizner/sonarqube-scala-plugins:latest-lts-full`) for the current LTS version. Alternatively, we also provide an image for the old SonarQube 6.7 LTS version - @@ -86,7 +86,7 @@ scapegoat support)_ |Version | SonarQube | sonar-scala | |--------|-----------|-------------| [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.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) +[4.2.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.2.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.9.0](https://github.com/mwz/sonar-scala/releases/tag/v7.9.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) @@ -147,6 +147,12 @@ scapegoat support)_ 7.0.0 + + 4.1.0 + 7.9.1 LTS documentation, changelog + 7.8.0 + + 4.0.0 7.9.1 LTS documentation, changelog @@ -249,6 +255,7 @@ way to automate analysis of Scala projects with SonarQube.
Expand to see the changelog.
    +
  • 4.2.0 - Upgraded sonar-scala to 7.9.0.
  • 4.1.0 - Upgraded sonar-scala to 7.8.0.
  • 4.0.0 - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.
  • 3.7.0 - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.
  • diff --git a/README.tpl.md b/README.tpl.md index 51e0923..cc81cbe 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -133,6 +133,7 @@ way to automate analysis of Scala projects with SonarQube.
    Expand to see the changelog.
      +
    • 4.2.0 - Upgraded sonar-scala to 7.9.0.
    • 4.1.0 - Upgraded sonar-scala to 7.8.0.
    • 4.0.0 - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.
    • 3.7.0 - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.
    • diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md index 9fd464a..4a169dd 100644 --- a/README_DOCKERHUB.md +++ b/README_DOCKERHUB.md @@ -22,11 +22,11 @@ sonar-scala provides Scapegoat support from version `6.5.0` onwards. `3.7.0-full`, `latest-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.1.0`, `latest-lts` (7.9 LTS) - [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0/Dockerfile), - `4.1.0-full`, `latest-lts-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) +- `4.2.0`, `latest-lts` (7.9 LTS) + [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.2.0/Dockerfile), + `4.2.0-full`, `latest-lts-full` (7.9 LTS) + [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.2.0-full/Dockerfile), + [Release 4.2.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.2.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) @@ -38,16 +38,14 @@ For older versions please check the ## What's included - -Version | SonarQube | sonar-scala | ---------|-----------|-------------| -3.7.0 || 7.6.0 | -3.7.0-full | 7.8 | 7.6.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 | - +| Version | SonarQube | sonar-scala | +| ------------------------ | ----------------- | ---------------------- | +| 3.7.0 | | 7.6.0 | +| 3.7.0-full | 7.8 | 7.6.0 | +| 4.2.0 | | 7.9.0 | +| 4.2.0-full | 7.9.1 LTS | 7.9.0 | +| 2.12.0 | | 6.8.0 | +| 2.12.0-full | 6.7.7 LTS | 6.8.0 | ## Usage diff --git a/README_DOCKERHUB.tpl.md b/README_DOCKERHUB.tpl.md index 881f367..855484b 100644 --- a/README_DOCKERHUB.tpl.md +++ b/README_DOCKERHUB.tpl.md @@ -38,16 +38,14 @@ For older versions please check the ## What's included - -Version | SonarQube | sonar-scala | ---------|-----------|-------------| -{{current.version}} || {{current.sonarScala}} | -{{current.version}}-full | {{current.sonar}} | {{current.sonarScala}} | -{{lts.version}} || {{lts.sonarScala}} | -{{lts.version}}-full | {{lts.sonar}} | {{lts.sonarScala}} | -{{lts67.version}} || {{lts67.sonarScala}} | -{{lts67.version}}-full | {{lts67.sonar}} | {{lts67.sonarScala}} | - +| Version | SonarQube | sonar-scala | +| ------------------------ | ----------------- | ---------------------- | +| {{current.version}} | | {{current.sonarScala}} | +| {{current.version}}-full | {{current.sonar}} | {{current.sonarScala}} | +| {{lts.version}} | | {{lts.sonarScala}} | +| {{lts.version}}-full | {{lts.sonar}} | {{lts.sonarScala}} | +| {{lts67.version}} | | {{lts67.sonarScala}} | +| {{lts67.version}}-full | {{lts67.sonar}} | {{lts67.sonarScala}} | ## Usage diff --git a/dev/build.sh b/dev/build.sh index 77047a7..9e1ee58 100755 --- a/dev/build.sh +++ b/dev/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -eu -export SONAR_SCALA_VERSION=7.9.0-SNAPSHOT +export SONAR_SCALA_VERSION=7.10.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 index b4a273c..86d6b45 100644 --- a/docker-compose-lts.yml +++ b/docker-compose-lts.yml @@ -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.1.0 + image: mwizner/sonarqube-scala-plugins:4.2.0 volumes: - sonarqube_lts_plugins:/opt/sonarqube/extensions/plugins command: /bin/true diff --git a/lts/Dockerfile b/lts/Dockerfile index 44e3b0d..3bd5bc9 100644 --- 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.8.0 +ENV SONAR_SCALA_VERSION 7.9.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 index 3e12769..115017d 100644 --- a/lts/full/Dockerfile +++ b/lts/full/Dockerfile @@ -2,7 +2,7 @@ FROM sonarqube:7.9.1-community -ENV SONAR_SCALA_VERSION 7.8.0 +ENV SONAR_SCALA_VERSION 7.9.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 index 4c86b9f..cd3c200 100644 --- a/vars.json +++ b/vars.json @@ -7,11 +7,11 @@ "sonarScala": "7.6.0" }, "lts": { - "version": "4.1.0", + "version": "4.2.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.8.0" + "sonarScala": "7.9.0" }, "lts67": { "version": "2.12.0", @@ -80,6 +80,13 @@ } ], "lts": [ + { + "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.8.0" + }, { "version": "4.0.0", "sonar": "7.9.1 LTS",