Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 4cd3bb3

Browse files
mwzmwz
authored
Upgrade sonar-scala to 7.9.0. (#21)
1 parent 24190cd commit 4cd3bb3

File tree

9 files changed

+45
-34
lines changed

9 files changed

+45
-34
lines changed

‎README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# sonar-scala-docker
22

33
[![GitHub version](https://img.shields.io/badge/release-v3.7.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
4-
[![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)
4+
[![GitHub version lts](<https://img.shields.io/badge/release_(for_SonarQube_LTS_7.9)-v4.2.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
55
[![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)
66
[![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
77

@@ -36,7 +36,7 @@ You can also use a standalone docker image which contains SonarQube server with
3636
bundled sonar-scala plugin,
3737
[`mwizner/sonarqube-scala-plugins:3.7.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or
3838
`mwizner/sonarqube-scala-plugins:latest-full`) and
39-
[`mwizner/sonarqube-scala-plugins:4.1.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
39+
[`mwizner/sonarqube-scala-plugins:4.2.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
4040
(or `mwizner/sonarqube-scala-plugins:latest-lts-full`) for the current LTS
4141
version. Alternatively, we also provide an image for the old SonarQube 6.7 LTS
4242
version -
@@ -86,7 +86,7 @@ scapegoat support)_
8686
|Version | SonarQube | sonar-scala |
8787
|--------|-----------|-------------|
8888
[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)
89-
[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)
89+
[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)
9090
[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)
9191
<!-- prettier-ignore-end -->
9292

@@ -147,6 +147,12 @@ scapegoat support)_
147147
<td><a href="https://github.com/mwz/sonar-scala/releases/tag/v7.0.0">7.0.0</td>
148148
<td></td>
149149
</tr>
150+
<tr>
151+
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.1.0">4.1.0</a></td>
152+
<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>
153+
<td><a href="https://github.com/mwz/sonar-scala/releases/tag/v7.8.0">7.8.0</td>
154+
<td></td>
155+
</tr>
150156
<tr>
151157
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.0.0">4.0.0</a></td>
152158
<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>
@@ -249,6 +255,7 @@ way to automate analysis of Scala projects with SonarQube.
249255
<details>
250256
<summary>Expand to see the changelog.</summary>
251257
<ul>
258+
<li><strong>4.2.0</strong> - Upgraded sonar-scala to 7.9.0.</li>
252259
<li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>
253260
<li><strong>4.0.0</strong> - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.</li>
254261
<li><strong>3.7.0</strong> - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.</li>

‎README.tpl.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ way to automate analysis of Scala projects with SonarQube.
133133
<details>
134134
<summary>Expand to see the changelog.</summary>
135135
<ul>
136+
<li><strong>4.2.0</strong> - Upgraded sonar-scala to 7.9.0.</li>
136137
<li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>
137138
<li><strong>4.0.0</strong> - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.</li>
138139
<li><strong>3.7.0</strong> - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.</li>

‎README_DOCKERHUB.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ sonar-scala provides Scapegoat support from version `6.5.0` onwards.
2222
`3.7.0-full`, `latest-full`
2323
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.7.0-full/Dockerfile),
2424
[Release 3.7.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.7.0)
25-
- `4.1.0`, `latest-lts` (7.9 LTS)
26-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0/Dockerfile),
27-
`4.1.0-full`, `latest-lts-full` (7.9 LTS)
28-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0-full/Dockerfile),
29-
[Release 4.1.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.1.0)
25+
- `4.2.0`, `latest-lts` (7.9 LTS)
26+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.2.0/Dockerfile),
27+
`4.2.0-full`, `latest-lts-full` (7.9 LTS)
28+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.2.0-full/Dockerfile),
29+
[Release 4.2.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.2.0)
3030
- `2.12.0` (6.7 LTS)
3131
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.12.0/Dockerfile),
3232
`2.12.0-full` (6.7 LTS)
@@ -38,16 +38,14 @@ For older versions please check the
3838

3939
## What's included
4040

41-
<!-- prettier-ignore-start -->
42-
Version | SonarQube | sonar-scala |
43-
--------|-----------|-------------|
44-
3.7.0 || 7.6.0 |
45-
3.7.0-full | 7.8 | 7.6.0 |
46-
4.1.0 || 7.8.0 |
47-
4.1.0-full | 7.9.1 LTS | 7.8.0 |
48-
2.12.0 || 6.8.0 |
49-
2.12.0-full | 6.7.7 LTS | 6.8.0 |
50-
<!-- prettier-ignore-end -->
41+
| Version | SonarQube | sonar-scala |
42+
| ------------------------ | ----------------- | ---------------------- |
43+
| 3.7.0 | | 7.6.0 |
44+
| 3.7.0-full | 7.8 | 7.6.0 |
45+
| 4.2.0 | | 7.9.0 |
46+
| 4.2.0-full | 7.9.1 LTS | 7.9.0 |
47+
| 2.12.0 | | 6.8.0 |
48+
| 2.12.0-full | 6.7.7 LTS | 6.8.0 |
5149

5250
## Usage
5351

‎README_DOCKERHUB.tpl.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ For older versions please check the
3838

3939
## What's included
4040

41-
<!-- prettier-ignore-start -->
42-
Version | SonarQube | sonar-scala |
43-
--------|-----------|-------------|
44-
{{current.version}} || {{current.sonarScala}} |
45-
{{current.version}}-full | {{current.sonar}} | {{current.sonarScala}} |
46-
{{lts.version}} || {{lts.sonarScala}} |
47-
{{lts.version}}-full | {{lts.sonar}} | {{lts.sonarScala}} |
48-
{{lts67.version}} || {{lts67.sonarScala}} |
49-
{{lts67.version}}-full | {{lts67.sonar}} | {{lts67.sonarScala}} |
50-
<!-- prettier-ignore-end -->
41+
| Version | SonarQube | sonar-scala |
42+
| ------------------------ | ----------------- | ---------------------- |
43+
| {{current.version}} | | {{current.sonarScala}} |
44+
| {{current.version}}-full | {{current.sonar}} | {{current.sonarScala}} |
45+
| {{lts.version}} | | {{lts.sonarScala}} |
46+
| {{lts.version}}-full | {{lts.sonar}} | {{lts.sonarScala}} |
47+
| {{lts67.version}} | | {{lts67.sonarScala}} |
48+
| {{lts67.version}}-full | {{lts67.sonar}} | {{lts67.sonarScala}} |
5149

5250
## Usage
5351

‎dev/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -eu
33

4-
export SONAR_SCALA_VERSION=7.9.0-SNAPSHOT
4+
export SONAR_SCALA_VERSION=7.10.0-SNAPSHOT
55
cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.12-assembly.jar .
66
docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .

‎docker-compose-lts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
- postgresql_lts:/var/lib/postgresql
3232
- postgresql_lts_data:/var/lib/postgresql/data
3333
plugins-lts:
34-
image: mwizner/sonarqube-scala-plugins:4.1.0
34+
image: mwizner/sonarqube-scala-plugins:4.2.0
3535
volumes:
3636
- sonarqube_lts_plugins:/opt/sonarqube/extensions/plugins
3737
command: /bin/true

‎lts/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
FROM bitnami/minideb:stretch
55
RUN install_packages curl ca-certificates
66

7-
ENV SONAR_SCALA_VERSION 7.8.0
7+
ENV SONAR_SCALA_VERSION 7.9.0
88

99
RUN groupadd -r sonarqube && useradd -r -g sonarqube sonarqube
1010
WORKDIR /opt/sonarqube/extensions/plugins

‎lts/full/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM sonarqube:7.9.1-community
44

5-
ENV SONAR_SCALA_VERSION 7.8.0
5+
ENV SONAR_SCALA_VERSION 7.9.0
66

77
WORKDIR /opt/sonarqube/extensions/plugins
88
RUN rm sonar-scala-plugin-* && curl -L -o "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \

‎vars.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"sonarScala": "7.6.0"
88
},
99
"lts": {
10-
"version": "4.1.0",
10+
"version": "4.2.0",
1111
"sonar": "7.9.1 LTS",
1212
"sonarDocs": "https://docs.sonarqube.org/7.9",
1313
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029",
14-
"sonarScala": "7.8.0"
14+
"sonarScala": "7.9.0"
1515
},
1616
"lts67": {
1717
"version": "2.12.0",
@@ -80,6 +80,13 @@
8080
}
8181
],
8282
"lts": [
83+
{
84+
"version": "4.1.0",
85+
"sonar": "7.9.1 LTS",
86+
"sonarDocs": "https://docs.sonarqube.org/7.9",
87+
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029",
88+
"sonarScala": "7.8.0"
89+
},
8390
{
8491
"version": "4.0.0",
8592
"sonar": "7.9.1 LTS",

0 commit comments

Comments
 (0)