From afc5d36dace0eb1247df090c72aea91677adbdc2 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Fri, 18 Nov 2022 14:42:09 -0600 Subject: [PATCH 1/9] partially done --- build-tools-internal/version.properties | 2 +- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 46 ++++++++++--------------- modules/ingest-geoip/build.gradle | 6 ++-- modules/repository-azure/build.gradle | 14 ++++---- 5 files changed, 29 insertions(+), 41 deletions(-) diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index e445200ff58de..32617c9623a9d 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -7,7 +7,7 @@ bundled_jdk = 19.0.1+10@afdd2e245b014143b62ccb916125e3ce # optional dependencies spatial4j = 0.7 jts = 1.15.0 -jackson = 2.13.3 +jackson = 2.14.0 snakeyaml = 1.33 icu4j = 68.2 supercsv = 2.4.0 diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index ad0509058706b..b158b94c8f8a9 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -1,6 +1,6 @@ [versions] asm = "9.3" -jackson = "2.13.2" +jackson = "2.14.0" junit5 = "5.8.1" spock = "2.1-groovy-3.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2eb1bfda3018a..42835e65b7cbc 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -204,25 +204,10 @@ - - - - - - - - - - - - - - - - - - - + + + + @@ -274,6 +259,11 @@ + + + + + @@ -299,9 +289,9 @@ - - - + + + @@ -314,9 +304,9 @@ - - - + + + @@ -334,9 +324,9 @@ - - - + + + diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index 6163ae0f7776f..86f59753e4f22 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -29,9 +29,9 @@ tasks.named('internalClusterTestTestingConventions').configure { dependencies { implementation('com.maxmind.geoip2:geoip2:3.0.0') // geoip2 dependencies: - runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:2.13.1") - runtimeOnly("com.fasterxml.jackson.core:jackson-databind:2.13.1") - runtimeOnly("com.fasterxml.jackson.core:jackson-core:2.13.1") + runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") + runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") + runtimeOnly("com.fasterxml.jackson.core:jackson-core:${versions.jackson}") implementation('com.maxmind.db:maxmind-db:2.0.0') testImplementation 'org.elasticsearch:geolite2-databases:20191119' diff --git a/modules/repository-azure/build.gradle b/modules/repository-azure/build.gradle index 4fa84e80bf4a8..7f0b86f5db698 100644 --- a/modules/repository-azure/build.gradle +++ b/modules/repository-azure/build.gradle @@ -27,8 +27,6 @@ versions << [ 'azureCommon': '12.15.1', 'azureCore': '1.27.0', 'azureCoreHttpNetty': '1.11.9', - 'azureJackson': '2.13.2', - 'azureJacksonDatabind': '2.13.2.2', 'jakartaActivation': '1.2.1', 'jakartaXMLBind': '2.3.2', @@ -47,14 +45,14 @@ dependencies { api "com.azure:azure-core:${versions.azureCore}" // jackson - api "com.fasterxml.jackson.core:jackson-core:${versions.azureJackson}" - api "com.fasterxml.jackson.core:jackson-databind:${versions.azureJacksonDatabind}" - api "com.fasterxml.jackson.core:jackson-annotations:${versions.azureJackson}" + api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" + api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" + api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" // jackson xml - api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.azureJackson}" - api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.azureJackson}" - api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.azureJackson}" + api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.jackson}" + api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}" + api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}" api "jakarta.activation:jakarta.activation-api:${versions.jakartaActivation}" // The SDK uses javax.xml bindings api "jakarta.xml.bind:jakarta.xml.bind-api:${versions.jakartaXMLBind}" From 10a34752f56c659873bf8e0201a78bf8331d4342 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Fri, 18 Nov 2022 14:47:31 -0600 Subject: [PATCH 2/9] finish alignment --- gradle/verification-metadata.xml | 88 ++------------------------------ 1 file changed, 4 insertions(+), 84 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 42835e65b7cbc..f6f16e8188736 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -209,81 +209,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - @@ -294,11 +234,6 @@ - - - - - @@ -309,21 +244,6 @@ - - - - - - - - - - - - - - - From 479ebeff3b7be786698869a61a06393914413474 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Fri, 18 Nov 2022 15:33:53 -0600 Subject: [PATCH 3/9] Update docs/changelog/91725.yaml --- docs/changelog/91725.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/91725.yaml diff --git a/docs/changelog/91725.yaml b/docs/changelog/91725.yaml new file mode 100644 index 0000000000000..d36ad5fe921f3 --- /dev/null +++ b/docs/changelog/91725.yaml @@ -0,0 +1,5 @@ +pr: 91725 +summary: Align all usages of Jackson to be 2.14.0 +area: Infra/REST API +type: upgrade +issues: [] From 12755bf1fc6658339ae9960a78bf3c24f9fe9e2b Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Fri, 18 Nov 2022 15:55:07 -0600 Subject: [PATCH 4/9] align x-content --- libs/x-content/impl/build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/x-content/impl/build.gradle b/libs/x-content/impl/build.gradle index 0588efe9889c5..a703bd0b44f9c 100644 --- a/libs/x-content/impl/build.gradle +++ b/libs/x-content/impl/build.gradle @@ -10,15 +10,13 @@ apply plugin: 'elasticsearch.java' archivesBaseName = "x-content-impl" -String jacksonVersion = "2.14.0" - dependencies { compileOnly project(':libs:elasticsearch-core') compileOnly project(':libs:elasticsearch-x-content') - implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}" + implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" implementation "org.yaml:snakeyaml:${versions.snakeyaml}" testImplementation(project(":test:framework")) { From c92f3f6a2f35c39353de30aed412c73b655b2411 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Wed, 1 Feb 2023 17:06:29 +0100 Subject: [PATCH 5/9] keep azure on the same version --- modules/repository-azure/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/repository-azure/build.gradle b/modules/repository-azure/build.gradle index a07f1d38f9bca..aa35dc85ea38f 100644 --- a/modules/repository-azure/build.gradle +++ b/modules/repository-azure/build.gradle @@ -27,8 +27,8 @@ versions << [ 'azureCommon': '12.19.1', 'azureCore': '1.34.0', 'azureCoreHttpNetty': '1.12.7', - 'azureJackson': '2.14.2', - 'azureJacksonDatabind': '2.14.2', + 'azureJackson': '2.13.4', + 'azureJacksonDatabind': '2.13.4.2', 'jakartaActivation': '1.2.1', 'jakartaXMLBind': '2.3.2', From 3ad0ac125add71192f3ffbae2d0c4d53592cb7ee Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Wed, 1 Feb 2023 17:42:05 +0100 Subject: [PATCH 6/9] update 2.14.0 -> 2.14.2 --- build-tools-internal/version.properties | 2 +- docs/changelog/91725.yaml | 5 ----- gradle/build.versions.toml | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 docs/changelog/91725.yaml diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 25292009cda4b..182a03c27a818 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -7,7 +7,7 @@ bundled_jdk = 19.0.2+7@fdb695a9d9064ad6b064dc6df578380c # optional dependencies spatial4j = 0.7 jts = 1.15.0 -jackson = 2.14.0 +jackson = 2.14.2 snakeyaml = 1.33 icu4j = 68.2 supercsv = 2.4.0 diff --git a/docs/changelog/91725.yaml b/docs/changelog/91725.yaml deleted file mode 100644 index d36ad5fe921f3..0000000000000 --- a/docs/changelog/91725.yaml +++ /dev/null @@ -1,5 +0,0 @@ -pr: 91725 -summary: Align all usages of Jackson to be 2.14.0 -area: Infra/REST API -type: upgrade -issues: [] diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index ff087c2520c4b..638c2ac141876 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -1,6 +1,6 @@ [versions] asm = "9.3" -jackson = "2.14.0" +jackson = "2.14.2" junit5 = "5.8.1" spock = "2.1-groovy-3.0" From 75b074af65755364614c4ab32ad06af082b71767 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Thu, 2 Feb 2023 09:26:12 +0100 Subject: [PATCH 7/9] verification metadata --- gradle/verification-metadata.xml | 96 +++++--------------------------- 1 file changed, 13 insertions(+), 83 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index e0cfa911e80d7..f0269afec0b3b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -229,46 +229,21 @@ - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - @@ -284,39 +259,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -324,41 +274,21 @@ - - - - - - - - - - - - - - - - - - - - @@ -379,11 +309,6 @@ - - - - - @@ -829,6 +754,11 @@ + + + + + From fc2002667022ef3548653f63a7b38b3009950f78 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Thu, 2 Feb 2023 09:28:19 +0100 Subject: [PATCH 8/9] Update docs/changelog/93438.yaml --- docs/changelog/93438.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/93438.yaml diff --git a/docs/changelog/93438.yaml b/docs/changelog/93438.yaml new file mode 100644 index 0000000000000..24464b4245d9e --- /dev/null +++ b/docs/changelog/93438.yaml @@ -0,0 +1,5 @@ +pr: 93438 +summary: Align all usages of Jackson to be 2.14.2 +area: Infra/Core +type: upgrade +issues: [] From 8468c3b9db728eda9c48d8bceefa796782b82cff Mon Sep 17 00:00:00 2001 From: Przemyslaw Gomulka Date: Thu, 2 Feb 2023 12:09:53 +0100 Subject: [PATCH 9/9] fix maxind version --- gradle/verification-metadata.xml | 5 ----- modules/ingest-geoip/build.gradle | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f0269afec0b3b..7020afee1703f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -754,11 +754,6 @@ - - - - - diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index af70a07c0aedc..7af3ee95b08fa 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -32,7 +32,7 @@ dependencies { runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") runtimeOnly("com.fasterxml.jackson.core:jackson-core:${versions.jackson}") - implementation('com.maxmind.db:maxmind-db:2.0.0') + implementation('com.maxmind.db:maxmind-db:2.1.0') testImplementation 'org.elasticsearch:geolite2-databases:20191119' internalClusterTestImplementation project(path: ":modules:reindex")