From 7f6811fa52e72b358810fc1e1de276c4ec272063 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 2 Dec 2024 20:46:30 -0800 Subject: [PATCH 1/3] Update Java baseline to Java 17 [databind#4820] --- .github/workflows/main.yml | 6 ++---- pom.xml | 6 ++++++ release-notes/VERSION | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2ed9ae5..712fb5d4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,6 @@ on: branches: - master - "3.0" - - "2.19" paths-ignore: - "README.md" - "release-notes/*" @@ -12,7 +11,6 @@ on: branches: - master - "3.0" - - "2.19" paths-ignore: - "README.md" - "release-notes/*" @@ -22,11 +20,11 @@ permissions: jobs: build: - runs-on: 'ubuntu-20.04' + runs-on: 'ubuntu-22.04' strategy: fail-fast: false matrix: - java_version: ['8', '11', '17', '21'] + java_version: ['17', '21'] include: - java_version: '8' release_build: 'R' diff --git a/pom.xml b/pom.xml index 4380cfc8..2b7a36d0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,12 @@ https://github.com/FasterXML/jackson-modules-java8/issues + + + 17 + 17 + + diff --git a/release-notes/VERSION b/release-notes/VERSION index a0da7bb6..84e4f3a6 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -17,6 +17,7 @@ due to number of types. - #68: Parsing of `ZoneId` should respect `ALLOW_COERCION_OF_SCALARS` wrt empty String +- Minimum Java baseline: Java 17 - Deprecate "paramater names" and "datatypes" modules as functionality now included directly in `jackson-databind` - Remove legacy `JSR310Module` From 234267da37ac17845f578f1588712b0870fa960f Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 2 Dec 2024 20:51:39 -0800 Subject: [PATCH 2/3] Yet another fix to CI (this time wrt 3.0) --- .github/workflows/main.yml | 2 +- datetime/pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 712fb5d4..3dcbc62b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: matrix: java_version: ['17', '21'] include: - - java_version: '8' + - java_version: '17' release_build: 'R' env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" diff --git a/datetime/pom.xml b/datetime/pom.xml index 52319b6a..832c0bcc 100644 --- a/datetime/pom.xml +++ b/datetime/pom.xml @@ -51,7 +51,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 true ${javac.src.version} From b8c7f29175d8433d6517cc9534f62a7e3b40461d Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Tue, 3 Dec 2024 10:18:36 -0800 Subject: [PATCH 3/3] Update JDK for dep builds too --- .github/workflows/dep_build_v3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml index cf461a51..6da2dd55 100644 --- a/.github/workflows/dep_build_v3.yml +++ b/.github/workflows/dep_build_v3.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['8', '17', '21'] + java_version: ['17', '21'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: