From c1a8c6e186bc1645351714cc171d06ae7ded3eeb Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 12 Dec 2024 17:51:09 +0100 Subject: [PATCH 1/3] Bump JDK to 21 and cds-dk --- mta.yaml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mta.yaml b/mta.yaml index 39b88f1f..870ac9c8 100644 --- a/mta.yaml +++ b/mta.yaml @@ -17,7 +17,7 @@ modules: properties: SPRING_PROFILES_ACTIVE: cloud JBP_CONFIG_COMPONENTS: '{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}' - JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "17.+" } }' + JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "21.+" } }' # We do not want cfenv to configure the DataSource for us # cfenv uses names of the services, so this variable must be adapted if needed # as CFENV_SERVICE_[service-name]_ENABLED diff --git a/pom.xml b/pom.xml index 431dc5ca..c646c70e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,12 +15,12 @@ 1.0.0-SNAPSHOT - 17 + 21 3.5.0 3.4.0 3.8.4 - 8.5.0 + 8.5.1 UTF-8 From 56f3d7d1d3630a01503f785f69a53e19dd8ccc29 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Wed, 18 Dec 2024 20:27:00 +0100 Subject: [PATCH 2/3] Update cds-services and cds-dk --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c646c70e..5899f95d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,11 +16,11 @@ 21 - 3.5.0 + 3.6.0 3.4.0 3.8.4 - 8.5.1 + 8.6.1 UTF-8 From 1561f1a664558cec48e7cbf1c1f1f29ba653b8f5 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Wed, 18 Dec 2024 20:29:29 +0100 Subject: [PATCH 3/3] Use SAPMachine 21 --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b36c5831..ca4a8f3d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,8 +24,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 17 - distribution: 'sapmachine' + java-version: 21 + distribution: sapmachine - name: Build with Maven run: mvn -ntp -B clean install