Skip to content

Commit 7b99b54

Browse files
authored
Upgrade to Java 23 support @thpierce (#452)
Drop v22 and add v23 support for Java - align with aws-observability/aws-otel-java-instrumentation@f398962 <Can we safely revert this commit if needed? If not, detail what must be done to safely revert and why it is needed.> Yes *Ensure you've run the following tests on your changes and include the link below:* These steps are manually run. To do so, create a `test.yml` file with `name: Test` and workflow description to test your changes, then remove the file for your PR. Link your test run in your PR description. This process is a short term solution while we work on creating a staging environment for testing. NOTE: TESTS RUNNING ON A SINGLE EKS CLUSTER CANNOT BE RUN IN PARALLEL. See the [needs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) keyword to run tests in succession. - Run Java EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run Python EKS on `e2e-playground` in us-east-1 and eu-central-2 - Run metric limiter on EKS cluster `e2e-playground` in us-east-1 and eu-central-2 - Run EC2 tests in all regions - Run K8s on a separate K8s cluster (check IAD test account for master node endpoints; these will change as we create and destroy clusters for OS patching) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent d14a3b1 commit 7b99b54

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/java-sample-app-ecr-deploy.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# This workflow is for building and uploading the Java sample application to ECR.
55
# Java 11 will be built and uploaded to all regions to be used by the canary while
6-
# other versions (8, 17, 21, 22) will be uploaded to us-east-1 for the purpose of
6+
# other versions (8, 17, 21, 23) will be uploaded to us-east-1 for the purpose of
77
# testing ADOT Java
88
name: Sample App Deployment - Java ECR
99
on:
@@ -100,7 +100,7 @@ jobs:
100100
strategy:
101101
fail-fast: false
102102
matrix:
103-
java-version: [ '8', '17', '21', '22' ]
103+
java-version: [ '8', '17', '21', '23' ]
104104
runs-on: ubuntu-latest
105105
steps:
106106
- uses: actions/checkout@v4
@@ -127,8 +127,8 @@ jobs:
127127
run: |
128128
# For Java 8, springboot must be lower than version 3
129129
# For Java 11,17,21, they are compatible with both springboot version
130-
# For Java 22 and above, springboot must be version 3 or higher
131-
if [ "${{ matrix.java-version }}" = "22" ]; then
130+
# For Java 23 and above, springboot must be version 3 or higher
131+
if [ "${{ matrix.java-version }}" = "23" ]; then
132132
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
133133
cat build.gradle.kts
134134
fi
@@ -140,7 +140,7 @@ jobs:
140140
strategy:
141141
fail-fast: false
142142
matrix:
143-
java-version: [ '8', '17', '21', '22' ]
143+
java-version: [ '8', '17', '21', '23' ]
144144
runs-on: ubuntu-latest
145145
steps:
146146
- uses: actions/checkout@v4
@@ -167,8 +167,8 @@ jobs:
167167
run: |
168168
# For Java 8, springboot must be lower than version 3
169169
# For Java 11,17,21, they are compatible with both springboot version
170-
# For Java 22 and above, springboot must be version 3 or higher
171-
if [ "${{ matrix.java-version }}" = "22" ]; then
170+
# For Java 23 and above, springboot must be version 3 or higher
171+
if [ "${{ matrix.java-version }}" = "23" ]; then
172172
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
173173
cat build.gradle.kts
174174
fi

.github/workflows/java-sample-app-s3-deploy.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
## SPDX-License-Identifier: Apache-2.0
33

4-
# 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)
4+
# 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)
55
# will be uploaded to us-east-1 for the purpose of testing ADOT Java
66
name: Sample App Deployment - Java S3
77
on:
@@ -96,7 +96,7 @@ jobs:
9696
strategy:
9797
fail-fast: false
9898
matrix:
99-
java-version: [ '8', '17', '21', '22' ]
99+
java-version: [ '8', '17', '21', '23' ]
100100
runs-on: ubuntu-latest
101101
steps:
102102
- uses: actions/checkout@v4
@@ -117,8 +117,8 @@ jobs:
117117
run: |
118118
# For Java 8, springboot must be lower than version 3
119119
# For Java 11,17,21, they are compatible with both springboot version
120-
# For Java 22 and above, springboot must be version 3 or higher
121-
if [ "${{ matrix.java-version }}" = "22" ]; then
120+
# For Java 23 and above, springboot must be version 3 or higher
121+
if [ "${{ matrix.java-version }}" = "23" ]; then
122122
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
123123
cat build.gradle.kts
124124
fi
@@ -130,7 +130,7 @@ jobs:
130130
strategy:
131131
fail-fast: false
132132
matrix:
133-
java-version: [ '8', '17', '21', '22' ]
133+
java-version: [ '8', '17', '21', '23' ]
134134
runs-on: ubuntu-latest
135135
steps:
136136
- uses: actions/checkout@v4
@@ -151,8 +151,8 @@ jobs:
151151
run: |
152152
# For Java 8, springboot must be lower than version 3
153153
# For Java 11,17,21, they are compatible with both springboot version
154-
# For Java 22 and above, springboot must be version 3 or higher
155-
if [ "${{ matrix.java-version }}" = "22" ]; then
154+
# For Java 23 and above, springboot must be version 3 or higher
155+
if [ "${{ matrix.java-version }}" = "23" ]; then
156156
sed -i 's/id("org.springframework.boot")/id("org.springframework.boot") version "3.3.4"/' build.gradle.kts
157157
cat build.gradle.kts
158158
fi

0 commit comments

Comments
 (0)