From 29fb7bb80b456dc38fec2e22ec99986ceaad9373 Mon Sep 17 00:00:00 2001 From: Jakob Vogel Date: Tue, 17 Oct 2023 14:20:06 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Upgrades=20Sirius=20=F0=9F=AA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This includes the upgrade to Java 21. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 69c53ef..aab8dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.scireum sirius-parent - 10.1.2 + 11.1.0 s3ninja DEVELOPMENT-SNAPSHOT @@ -16,8 +16,8 @@ https://s3ninja.net - dev-38.2.0 - dev-70.2.2 + dev-38.5.1 + dev-72.2.0 From 7f4535bfc1c604e3bb0019c3a5f154a3f82a3938 Mon Sep 17 00:00:00 2001 From: Jakob Vogel Date: Tue, 17 Oct 2023 14:28:37 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Upgrades=20Docker=20files=20to=20Java=2021?= =?UTF-8?q?=20=F0=9F=90=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 10 +++++----- Dockerfile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 32ad736..df4d60a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ clone: steps: - name: compile - image: scireum/sirius-build-jdk18:latest + image: scireum/sirius-build-jdk21:latest commands: - mvn clean compile volumes: *scireum_volumes @@ -26,7 +26,7 @@ steps: - push - name: test - image: scireum/sirius-build-jdk18:latest + image: scireum/sirius-build-jdk21:latest commands: - mvn clean test volumes: *scireum_volumes @@ -35,7 +35,7 @@ steps: - pull_request - name: sonar - image: scireum/sirius-build-jdk18:latest + image: scireum/sirius-build-jdk21:latest commands: - "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml" - "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}" @@ -45,7 +45,7 @@ steps: - tag - name: package - image: scireum/sirius-build-jdk18:latest + image: scireum/sirius-build-jdk21:latest commands: - "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml" - mvn clean package -DskipTests @@ -75,7 +75,7 @@ steps: - tag - name: site - image: scireum/sirius-build-jdk18:latest + image: scireum/sirius-build-jdk21:latest commands: - "echo \"$SSH_KEY\" > /tmp/sshkey" - chmod 600 /tmp/sshkey diff --git a/Dockerfile b/Dockerfile index e167db6..6559e74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM scireum/sirius-runtime-jdk18:63 +FROM scireum/sirius-runtime-jdk21:63 RUN mkdir /home/sirius/data && \ mkdir /home/sirius/multipart && \