From 6c31f6d8feff577dfd36041982d610f11dd8c14a Mon Sep 17 00:00:00 2001 From: Vladimir Mikhaylenko Date: Mon, 29 Sep 2025 12:47:06 +0200 Subject: [PATCH 1/4] Use Java 25 --- .github/workflows/maven.yml | 2 +- mta.yaml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ca4a8f3d..103a964e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -24,7 +24,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 25 distribution: sapmachine - name: Build with Maven diff --git a/mta.yaml b/mta.yaml index bcd22968..40cc8574 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: "21.+" } }' + JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "25.+" } }' # 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 0f226ca6..38d0b052 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.0.0-SNAPSHOT - 21 + 25 4.3.1 3.5.6 3.8.5 From 7513c36ed2fd7197f823096514d45bcc63714751 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 27 Apr 2026 17:08:26 +0200 Subject: [PATCH 2/4] Update buildpack configuration and properties in mta.yaml --- mta.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mta.yaml b/mta.yaml index 40cc8574..aabe0bd9 100644 --- a/mta.yaml +++ b/mta.yaml @@ -13,16 +13,12 @@ modules: parameters: memory: 1024M disk-quota: 512M - buildpack: java_buildpack + buildpack: sap_java_buildpack_jakarta properties: - SPRING_PROFILES_ACTIVE: cloud - JBP_CONFIG_COMPONENTS: '{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}' - JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "25.+" } }' - # 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 - # See https://docs.cloudfoundry.org/buildpacks/java/configuring-service-connections.html - CFENV_SERVICE_BOOKSHOP-PG-DB_ENABLED: false + SPRING_PROFILES_ACTIVE: cloud + JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jdk.SAPMachineJDK']" + JBP_CONFIG_SAP_MACHINE_JDK: '{ version: 25.+ }' + JBP_SKIP_PROVIDED_LIBRARY_COMPONENTS: true build-parameters: builder: custom commands: From 0b66426e12edb623762c70076075e65108567810 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 27 Apr 2026 17:29:50 +0200 Subject: [PATCH 3/4] Add comments to clarify skipping provided libraries in mta.yaml Co-authored-by: Copilot --- mta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mta.yaml b/mta.yaml index aabe0bd9..626767f5 100644 --- a/mta.yaml +++ b/mta.yaml @@ -18,6 +18,8 @@ modules: SPRING_PROFILES_ACTIVE: cloud JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jdk.SAPMachineJDK']" JBP_CONFIG_SAP_MACHINE_JDK: '{ version: 25.+ }' + # Skip provided libraries (e.g. PostgreSQL driver) as they are already included in the Bookshop + # See: https://help.sap.com/docs/btp/sap-business-technology-platform/application-provided-library-components?locale=en-US&version=Cloud#jbp_skip_provided_library_components JBP_SKIP_PROVIDED_LIBRARY_COMPONENTS: true build-parameters: builder: custom From 9540c3ac8aa453f1110ae1333fc7d01aebc05f04 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 27 Apr 2026 17:31:41 +0200 Subject: [PATCH 4/4] Remove unnecessary note about CF instances needing Internet access for SAPMachine JRE 17 in prerequisites --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 833e3e82..fab18d6d 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,6 @@ Prerequisites: - Install the [Cloud Foundry Command Line Interface](https://docs.cloudfoundry.org/cf-cli/install-go-cli.html). - Get an SAP Business Technology Platform account to deploy the services and applications. - Ensure you have an entitlement for _PostgreSQL, hyperscaler option_ with appropriate plan in the same space. -- Ensure that your CF instances are connected to Internet to download SAPMachine JRE 17 as it is available in `sap_java_buildpack` in online mode only and you run in the landscape where the _PostgreSQL, hyperscaler option_ is available. Deploy Application: - Run `mbt build`