Skip to content

Commit 7c2a701

Browse files
committed
Merge branch 'main' into GCI106-python
2 parents 6e56d5a + 0769f33 commit 7c2a701

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- compatibility updates for SonarQube 25.5.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)
19+
- update from jdk 11 to 17
20+
- Add Lombok annotation processing inside `maven-compiler` plugin, to fix compile error on Arm64 architecture
1921

2022
### Deleted
2123

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Ready to use binaries are available [from GitHub](https://github.com/green-code-
6565
|----------------|---------------------|--------------|
6666
| 1.4.+ | 9.4.+ LTS to 10.4.1 | 11 / 17 |
6767
| 1.5.+ | 9.9.+ LTS to 10.7.0 | 11 / 17 |
68-
| 2.0.+ | 9.9.+ LTS to 25.5.0 | 11 / 17 |
68+
| 2.0.+ | 9.9.+ LTS to 25.5.0 | 17 |
6969

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

pom.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<properties>
3838

39-
<java.version>11</java.version>
39+
<java.version>17</java.version>
4040
<maven.compiler.source>${java.version}</maven.compiler.source>
4141
<maven.compiler.target>${java.version}</maven.compiler.target>
4242
<!-- to prevent message: system modules path not set in conjunction with -source 11 -->
@@ -67,6 +67,7 @@
6767
<!-- <sonarpython.version>5.4.0.22255</sonarpython.version>-->
6868

6969
<mockito.version>5.17.0</mockito.version>
70+
<lombok.version>1.18.38</lombok.version>
7071

7172
<!-- temporary version waiting for a real automatic release in creedengo repository -->
7273
<creedengo-rules-specifications.version>2.2.2</creedengo-rules-specifications.version>
@@ -77,7 +78,7 @@
7778
<test-it.sonarqube.keepRunning>false</test-it.sonarqube.keepRunning>
7879

7980
<!-- Version of `sonarqube` used by integration tests (you can override this value to perform matrix compatibility tests) -->
80-
<test-it.sonarqube.version>25.5.0.107428</test-it.sonarqube.version>
81+
<test-it.sonarqube.version>25.5.0.107428</test-it.sonarqube.version>
8182

8283
<!-- Version of `sonar-python-plugin` used by integration tests (you can override this value to perform matrix compatibility tests) -->
8384
<test-it.sonarpython.version>${sonarpython.version}</test-it.sonarpython.version>
@@ -176,7 +177,7 @@
176177
<dependency>
177178
<groupId>org.projectlombok</groupId>
178179
<artifactId>lombok</artifactId>
179-
<version>1.18.38</version>
180+
<version>${lombok.version}</version>
180181
<scope>test</scope>
181182
</dependency>
182183

@@ -189,6 +190,15 @@
189190
<groupId>org.apache.maven.plugins</groupId>
190191
<artifactId>maven-compiler-plugin</artifactId>
191192
<version>3.14.0</version>
193+
<configuration>
194+
<annotationProcessorPaths>
195+
<path>
196+
<groupId>org.projectlombok</groupId>
197+
<artifactId>lombok</artifactId>
198+
<version>${lombok.version}</version>
199+
</path>
200+
</annotationProcessorPaths>
201+
</configuration>
192202
</plugin>
193203
<plugin>
194204
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)