Skip to content

Switch to Java 17 as default #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmikhailenko merged 4 commits into from
Jan 31, 2023
Merged

Switch to Java 17 as default #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da3d264
Switch to Java 17 as default
vmikhailenko Jan 31, 2023
98d68cf
Kyma deployment settings also use Java 17
vmikhailenko Jan 31, 2023
600017d
Revert "Kyma deployment settings also use Java 17"
vmikhailenko Jan 31, 2023
af19684
<release> instead of <source> and <target>
vmikhailenko Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- name: Build with Maven
run: mvn -B clean install
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ Prerequisites:
- Get an SAP Business Technology Platform account to deploy the services and applications.
- [Create a SAP HANA Cloud Instance](https://developers.sap.com/tutorials/hana-cloud-deploying.html) in your SAP Business Technology Platform space.
- Ensure you have an entitlement for `SAP HANA Schemas & HDI Containers` with plan `hdi-shared` 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.

Deploy as Single Tenant Application:
- Rename `mta-single-tenant.yaml` to `mta.yaml`
Expand Down
6 changes: 4 additions & 2 deletions mta-multi-tenant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ modules:
path: srv
parameters:
memory: 1024M
disk-quota: 256M
disk-quota: 512M
buildpack: sap_java_buildpack
properties:
SPRING_PROFILES_ACTIVE: cloud,sandbox
CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }'
build-parameters:
builder: custom
commands:
Expand Down Expand Up @@ -50,7 +52,7 @@ modules:
path: mtx-sidecar
parameters:
memory: 256M
disk-quota: 512M
disk-quota: 1024M
requires:
- name: bookshop-mt-service-manager
- name: bookshop-mt-uaa
Expand Down
6 changes: 4 additions & 2 deletions mta-single-tenant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ modules:
path: srv
parameters:
memory: 1024M
disk-quota: 256M
disk-quota: 512M
buildpack: sap_java_buildpack
properties:
SPRING_PROFILES_ACTIVE: cloud,sandbox
SPRING_PROFILES_ACTIVE: cloud,sandbox
JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }'
build-parameters:
builder: custom
commands:
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<revision>1.0.0-SNAPSHOT</revision>

<!-- DEPENDENCIES VERSION -->
<jdk.version>1.8</jdk.version>
<jdk.version>17</jdk.version>
Comment thread
vmikhailenko marked this conversation as resolved.
<cds.services.version>1.31.0</cds.services.version>
<spring.boot.version>2.7.8</spring.boot.version>
<cloud.sdk.version>4.5.0</cloud.sdk.version>
Expand Down Expand Up @@ -76,8 +76,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
<release>${jdk.version}</release>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down