aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cirrus.yml45
-rw-r--r--it/pom.xml2
-rw-r--r--pom.xml25
3 files changed, 16 insertions, 56 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 6446b40..ee3178c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -32,7 +32,7 @@ eks_container: &EKS_CONTAINER
region: eu-central-1
cluster_name: ${CIRRUS_CLUSTER_NAME}
namespace: default
- image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j11-m3-latest
+ image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-m3-latest
cpu: 1
memory: 2G
@@ -41,7 +41,7 @@ ec2_instance: &EC2_INSTANCE_WINDOWS
region: eu-central-1
subnet_id: ${CIRRUS_AWS_SUBNET}
type: t2.2xlarge
- image: base-windows-jdk11-v*
+ image: base-windows-jdk17-v*
platform: windows
only_sonarsource_qa: &ONLY_SONARSOURCE_QA
@@ -69,31 +69,12 @@ build_task:
cleanup_before_cache_script:
- cleanup_maven_repository
-linux_qa_java11_task:
- depends_on:
- - build
- <<: *ONLY_SONARSOURCE_QA
- eks_container:
- <<: *EKS_CONTAINER
- env:
- SQ_VERSION: LATEST_RELEASE[8.9]
- maven_cache:
- folder: ${CIRRUS_WORKING_DIR}/.m2/repository
- qa_script:
- - source cirrus-env QA
- - source set_maven_build_version $BUILD_NUMBER
- - cd it
- - mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify
- cleanup_before_cache_script:
- - cleanup_maven_repository
-
linux_qa_java17_task:
depends_on:
- build
<<: *ONLY_SONARSOURCE_QA
eks_container:
<<: *EKS_CONTAINER
- image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-m3-latest
env:
matrix:
- SQ_VERSION: LATEST_RELEASE[8.9]
@@ -108,32 +89,12 @@ linux_qa_java17_task:
cleanup_before_cache_script:
- cleanup_maven_repository
-win_qa_java11_task:
- depends_on:
- - build
- <<: *ONLY_SONARSOURCE_QA
- ec2_instance:
- <<: *EC2_INSTANCE_WINDOWS
- env:
- CIRRUS_SHELL: bash
- SQ_VERSION: LATEST_RELEASE[8.9]
- maven_cache:
- folder: ${CIRRUS_WORKING_DIR}/.m2/repository
- qa_script:
- - source cirrus-env QA
- - source set_maven_build_version $BUILD_NUMBER
- - cd it
- - mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify
- cleanup_before_cache_script:
- - cleanup_maven_repository
-
win_qa_java17_task:
depends_on:
- build
<<: *ONLY_SONARSOURCE_QA
ec2_instance:
<<: *EC2_INSTANCE_WINDOWS
- image: base-windows-jdk17-v*
env:
CIRRUS_SHELL: bash
matrix:
@@ -151,9 +112,7 @@ win_qa_java17_task:
promote_task:
depends_on:
- - linux_qa_java11
- linux_qa_java17
- - win_qa_java11
- win_qa_java17
<<: *ONLY_SONARSOURCE_QA
<<: *EXCEPT_ON_NIGHTLY_CRON
diff --git a/it/pom.xml b/it/pom.xml
index 6719a2c..9f96231 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -25,7 +25,7 @@
<sonar.buildVersion>7.9.1</sonar.buildVersion>
<!-- following properties must be set in command-line : sonar.runtimeVersion and sonarRunner.version -->
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 83a11bd..f534144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.sonarsource.parent</groupId>
<artifactId>parent</artifactId>
- <version>65.0.218</version>
+ <version>68.0.0.247</version>
</parent>
<groupId>org.sonarsource.scanner.cli</groupId>
@@ -52,14 +52,14 @@
<!-- configuration for assembly of distributions -->
<unpack.dir>${project.build.directory}/unpack</unpack.dir>
<scanner.jar>${project.build.finalName}.jar</scanner.jar>
- <jre.dirname.linux>jdk-11.0.17+8-jre</jre.dirname.linux>
- <jre.dirname.windows>jdk-11.0.17+8-jre</jre.dirname.windows>
- <jre.dirname.macosx>jdk-11.0.17+8-jre/Contents/Home</jre.dirname.macosx>
+ <jre.dirname.linux>jdk-17.0.7+7-jre</jre.dirname.linux>
+ <jre.dirname.windows>jdk-17.0.7+7-jre</jre.dirname.windows>
+ <jre.dirname.macosx>jdk-17.0.7+7-jre/Contents/Home</jre.dirname.macosx>
<!-- Release: enable publication to Bintray -->
<artifactsToPublish>${project.groupId}:${project.artifactId}:zip,${project.groupId}:${project.artifactId}:zip:linux,${project.groupId}:${project.artifactId}:zip:windows,${project.groupId}:${project.artifactId}:zip:macosx,${project.groupId}:${project.artifactId}:json:cyclonedx</artifactsToPublish>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencies>
@@ -126,6 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -193,7 +194,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>11</source>
+ <source>17</source>
</configuration>
</plugin>
<plugin>
@@ -235,10 +236,10 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz</url>
+ <url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz</url>
<unpack>true</unpack>
<outputDirectory>${unpack.dir}/linux</outputDirectory>
- <sha256>752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79</sha256>
+ <sha256>bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca</sha256>
</configuration>
</execution>
</executions>
@@ -285,10 +286,10 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.17_8.zip</url>
+ <url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.7_7.zip</url>
<unpack>true</unpack>
<outputDirectory>${unpack.dir}/windows</outputDirectory>
- <sha256>814a731f92dd67ad6cfb11a8b06dfad5f629f67be88ae5ae37d34e6eea6be6f4</sha256>
+ <sha256>62e82c1afa7509424813e9cb22d8becfec4346d7505e6d2fc8770af4dcd5b9a0</sha256>
</configuration>
</execution>
</executions>
@@ -334,10 +335,10 @@
<goal>wget</goal>
</goals>
<configuration>
- <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz</url>
+ <url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz</url>
<unpack>true</unpack>
<outputDirectory>${unpack.dir}/macosx</outputDirectory>
- <sha256>66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674</sha256>
+ <sha256>62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b</sha256>
</configuration>
</execution>
</executions>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 01:49:03 +0000