Skip to content

Upgrade to Java 23 support @thpierce #452

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
merged 2 commits into from
Sep 19, 2025
Merged

Upgrade to Java 23 support @thpierce #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d471458
Upgrade to Java 23 support
thpierce Sep 19, 2025
0846fb0
Continue fixes
thpierce Sep 19, 2025
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
14 changes: 7 additions & 7 deletions .github/workflows/java-sample-app-ecr-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# This workflow is for building and uploading the Java sample application to ECR.
# Java 11 will be built and uploaded to all regions to be used by the canary while
# other versions (8, 17, 21, 22) will be uploaded to us-east-1 for the purpose of
# other versions (8, 17, 21, 23) will be uploaded to us-east-1 for the purpose of
# testing ADOT Java
name: Sample App Deployment - Java ECR
on:
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ '8', '17', '21', '22' ]
java-version: [ '8', '17', '21', '23' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -127,8 +127,8 @@ jobs:
run: |
# For Java 8, springboot must be lower than version 3
# For Java 11,17,21, they are compatible with both springboot version
# For Java 22 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "22" ]; then
# For Java 23 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "23" ]; then
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
cat build.gradle.kts
fi
Expand All @@ -140,7 +140,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ '8', '17', '21', '22' ]
java-version: [ '8', '17', '21', '23' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -167,8 +167,8 @@ jobs:
run: |
# For Java 8, springboot must be lower than version 3
# For Java 11,17,21, they are compatible with both springboot version
# For Java 22 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "22" ]; then
# For Java 23 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "23" ]; then
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
cat build.gradle.kts
fi
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/java-sample-app-s3-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
## SPDX-License-Identifier: Apache-2.0

# This workflow is for building and uploading the Java sample application to S3 bucket. Java 11 will be built and uploaded to all regions to be used by the canary while other versions (8, 17, 21, 22)
# This workflow is for building and uploading the Java sample application to S3 bucket. Java 11 will be built and uploaded to all regions to be used by the canary while other versions (8, 17, 21, 23)
# will be uploaded to us-east-1 for the purpose of testing ADOT Java
name: Sample App Deployment - Java S3
on:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ '8', '17', '21', '22' ]
java-version: [ '8', '17', '21', '23' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -117,8 +117,8 @@ jobs:
run: |
# For Java 8, springboot must be lower than version 3
# For Java 11,17,21, they are compatible with both springboot version
# For Java 22 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "22" ]; then
# For Java 23 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "23" ]; then
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
cat build.gradle.kts
fi
Expand All @@ -130,7 +130,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ '8', '17', '21', '22' ]
java-version: [ '8', '17', '21', '23' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -151,8 +151,8 @@ jobs:
run: |
# For Java 8, springboot must be lower than version 3
# For Java 11,17,21, they are compatible with both springboot version
# For Java 22 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "22" ]; then
# For Java 23 and above, springboot must be version 3 or higher
if [ "${{ matrix.java-version }}" = "23" ]; then
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
cat build.gradle.kts
fi
Expand Down
Loading