Skip to content

Commit 428102c

Browse files
committed
chore(ci): Enable Java 25 E2E tests on Java 25 Lambda runtime.
1 parent 1457239 commit 428102c

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

.github/workflows/check-e2e.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
- 11
5555
- 17
5656
- 21
57+
- 25
5758

5859
steps:
5960
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -87,6 +88,7 @@ jobs:
8788
- 11
8889
- 17
8990
- 21
91+
- 25
9092

9193
steps:
9294
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

powertools-e2e-tests/handlers/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,15 @@
261261
<aspectj.version>1.9.21</aspectj.version>
262262
</properties>
263263
</profile>
264+
<profile>
265+
<id>jdk25</id>
266+
<activation>
267+
<jdk>[25,)</jdk>
268+
</activation>
269+
<properties>
270+
<aspectj.version>1.9.25</aspectj.version>
271+
</properties>
272+
</profile>
264273
</profiles>
265274

266275
</project>

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/Infrastructure.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,8 @@ private JavaRuntime mapRuntimeVersion(String environmentVariableName) {
522522
ret = JavaRuntime.JAVA17;
523523
} else if (javaVersion.startsWith("21")) {
524524
ret = JavaRuntime.JAVA21;
525+
} else if (javaVersion.startsWith("25")) {
526+
ret = JavaRuntime.JAVA25;
525527
} else {
526528
throw new IllegalArgumentException("Unsupported Java version " + javaVersion);
527529
}

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/testutils/JavaRuntime.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
public enum JavaRuntime {
2020
JAVA11("java11", Runtime.JAVA_11, "11"),
2121
JAVA17("java17", Runtime.JAVA_17, "17"),
22-
JAVA21("java21", Runtime.JAVA_21, "21");
22+
JAVA21("java21", Runtime.JAVA_21, "21"),
23+
JAVA25("java25", Runtime.JAVA_25, "25");
2324

2425
private final String runtime;
2526
private final Runtime cdkRuntime;

0 commit comments

Comments
 (0)