Skip to content

Commit 13079aa

Browse files
dedece35dedece35
committed
merge from main
2 parents 0a9b5af + f773674 commit 13079aa

File tree

5 files changed

+49
-40
lines changed

5 files changed

+49
-40
lines changed

‎.github/dependabot.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "maven" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
ignore:
13+
# Ignore all versions : cf pom.xml comments
14+
- dependency-name: "org.sonarsource.java.sonar-java-plugin"
15+
# Ignore all versions : cf pom.xml comments
16+
- dependency-name: "com.mycila:license-maven-plugin"
17+
# Ignore specific versions of another dependency
18+
- dependency-name: "org.springframework.data.spring-data-jpa"
19+
versions: [ "3.x" ]

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
- [#103](https://github.com/green-code-initiative/creedengo-java/pull/103) GCI69 Java : calls to hasMoreElements() and nextElement() methods from java.util.Enumeration interface aren't flagged anymore when called in a for loop
1515
- [#110](https://github.com/green-code-initiative/creedengo-java/pull/110) GCI82 - remove false positives with reassignment using this and with passing a variable to a function it can be reassigned in
16-
- compatibility updates for SonarQube 25.5.0
16+
- compatibility updates for SonarQube 25.9.0
1717
- upgrade libraries versions
1818
- correction of technical problem with Integration tests (because of Maven format in technical answer to "sonar-orchestrator-junit5" library)
1919
- upgrade JDK from 11 to 17

‎Dockerfile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
#ARG MAVEN_BUILDER=3-openjdk-17-slim
1+
ARG MAVEN_BUILDER=3-openjdk-17-slim
22

3+
#ARG SONARQUBE_VERSION=9.9.0-community
34
#ARG SONARQUBE_VERSION=24.12.0.100206-community
45
#ARG SONARQUBE_VERSION=25.1.0.102122-community
56
#ARG SONARQUBE_VERSION=25.2.0.102705-community
67
#ARG SONARQUBE_VERSION=25.3.0.104237-community
8+
#ARG SONARQUBE_VERSION=25.9.0.112764-community
79

8-
ARG MAVEN_BUILDER=3-openjdk-11-slim
9-
ARG SONARQUBE_VERSION=9.9.8-community
10+
(??)
11+
(??)ARG MAVEN_BUILDER=3-openjdk-11-slim
12+
(??)ARG SONARQUBE_VERSION=9.9.8-community
1013

1114
FROM maven:${MAVEN_BUILDER} AS builder
1215

@@ -43,4 +46,4 @@ RUN $JAVA_HOME/bin/keytool -import -trustcacerts -file /usr/local/share/ca-certi
4346
# $JAVA_HOME/bin/keytool -import -trustcacerts -file /tmp/downloads-sonarsource.crt -alias downloads-sonarsource -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt
4447
# RELANCE CONTENEUR pour relancer le service sonarqube
4548

46-
USER sonarqube
49+
USER sonarqube

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Ready to use binaries are available [from GitHub](https://github.com/green-code-
6161
|----------------|---------------------|------------------------------------------------------------------------------------------------|
6262
| 1.6.+ | 9.4.+ LTS to 10.6.0 | 11 / 17 |
6363
| 1.7.+ | 9.9.+ LTS to 10.6.0 | [17](https://docs.sonarsource.com/sonarqube/9.9/requirements/prerequisites-and-overview/#java) |
64-
| 2.+ | 9.9.+ LTS to 25.5.0 | [17](https://docs.sonarsource.com/sonarqube/9.9/requirements/prerequisites-and-overview/#java) |
64+
| 2.+ | 9.9.0 LTS to 25.9.0 | [17](https://docs.sonarsource.com/sonarqube/9.9/requirements/prerequisites-and-overview/#java) |
6565

6666
> Compatibility table of versions lower than 1.4.+ are available from the
6767
> main [creedengo repository](https://github.com/green-code-initiative/creedengo-rules-specifications#-plugins-version-compatibility).

‎pom.xml‎

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<properties>
4242

43-
<java.version>11</java.version>
43+
<java.version>17</java.version>
4444
<maven.compiler.source>${java.version}</maven.compiler.source>
4545
<maven.compiler.target>${java.version}</maven.compiler.target>
4646
<!-- to prevent message: system modules path not set in conjunction with -source 11 -->
@@ -57,30 +57,22 @@
5757
<sonarqube-plugin-api-min.version>9.9.0.65466</sonarqube-plugin-api-min.version>
5858

5959
<!-- Version of the SonarQube APIs used by `creedengo-java-plugin` -->
60-
<sonar.plugin.api.version>11.4.0.2922</sonar.plugin.api.version>
60+
<sonar.plugin.api.version>13.0.0.3026</sonar.plugin.api.version>
6161

6262
<!-- Version of `sonar-java-plugin` that `creedengo-java-plugin` depends on -->
63-
<!-- max version that all is OK with JDK 11 -->
64-
<sonarjava.version>7.30.0.34429</sonarjava.version>
65-
<!-- max version that all is OK with JDK 17 -->
66-
<!-- <sonarjava.version>8.9.1.38281</sonarjava.version>-->
67-
<!-- next version is NOT OK -->
68-
<!-- <sonarjava.version>8.13.0.38826</sonarjava.version>-->
63+
(??) <!-- max version that all is OK with JDK 11 -->
64+
(??) <sonarjava.version>7.30.0.34429</sonarjava.version>
65+
<!-- LAST version compatible with SonarQube 9.9.0 AND 25.9.0 -->
66+
<sonarjava.version>8.9.3.40165</sonarjava.version>
67+
<!-- LAST version compatible with SonarQube 25.9.0 but NOT with 9.9.0 -->
68+
<!-- <sonarjava.version>8.18.0.40025</sonarjava.version>-->
6969

70-
<sonar-analyzer-commons.version>2.17.0.3322</sonar-analyzer-commons.version>
70+
<sonar-analyzer-commons.version>2.18.0.3393</sonar-analyzer-commons.version>
7171

7272
<sonar-packaging.version>1.23.0.740</sonar-packaging.version>
7373

74-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
75-
76-
<assertJ.version>3.27.3</assertJ.version>
77-
78-
<mockito.version>5.17.0</mockito.version>
79-
80-
<google.re2j>1.8</google.re2j>
81-
8274
<!-- Version of creedengo rules specifications implemented by this plugin -->
83-
<creedengo-rules-specifications.version>2.2.2</creedengo-rules-specifications.version>
75+
<creedengo-rules-specifications.version>2.5.0</creedengo-rules-specifications.version>
8476

8577
<!-- URL of the Maven repository where sonarqube will be downloaded -->
8678
<test-it.orchestrator.artifactory.url>https://repo1.maven.org/maven2</test-it.orchestrator.artifactory.url>
@@ -89,7 +81,7 @@
8981

9082
<!-- Version of `sonarqube` used by integration tests (you can override this value to perform matrix compatibility tests) -->
9183
<!-- <test-it.sonarqube.version>9.9.0.65466</test-it.sonarqube.version>-->
92-
<test-it.sonarqube.version>9.9.8.100196</test-it.sonarqube.version>
84+
<!-- <test-it.sonarqube.version>9.9.8.100196</test-it.sonarqube.version>-->
9385
<!-- <test-it.sonarqube.version>10.1.0.73245</test-it.sonarqube.version>-->
9486
<!-- <test-it.sonarqube.version>10.1.0.73491</test-it.sonarqube.version>-->
9587
<!-- <test-it.sonarqube.version>10.2.0.77647</test-it.sonarqube.version>-->
@@ -100,6 +92,7 @@
10092
<!-- <test-it.sonarqube.version>25.3.0.104237</test-it.sonarqube.version>-->
10193
<!-- <test-it.sonarqube.version>25.4.0.105899</test-it.sonarqube.version>-->
10294
<!-- <test-it.sonarqube.version>25.5.0.107428</test-it.sonarqube.version>-->
95+
<test-it.sonarqube.version>25.9.0.112764</test-it.sonarqube.version>
10396

10497
<!-- Version of `sonar-java-plugin` used by integration tests (you can override this value to perform matrix compatibility tests) -->
10598
<test-it.sonarjava.version>${sonarjava.version}</test-it.sonarjava.version>
@@ -141,7 +134,7 @@
141134
<dependency>
142135
<groupId>com.google.re2j</groupId>
143136
<artifactId>re2j</artifactId>
144-
<version>${google.re2j}</version>
137+
<version>1.8</version>
145138
</dependency>
146139

147140
<dependency>
@@ -163,21 +156,21 @@
163156
<dependency>
164157
<groupId>org.junit.jupiter</groupId>
165158
<artifactId>junit-jupiter</artifactId>
166-
<version>${junit.jupiter.version}</version>
159+
<version>5.13.4</version>
167160
<scope>test</scope>
168161
</dependency>
169162

170163
<dependency>
171164
<groupId>org.assertj</groupId>
172165
<artifactId>assertj-core</artifactId>
173-
<version>${assertJ.version}</version>
166+
<version>3.27.4</version>
174167
<scope>test</scope>
175168
</dependency>
176169

177170
<dependency>
178171
<groupId>org.mockito</groupId>
179172
<artifactId>mockito-junit-jupiter</artifactId>
180-
<version>${mockito.version}</version>
173+
<version>5.19.0</version>
181174
<scope>test</scope>
182175
</dependency>
183176

@@ -192,13 +185,7 @@
192185
<dependency>
193186
<groupId>org.sonarsource.orchestrator</groupId>
194187
<artifactId>sonar-orchestrator-junit5</artifactId>
195-
<version>5.6.1.2597</version>
196-
<scope>test</scope>
197-
</dependency>
198-
<dependency>
199-
<groupId>org.sonarsource.java</groupId>
200-
<artifactId>test-classpath-reader</artifactId>
201-
<version>8.8.0.37665</version>
188+
<version>5.6.2.2625</version>
202189
<scope>test</scope>
203190
</dependency>
204191
<dependency>
@@ -216,13 +203,13 @@
216203
<dependency>
217204
<groupId>ch.qos.logback</groupId>
218205
<artifactId>logback-classic</artifactId>
219-
<version>1.5.6</version>
206+
<version>1.5.18</version>
220207
<scope>test</scope>
221208
</dependency>
222209
<dependency>
223210
<groupId>org.projectlombok</groupId>
224211
<artifactId>lombok</artifactId>
225-
<version>1.18.36</version>
212+
<version>1.18.40</version>
226213
<scope>test</scope>
227214
</dependency>
228215
</dependencies>
@@ -242,7 +229,7 @@
242229
<plugin>
243230
<groupId>org.jacoco</groupId>
244231
<artifactId>jacoco-maven-plugin</artifactId>
245-
<version>0.8.12</version>
232+
<version>0.8.13</version>
246233
<executions>
247234
<execution>
248235
<id>prepare-agent</id>
@@ -335,12 +322,12 @@
335322
</execution>
336323
</executions>
337324
</plugin>
325+
<!-- FOR TUs -->
338326
<plugin>
339327
<groupId>org.apache.maven.plugins</groupId>
340328
<artifactId>maven-dependency-plugin</artifactId>
341329
<version>3.8.1</version>
342330
<executions>
343-
<!-- only for unit tests ("test-jars" directory used in classpath) -->
344331
<execution>
345332
<id>copy</id>
346333
<phase>test-compile</phase>

0 commit comments

Comments
 (0)