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

Commit 4e3d033

Browse files
authored
Upgrade SonarQube to 8.2 & sonar-scala to 8.2.0 (#24)
1 parent 752d9b3 commit 4e3d033

File tree

6 files changed

+35
-13
lines changed

6 files changed

+35
-13
lines changed

conf/sonar.properties

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Property values can:
2-
# - reference an environment variable, for example sonar.jdbc.url= ${env:SONAR_JDBC_URL}
2+
# - be overridden by environment variables. The name of the corresponding environment variable is the
3+
# upper-cased name of the property where all the dot ('.') and dash ('-') characters are replaced by
4+
# underscores ('_'). For example, to override 'sonar.web.systemPasscode' use 'SONAR_WEB_SYSTEMPASSCODE'.
35
# - be encrypted. See https://redirect.sonarsource.com/doc/settings-encryption.html
46

57
#--------------------------------------------------------------------------------------------------
@@ -20,17 +22,20 @@
2022
# H2 embedded database server listening port, defaults to 9092
2123
#sonar.embeddedDatabase.port=9092
2224

25+
2326
#----- Oracle 11g/12c/18c/19c
2427
# The Oracle JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/.
2528
# Only the thin client is supported, and we recommend using the latest Oracle JDBC driver. See
2629
# https://jira.sonarsource.com/browse/SONAR-9758 for more details.
2730
# If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
2831
#sonar.jdbc.url=jdbc:oracle:thin:@localhost:1521/XE
2932

33+
3034
#----- PostgreSQL 9.3 or greater
3135
# By default the schema named "public" is used. It can be overridden with the parameter "currentSchema".
3236
#sonar.jdbc.url=jdbc:postgresql://localhost/sonarqube?currentSchema=my_schema
3337

38+
3439
#----- Microsoft SQLServer 2014/2016/2017 and SQL Azure
3540
# A database named sonar must exist and its collation must be case-sensitive (CS) and accent-sensitive (AS)
3641
# Use the following connection string if you want to use integrated security with Microsoft Sql Server
@@ -45,6 +50,7 @@
4550
# Set the sonar.jdbc.username and sonar.jdbc.password appropriately.
4651
#sonar.jdbc.url=jdbc:sqlserver://localhost;databaseName=sonar
4752

53+
4854
#----- Connection pool settings
4955
# The maximum number of active connections that can be allocated
5056
# at the same time, or negative for no limit.
@@ -69,6 +75,8 @@
6975
#sonar.jdbc.minEvictableIdleTimeMillis=600000
7076
#sonar.jdbc.timeBetweenEvictionRunsMillis=30000
7177

78+
79+
7280
#--------------------------------------------------------------------------------------------------
7381
# WEB SERVER
7482
# Web server is executed in a dedicated Java process. By default heap size is 512MB.
@@ -99,6 +107,7 @@
99107
# TCP port for incoming HTTP connections. Default value is 9000.
100108
#sonar.web.port=9000
101109

110+
102111
# The maximum number of connections that the server will accept and process at any given time.
103112
# When this number has been reached, the server will not accept any more connections until
104113
# the number of connections falls below this value. The operating system may still accept connections
@@ -133,6 +142,7 @@
133142
# By default feature is disabled.
134143
#sonar.web.systemPasscode=
135144

145+
136146
#--------------------------------------------------------------------------------------------------
137147
# SSO AUTHENTICATION
138148

@@ -236,6 +246,7 @@
236246
# Same as previous property, but allows to not repeat all other settings like -Xmx
237247
#sonar.ce.javaAdditionalOpts=
238248

249+
239250
#--------------------------------------------------------------------------------------------------
240251
# ELASTICSEARCH
241252
# Elasticsearch is used to facilitate fast and accurate information retrieval.
@@ -267,6 +278,7 @@
267278
# As a security precaution, should NOT be set to a publicly available address.
268279
#sonar.search.host=
269280

281+
270282
#--------------------------------------------------------------------------------------------------
271283
# UPDATE CENTER
272284

@@ -298,6 +310,7 @@
298310
# (note: localhost and its literal notations (127.0.0.1, ...) are always excluded)
299311
#http.nonProxyHosts=
300312

313+
301314
#--------------------------------------------------------------------------------------------------
302315
# LOGGING
303316

@@ -380,6 +393,7 @@
380393
# Default value (which was "combined" before version 6.2) is equivalent to "combined + SQ HTTP request ID":
381394
#sonar.web.accessLogs.pattern=%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" "%reqAttribute{ID}"
382395

396+
383397
#--------------------------------------------------------------------------------------------------
384398
# OTHERS
385399

@@ -398,6 +412,7 @@
398412
# To see an example of the data shared: login as a global administrator, call the WS api/system/info and check the Statistics field.
399413
sonar.telemetry.enable=false
400414

415+
401416
#--------------------------------------------------------------------------------------------------
402417
# DEVELOPMENT - only for developers
403418
# The following properties MUST NOT be used in production environments.

current/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 8.1.0
7+
ENV SONAR_SCALA_VERSION 8.2.0
88

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

current/full/Dockerfile

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

3-
FROM sonarqube:8.1-community-beta
3+
FROM sonarqube:8.2-community
44

5-
ENV SONAR_SCALA_VERSION 8.1.0
5+
ENV SONAR_SCALA_VERSION 8.2.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.2.0-SNAPSHOT
4+
export SONAR_SCALA_VERSION=8.3.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
sonarqube:
5-
image: sonarqube:8.1-community-beta
5+
image: sonarqube:8.2-community
66
ports:
77
- "80:9000"
88
networks:
@@ -21,7 +21,7 @@ services:
2121
depends_on:
2222
- db
2323
db:
24-
image: postgres:10.11-alpine
24+
image: postgres:11.7-alpine
2525
networks:
2626
- sonarnet
2727
environment:

vars.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"current": {
3-
"version": "5.1.0",
4-
"sonar": "8.1",
5-
"sonarDocs": "https://docs.sonarqube.org/8.1",
6-
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15243",
7-
"sonarScala": "8.1.0"
3+
"version": "5.2.0",
4+
"sonar": "8.2",
5+
"sonarDocs": "https://docs.sonarqube.org/8.2",
6+
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15301",
7+
"sonarScala": "8.2.0"
88
},
99
"lts": {
1010
"version": "4.2.0",
@@ -22,6 +22,13 @@
2222
},
2323
"versions": {
2424
"current": [
25+
{
26+
"version": "5.1.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.1.0"
31+
},
2532
{
2633
"version": "5.0.0",
2734
"sonar": "8.1",

0 commit comments

Comments
 (0)