From 8c1dfaba47f36ee4845472287e0860f620b43eac Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 25 Apr 2024 13:08:48 +0200 Subject: [PATCH 1/4] Upgrade JDK compatibility tests --- .github/workflows/main.yml | 2 +- .../src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 419c369cd3..0d5944b6e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -301,7 +301,7 @@ jobs: distribution: 'temurin' - version: 21 distribution: 'temurin' - - version: 22-ea + - version: 22 distribution: 'temurin' steps: - uses: actions/checkout@v4 diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java index 324ddf7014..c4d8b958d9 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java @@ -33,7 +33,6 @@ public class JdkVersionTest { private static List releaseSchedule() { // from https://www.oracle.com/java/technologies/java-se-support-roadmap.html return List.of( - Arguments.of(22, LocalDate.parse("2024-04-01")), Arguments.of(23, LocalDate.parse("2024-10-01")), Arguments.of(24, LocalDate.parse("2025-04-01")), Arguments.of(25, LocalDate.parse("2025-10-01")) From 2573dfe3a18e2f2c81a3b42097cf97cba36e57aa Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 25 Apr 2024 13:11:49 +0200 Subject: [PATCH 2/4] Added JDK 23 ea --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d5944b6e3..200adce6cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -303,6 +303,8 @@ jobs: distribution: 'temurin' - version: 22 distribution: 'temurin' + - version: 23-ea + distribution: 'temurin' steps: - uses: actions/checkout@v4 - uses: ./.github/workflows/maven-goal-jdk From 6e360ccd4ba318a88707e1d8181c96ba18582779 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 25 Apr 2024 13:40:38 +0200 Subject: [PATCH 3/4] Attempt to set net.bytebuddy.experimental for EA versions --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 200adce6cb..c424736720 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -297,14 +297,19 @@ jobs: include: - version: 11 distribution: 'temurin' + additional-properties: "" - version: 17 distribution: 'temurin' + additional-properties: "" - version: 21 distribution: 'temurin' + additional-properties: "" - version: 22 distribution: 'temurin' + additional-properties: "" - version: 23-ea distribution: 'temurin' + additional-properties: "-Dnet.bytebuddy.experimental=true" steps: - uses: actions/checkout@v4 - uses: ./.github/workflows/maven-goal-jdk @@ -313,7 +318,7 @@ jobs: test-java-distribution: ${{ matrix.distribution }} command: ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true - name: Run tests for ${{ matrix.version }}:${{ matrix.distribution }} - run: ./mvnw test -Delastic.jdkCompatibilityTest=true -Dtest_java_binary=${{ env.TEST_JAVA_BINARY }} + run: ./mvnw test -Delastic.jdkCompatibilityTest=true -Dtest_java_binary=${{ env.TEST_JAVA_BINARY }} ${{ matrix.additional-properties }} - name: Store test results if: success() || failure() uses: actions/upload-artifact@v4 From 67cc278d8ad97b219ed9000c617ee100f68504dd Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 25 Apr 2024 14:15:04 +0200 Subject: [PATCH 4/4] Remove java 23-ea tests --- .github/workflows/main.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c424736720..0d5944b6e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -297,19 +297,12 @@ jobs: include: - version: 11 distribution: 'temurin' - additional-properties: "" - version: 17 distribution: 'temurin' - additional-properties: "" - version: 21 distribution: 'temurin' - additional-properties: "" - version: 22 distribution: 'temurin' - additional-properties: "" - - version: 23-ea - distribution: 'temurin' - additional-properties: "-Dnet.bytebuddy.experimental=true" steps: - uses: actions/checkout@v4 - uses: ./.github/workflows/maven-goal-jdk @@ -318,7 +311,7 @@ jobs: test-java-distribution: ${{ matrix.distribution }} command: ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true - name: Run tests for ${{ matrix.version }}:${{ matrix.distribution }} - run: ./mvnw test -Delastic.jdkCompatibilityTest=true -Dtest_java_binary=${{ env.TEST_JAVA_BINARY }} ${{ matrix.additional-properties }} + run: ./mvnw test -Delastic.jdkCompatibilityTest=true -Dtest_java_binary=${{ env.TEST_JAVA_BINARY }} - name: Store test results if: success() || failure() uses: actions/upload-artifact@v4