Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/deploy-release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ runs:
uses: actions/setup-java@v4
with:
distribution: 'sapmachine'
java-version: '17'
java-version: '21'
cache: maven
server-id: central
server-username: MAVEN_CENTRAL_USER
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ runs:
echo "altDeploymentRepository: ${{inputs.server-id}}::default::${{inputs.repository-url}}"
shell: bash

- name: Setup Java 17
- name: Setup Java 21
uses: actions/setup-java@v4
with:
distribution: sapmachine
java-version: '17'
java-version: '21'
server-id: ${{ inputs.server-id }}
server-username: CAP_DEPLOYMENT_USER
server-password: CAP_DEPLOYMENT_PASS
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/blackduck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cfdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
with:
ref: ${{ github.event.inputs.deploy_branch }}

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'

- name: Build and package 🔨
Expand Down Expand Up @@ -137,10 +137,10 @@ jobs:
with:
ref: develop

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'

- name: Verify and Checkout Deploy Branch 🔄
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v6

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Initialize CodeQL
uses: github/codeql-action/init@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/demo-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven
- name: Build with Maven
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/internalArticatory.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Internal Artifactory snapshot deploy

env:
JAVA_VERSION: '17'
JAVA_VERSION: '21'
MAVEN_VERSION: '3.6.3'
ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-and-deploy-oss.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Deploy to Maven Central

env:
JAVA_VERSION: '17'
JAVA_VERSION: '21'
MAVEN_VERSION: '3.6.3'

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-and-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Deploy to Artifactory on pre-released

env:
JAVA_VERSION: '17'
JAVA_VERSION: '21'
MAVEN_VERSION: '3.6.3'
DEPLOY_REPOSITORY_URL: 'https://common.repositories.cloud.sap/artifactory/cap-sdm-java'
POM_FILE: '.flattened-pom.xml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Main build and snapshot deploy

env:
JAVA_VERSION: '17'
JAVA_VERSION: '21'
MAVEN_VERSION: '3.6.3'

on:
Expand All @@ -17,7 +17,7 @@ jobs:
contents: read
strategy:
matrix:
java-version: [ 17 ]
java-version: [ 21 ]
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/multi tenancy_Integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
with:
ref: ${{ github.event.inputs.branch_name }}

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ jobs:
- name: Checkout repository ✅
uses: actions/checkout@v6

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ jobs:
- name: Checkout repository ✅
uses: actions/checkout@v6

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
java-version: [ 17 ]
java-version: [ 21 ]

steps:
- name: Checkout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
with:
ref: develop

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'

- name: Verify and Checkout Deploy Branch
Expand Down Expand Up @@ -127,10 +127,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v6

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
with:
ref: develop

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'

- name: Verify and Checkout Deploy Branch
Expand Down Expand Up @@ -178,10 +178,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v6

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/singleTenant_integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
with:
ref: ${{ github.event.inputs.branch_name }}

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
with:
fetch-depth: 0 # Ensure shallow clones are disabled for better analysis relevancy

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [17]
java-version: [21]
steps:
- name: Checkout repository
uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion deploy-artifactory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
########################################
# CONFIGURATION
########################################
JAVA_VERSION="${JAVA_VERSION:-17}"
JAVA_VERSION="${JAVA_VERSION:-21}"
MAVEN_VERSION="${MAVEN_VERSION:-3.6.3}"

# These MUST come from Jenkins
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<properties>
<revision>1.8.1-SNAPSHOT</revision>
<java.version>17</java.version>
<java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Loading