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

Commit 752d9b3

Browse files
authored
Upgrade sonar-scala to 8.1.0. (#23)
1 parent cee65be commit 752d9b3

File tree

9 files changed

+44
-23
lines changed

9 files changed

+44
-23
lines changed

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# sonar-scala-docker
22

3-
[![GitHub version](https://img.shields.io/badge/release-v5.0.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
3+
[![GitHub version](https://img.shields.io/badge/release-v5.1.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
44
[![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)
@@ -35,7 +35,7 @@ default SonarQube login details for the Administrator account are `admin:admin`.
3535

3636
You can also use a standalone docker image which contains SonarQube server with
3737
bundled sonar-scala plugin,
38-
[`mwizner/sonarqube-scala-plugins:5.0.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or
38+
[`mwizner/sonarqube-scala-plugins:5.1.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or
3939
`mwizner/sonarqube-scala-plugins:latest-full`) and
4040
[`mwizner/sonarqube-scala-plugins:4.2.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
4141
(or `mwizner/sonarqube-scala-plugins:latest-lts-full`) for the current LTS
@@ -54,7 +54,7 @@ docker run -d \
5454
-e SONARQUBE_JDBC_USERNAME=sonar \
5555
-e SONARQUBE_JDBC_PASSWORD=sonar \
5656
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
57-
mwizner/sonarqube-scala-plugins:5.0.0-full
57+
mwizner/sonarqube-scala-plugins:5.1.0-full
5858
```
5959

6060
Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable,
@@ -66,7 +66,7 @@ want to try the image, you can use the following command:
6666
docker run -d \
6767
--name sonarqube-scala-plugins-full \
6868
-p 80:9000 \
69-
mwizner/sonarqube-scala-plugins:5.0.0-full
69+
mwizner/sonarqube-scala-plugins:5.1.0-full
7070
```
7171

7272
## Dependencies
@@ -87,7 +87,7 @@ scapegoat support)_
8787
<!-- prettier-ignore-start -->
8888
|Version | SonarQube | sonar-scala |
8989
|--------|-----------|-------------|
90-
[5.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.0.0) | 8.1 [documentation](https://docs.sonarqube.org/8.1), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15243) | [8.0.0](https://github.com/mwz/sonar-scala/releases/tag/v8.0.0)
90+
[5.1.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.1.0) | 8.1 [documentation](https://docs.sonarqube.org/8.1), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15243) | [8.1.0](https://github.com/mwz/sonar-scala/releases/tag/v8.1.0)
9191
[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)
9292
[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)
9393
<!-- prettier-ignore-end -->
@@ -101,6 +101,12 @@ scapegoat support)_
101101
<td><b>sonar-scala</b></td>
102102
<td><b>sonar-scala-extra</b></td>
103103
</tr>
104+
<tr>
105+
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.0.0">5.0.0</a></td>
106+
<td>8.1 <a href="https://docs.sonarqube.org/8.1">documentation</a>, <a href="https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15243">changelog</a></td>
107+
<td><a href="https://github.com/mwz/sonar-scala/releases/tag/v8.0.0">8.0.0</td>
108+
<td></td>
109+
</tr>
104110
<tr>
105111
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/3.7.0">3.7.0</a></td>
106112
<td>7.8 <a href="https://docs.sonarqube.org/7.8">documentation</a>, <a href="https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14939">changelog</a></td>
@@ -263,6 +269,7 @@ way to automate analysis of Scala projects with SonarQube.
263269
<details>
264270
<summary>Expand to see the changelog.</summary>
265271
<ul>
272+
<li><strong>5.1.0</strong> - Upgraded sonar-scala to 8.1.0.</li>
266273
<li><strong>5.0.0</strong> - Upgraded sonar-scala to 8.0.0 & SonarQube to 8.1.</li>
267274
<li><strong>4.2.0</strong> - Upgraded sonar-scala to 7.9.0.</li>
268275
<li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>

README.tpl.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ way to automate analysis of Scala projects with SonarQube.
135135
<details>
136136
<summary>Expand to see the changelog.</summary>
137137
<ul>
138+
<li><strong>5.1.0</strong> - Upgraded sonar-scala to 8.1.0.</li>
138139
<li><strong>5.0.0</strong> - Upgraded sonar-scala to 8.0.0 & SonarQube to 8.1.</li>
139140
<li><strong>4.2.0</strong> - Upgraded sonar-scala to 7.9.0.</li>
140141
<li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>

README_DOCKERHUB.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Starting from version `2.7.0`, the images no longer contain the
1818
[sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugin as
1919
sonar-scala provides Scapegoat support from version `6.5.0` onwards.
2020

21-
- `5.0.0`, `latest`
22-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.0.0/Dockerfile),
23-
`5.0.0-full`, `latest-full`
24-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.0.0-full/Dockerfile),
25-
[Release 5.0.0](https://github.com/mwz/sonar-scala-docker/releases/tag/5.0.0)
21+
- `5.1.0`, `latest`
22+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.1.0/Dockerfile),
23+
`5.1.0-full`, `latest-full`
24+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.1.0-full/Dockerfile),
25+
[Release 5.1.0](https://github.com/mwz/sonar-scala-docker/releases/tag/5.1.0)
2626
- `4.2.0`, `latest-lts` (7.9 LTS)
2727
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.2.0/Dockerfile),
2828
`4.2.0-full`, `latest-lts-full` (7.9 LTS)
@@ -41,8 +41,8 @@ For older versions please check the
4141

4242
| Version | SonarQube | sonar-scala |
4343
| ------------------------ | ----------------- | ---------------------- |
44-
| 5.0.0 | | 8.0.0 |
45-
| 5.0.0-full | 8.1 | 8.0.0 |
44+
| 5.1.0 | | 8.1.0 |
45+
| 5.1.0-full | 8.1 | 8.1.0 |
4646
| 4.2.0 | | 7.9.0 |
4747
| 4.2.0-full | 7.9.1 LTS | 7.9.0 |
4848
| 2.12.0 | | 6.8.0 |
@@ -67,7 +67,7 @@ services:
6767
- plugins
6868
6969
plugins:
70-
image: mwizner/sonarqube-scala-plugins:5.0.0
70+
image: mwizner/sonarqube-scala-plugins:5.1.0
7171
volumes:
7272
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
7373
command: /bin/true
@@ -95,7 +95,7 @@ docker run -d \
9595
-e SONARQUBE_JDBC_USERNAME=sonar \
9696
-e SONARQUBE_JDBC_PASSWORD=sonar \
9797
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
98-
mwizner/sonarqube-scala-plugins:5.0.0-full
98+
mwizner/sonarqube-scala-plugins:5.1.0-full
9999
```
100100

101101
Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable,
@@ -107,10 +107,13 @@ want to try the image, you can use the following command:
107107
docker run -d \
108108
--name sonarqube-scala-plugins-full \
109109
-p 80:9000 \
110-
mwizner/sonarqube-scala-plugins:5.0.0-full
110+
mwizner/sonarqube-scala-plugins:5.1.0-full
111111
```
112112

113113
## Repository
114114

115115
This project is open-sourced and can be found on
116116
[Github](https://github.com/mwz/sonar-scala-docker).
117+
118+
sonar-scala documentation can be found on
119+
[sonar-scala.com](https://sonar-scala.com).

README_DOCKERHUB.tpl.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,6 @@ docker run -d \
114114

115115
This project is open-sourced and can be found on
116116
[Github](https://github.com/mwz/sonar-scala-docker).
117+
118+
sonar-scala documentation can be found on
119+
[sonar-scala.com](https://sonar-scala.com).

current/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Minideb image with bundled sonar-scala 8.0.0 (https://github.com/mwz/sonar-scala),
1+
# Minideb image with bundled sonar-scala (https://github.com/mwz/sonar-scala),
22
# which can be mounted as a volume into a SonarQube container.
33

44
FROM bitnami/minideb:stretch
55
RUN install_packages curl ca-certificates
66

7-
ENV SONAR_SCALA_VERSION 8.0.0
7+
ENV SONAR_SCALA_VERSION 8.1.0
88

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

current/full/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# SonarQube 8.1 image with bundled sonar-scala 8.0.0 (https://github.com/mwz/sonar-scala).
1+
# SonarQube 8.1 image with bundled sonar-scala (https://github.com/mwz/sonar-scala).
22

33
FROM sonarqube:8.1-community-beta
44

5-
ENV SONAR_SCALA_VERSION 8.0.0
5+
ENV SONAR_SCALA_VERSION 8.1.0
66

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

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=8.1.0-SNAPSHOT
4+
export SONAR_SCALA_VERSION=8.2.0-SNAPSHOT
55
cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.13/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.13-assembly.jar .
66
docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .

docker-compose.yml

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

vars.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"current": {
3-
"version": "5.0.0",
3+
"version": "5.1.0",
44
"sonar": "8.1",
55
"sonarDocs": "https://docs.sonarqube.org/8.1",
66
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15243",
7-
"sonarScala": "8.0.0"
7+
"sonarScala": "8.1.0"
88
},
99
"lts": {
1010
"version": "4.2.0",
@@ -22,6 +22,13 @@
2222
},
2323
"versions": {
2424
"current": [
25+
{
26+
"version": "5.0.0",
27+
"sonar": "8.1",
28+
"sonarDocs": "https://docs.sonarqube.org/8.1",
29+
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15243",
30+
"sonarScala": "8.0.0"
31+
},
2532
{
2633
"version": "3.7.0",
2734
"sonar": "7.8",

0 commit comments

Comments
 (0)