From 649fabb3912ad1391dda30c39273d907f1170470 Mon Sep 17 00:00:00 2001 From: Matthias Keck Date: Tue, 3 Dec 2024 14:07:11 +0100 Subject: [PATCH 1/2] Upgrade library versions Fixes: SIRI-1036 --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index d0c92bc1..101abcaa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,21 +32,21 @@ com.google.guava guava - 33.1.0-jre + 33.3.1-jre - com.google.code.findbugs - jsr305 - 3.0.2 + com.github.spotbugs + spotbugs-annotations + 4.8.6 org.slf4j slf4j-jdk14 - 2.0.13 + 2.0.16 @@ -69,7 +69,7 @@ commons-io commons-io - 2.16.1 + 2.18.0 From 6b5e9dfe16f8c19639cfbd701bb8b99359a04acc Mon Sep 17 00:00:00 2001 From: Sascha Bieberstein Date: Wed, 4 Dec 2024 08:31:31 +0100 Subject: [PATCH 2/2] Switch project to Java 23 Fixes: SIRI-1030 --- .drone.yml | 10 +++++----- pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index f493f25e..d12e1bf1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ clone: steps: - name: compile - image: scireum/sirius-build-jdk22 + image: scireum/sirius-build-jdk23 commands: - mvn clean compile volumes: *scireum_volumes @@ -28,7 +28,7 @@ steps: - push - name: cron_unit_tests - image: scireum/sirius-build-jdk22 + image: scireum/sirius-build-jdk23 commands: - mvn clean test volumes: *scireum_volumes @@ -48,7 +48,7 @@ steps: - cron - name: test - image: scireum/sirius-build-jdk22 + image: scireum/sirius-build-jdk23 commands: - mvn clean test -Dtest.excluded.groups=nightly volumes: *scireum_volumes @@ -57,7 +57,7 @@ steps: - pull_request - name: deploy - image: scireum/sirius-build-jdk22 + image: scireum/sirius-build-jdk23 commands: - sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml - mvn clean deploy -DskipTests @@ -77,7 +77,7 @@ steps: - tag - name: sonar - image: scireum/sirius-build-jdk22 + image: scireum/sirius-build-jdk23 commands: - sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME} diff --git a/pom.xml b/pom.xml index 101abcaa..64351b64 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.scireum sirius-parent - 12.1.1 + 13.0.0 sirius-kernel SIRIUS kernel