From 94833ef613ea7d080e4cf9448a7b6c746a350a1f Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 29 Apr 2024 21:23:39 -0700 Subject: [PATCH 1/2] Fix #1277: add JDK 22 optimizations back to FDP --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4dd8afe98b..a2b2a76187 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,6 @@ com.fasterxml.jackson.core.*;version=${project.version} ch.randelshofer:fastdoubleparser META-INF/versions/**/module-info.* - META-INF/versions/22/**/*.* @@ -207,6 +206,10 @@ com.fasterxml.jackson.core.*;version=${project.version} META-INF/versions/21/ch/randelshofer/fastdoubleparser META-INF/versions/21/com/fasterxml/jackson/core/io/doubleparser + + META-INF/versions/22/ch/randelshofer/fastdoubleparser + META-INF/versions/22/com/fasterxml/jackson/core/io/doubleparser + From 2b57b2bc7f56da7c26b4aba8315a69c342442150 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 29 Apr 2024 21:25:27 -0700 Subject: [PATCH 2/2] Enabled JDK 22 in GH action --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 369363e45d..ad432ee460 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['8', '11', '17', '21'] + java_version: ['8', '11', '17', '21', '22'] os: ['ubuntu-20.04'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"