You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/12/08 15:06:17 UTC
[solr] 01/03: SOLR-16579: Upgrade Jackson to 2.14.1
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 209ad546a9a8a14485ff126c59c6eee61652d62a
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Wed Dec 7 14:28:50 2022 -0500
SOLR-16579: Upgrade Jackson to 2.14.1
---
solr/CHANGES.txt | 2 ++
solr/licenses/jackson-annotations-2.13.4.jar.sha1 | 1 -
solr/licenses/jackson-annotations-2.14.1.jar.sha1 | 1 +
solr/licenses/jackson-core-2.13.4.jar.sha1 | 1 -
solr/licenses/jackson-core-2.14.1.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.13.4.2.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.14.1.jar.sha1 | 1 +
.../jackson-dataformat-cbor-2.13.4.jar.sha1 | 1 -
.../jackson-dataformat-cbor-2.14.1.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.13.4.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.14.1.jar.sha1 | 1 +
.../jackson-dataformat-xml-2.13.4.jar.sha1 | 1 -
.../jackson-dataformat-xml-2.14.1.jar.sha1 | 1 +
.../licenses/jackson-datatype-jdk8-2.13.4.jar.sha1 | 1 -
.../licenses/jackson-datatype-jdk8-2.14.1.jar.sha1 | 1 +
.../jackson-datatype-jsr310-2.13.4.jar.sha1 | 1 -
.../jackson-datatype-jsr310-2.14.1.jar.sha1 | 1 +
...jackson-module-jaxb-annotations-2.13.4.jar.sha1 | 1 -
...jackson-module-jaxb-annotations-2.14.1.jar.sha1 | 1 +
.../licenses/jackson-module-kotlin-2.13.4.jar.sha1 | 1 -
.../licenses/jackson-module-kotlin-2.14.1.jar.sha1 | 1 +
.../jackson-module-parameter-names-2.13.4.jar.sha1 | 1 -
.../jackson-module-parameter-names-2.14.1.jar.sha1 | 1 +
versions.lock | 30 +++++++++++-----------
versions.props | 2 +-
25 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index edbe68c9767..e1bbe77f93d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -137,6 +137,8 @@ Other Changes
* SOLR-16568: Upgrade woodstox-core to 6.4.0 (Kira Traynor)
+* SOLR-16579: Upgrade Jackson to 2.14.1 (Kevin Risden)
+
================== 9.1.0 ==================
New Features
diff --git a/solr/licenses/jackson-annotations-2.13.4.jar.sha1 b/solr/licenses/jackson-annotations-2.13.4.jar.sha1
deleted file mode 100644
index 396e92aed89..00000000000
--- a/solr/licenses/jackson-annotations-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-858c6cc78e1f08a885b1613e1d817c829df70a6e
diff --git a/solr/licenses/jackson-annotations-2.14.1.jar.sha1 b/solr/licenses/jackson-annotations-2.14.1.jar.sha1
new file mode 100644
index 00000000000..057196abd81
--- /dev/null
+++ b/solr/licenses/jackson-annotations-2.14.1.jar.sha1
@@ -0,0 +1 @@
+2a6ad504d591a7903ffdec76b5b7252819a2d162
diff --git a/solr/licenses/jackson-core-2.13.4.jar.sha1 b/solr/licenses/jackson-core-2.13.4.jar.sha1
deleted file mode 100644
index eff93324d03..00000000000
--- a/solr/licenses/jackson-core-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0cf934c681294b97ef6d80082faeefbe1edadf56
diff --git a/solr/licenses/jackson-core-2.14.1.jar.sha1 b/solr/licenses/jackson-core-2.14.1.jar.sha1
new file mode 100644
index 00000000000..afed0543002
--- /dev/null
+++ b/solr/licenses/jackson-core-2.14.1.jar.sha1
@@ -0,0 +1 @@
+7a07bc535ccf0b7f6929c4d0f2ab9b294ef7c4a3
diff --git a/solr/licenses/jackson-databind-2.13.4.2.jar.sha1 b/solr/licenses/jackson-databind-2.13.4.2.jar.sha1
deleted file mode 100644
index 5aa5c2d8a8f..00000000000
--- a/solr/licenses/jackson-databind-2.13.4.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-325c06bdfeb628cfb80ebaaf1a26cc1eb558a585
diff --git a/solr/licenses/jackson-databind-2.14.1.jar.sha1 b/solr/licenses/jackson-databind-2.14.1.jar.sha1
new file mode 100644
index 00000000000..46739d94215
--- /dev/null
+++ b/solr/licenses/jackson-databind-2.14.1.jar.sha1
@@ -0,0 +1 @@
+268524b9056cae1211b9f1f52560ef19347f4d17
diff --git a/solr/licenses/jackson-dataformat-cbor-2.13.4.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.13.4.jar.sha1
deleted file mode 100644
index 1d75293b298..00000000000
--- a/solr/licenses/jackson-dataformat-cbor-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ccaf21e6a02a20cae6591a12d20bf310544cf3ee
diff --git a/solr/licenses/jackson-dataformat-cbor-2.14.1.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.14.1.jar.sha1
new file mode 100644
index 00000000000..598985f8549
--- /dev/null
+++ b/solr/licenses/jackson-dataformat-cbor-2.14.1.jar.sha1
@@ -0,0 +1 @@
+04e6fbcdcd2a01e4a5cb5901338cab6199c9b26b
diff --git a/solr/licenses/jackson-dataformat-smile-2.13.4.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.13.4.jar.sha1
deleted file mode 100644
index 8230f231d5f..00000000000
--- a/solr/licenses/jackson-dataformat-smile-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4161a7c3914a12e7b7940ea53eb3c53e17aea91b
diff --git a/solr/licenses/jackson-dataformat-smile-2.14.1.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.14.1.jar.sha1
new file mode 100644
index 00000000000..1481c49368d
--- /dev/null
+++ b/solr/licenses/jackson-dataformat-smile-2.14.1.jar.sha1
@@ -0,0 +1 @@
+656ccecc1fc85b95d13e5b8080289fc1a5e5e21e
diff --git a/solr/licenses/jackson-dataformat-xml-2.13.4.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.13.4.jar.sha1
deleted file mode 100644
index 33baaf3fc5b..00000000000
--- a/solr/licenses/jackson-dataformat-xml-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b739978806ffc80967ba0efe43b1296c29c4cfe8
diff --git a/solr/licenses/jackson-dataformat-xml-2.14.1.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.14.1.jar.sha1
new file mode 100644
index 00000000000..06909e10810
--- /dev/null
+++ b/solr/licenses/jackson-dataformat-xml-2.14.1.jar.sha1
@@ -0,0 +1 @@
+ccd98bd674080338a6ca4bcdd52be7fb465cec1d
diff --git a/solr/licenses/jackson-datatype-jdk8-2.13.4.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.13.4.jar.sha1
deleted file mode 100644
index f7a8d7df60c..00000000000
--- a/solr/licenses/jackson-datatype-jdk8-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-557dbba5d8dfc7b7f944c58fe084109afcb5670b
diff --git a/solr/licenses/jackson-datatype-jdk8-2.14.1.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.14.1.jar.sha1
new file mode 100644
index 00000000000..aaab9a9e15d
--- /dev/null
+++ b/solr/licenses/jackson-datatype-jdk8-2.14.1.jar.sha1
@@ -0,0 +1 @@
+da194197d187bf24a8699514344ebf0abd7c342a
diff --git a/solr/licenses/jackson-datatype-jsr310-2.13.4.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.13.4.jar.sha1
deleted file mode 100644
index 31b29d076f8..00000000000
--- a/solr/licenses/jackson-datatype-jsr310-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e6d820112871f33cd94a1dcc54eef58874753b5
diff --git a/solr/licenses/jackson-datatype-jsr310-2.14.1.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.14.1.jar.sha1
new file mode 100644
index 00000000000..8a482d45c99
--- /dev/null
+++ b/solr/licenses/jackson-datatype-jsr310-2.14.1.jar.sha1
@@ -0,0 +1 @@
+f24e8cb1437e05149b7a3049ebd6700f42e664b1
diff --git a/solr/licenses/jackson-module-jaxb-annotations-2.13.4.jar.sha1 b/solr/licenses/jackson-module-jaxb-annotations-2.13.4.jar.sha1
deleted file mode 100644
index 0c83342b9f9..00000000000
--- a/solr/licenses/jackson-module-jaxb-annotations-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da90f334c1e752342f2dedb59880d5d46b29fe03
diff --git a/solr/licenses/jackson-module-jaxb-annotations-2.14.1.jar.sha1 b/solr/licenses/jackson-module-jaxb-annotations-2.14.1.jar.sha1
new file mode 100644
index 00000000000..9416b712f97
--- /dev/null
+++ b/solr/licenses/jackson-module-jaxb-annotations-2.14.1.jar.sha1
@@ -0,0 +1 @@
+c986d9cc542fe5ade8aaebf5f0360a563dc51762
diff --git a/solr/licenses/jackson-module-kotlin-2.13.4.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.13.4.jar.sha1
deleted file mode 100644
index 47b23d2e527..00000000000
--- a/solr/licenses/jackson-module-kotlin-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f9cfefe0d853fc5704e6e366d531c82a1f8c3881
diff --git a/solr/licenses/jackson-module-kotlin-2.14.1.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.14.1.jar.sha1
new file mode 100644
index 00000000000..69986464fc8
--- /dev/null
+++ b/solr/licenses/jackson-module-kotlin-2.14.1.jar.sha1
@@ -0,0 +1 @@
+9230908f5a521fc2afccdd62c50bb7bb9ef633a1
diff --git a/solr/licenses/jackson-module-parameter-names-2.13.4.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.13.4.jar.sha1
deleted file mode 100644
index 50042ca5892..00000000000
--- a/solr/licenses/jackson-module-parameter-names-2.13.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-858ccf6624b5fac6044813e845063edb6a62cf37
diff --git a/solr/licenses/jackson-module-parameter-names-2.14.1.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.14.1.jar.sha1
new file mode 100644
index 00000000000..e0aa778bea5
--- /dev/null
+++ b/solr/licenses/jackson-module-parameter-names-2.14.1.jar.sha1
@@ -0,0 +1 @@
+2e05a86dba3d4b05074b6a313c4d5b7ff844c8dd
diff --git a/versions.lock b/versions.lock
index 60615843487..85d429cb1e2 100644
--- a/versions.lock
+++ b/versions.lock
@@ -6,13 +6,13 @@ com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6)
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints: cf1501e2)
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
-com.fasterxml.jackson:jackson-bom:2.13.4.20221013 (12 constraints: 07fa9222)
-com.fasterxml.jackson.core:jackson-annotations:2.13.4 (10 constraints: 95be0c15)
-com.fasterxml.jackson.core:jackson-core:2.13.4 (13 constraints: 3c026a27)
-com.fasterxml.jackson.core:jackson-databind:2.13.4.2 (18 constraints: 3a6455da)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.4 (1 constraints: ba0ea766)
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4 (2 constraints: a624c1e0)
-com.fasterxml.woodstox:woodstox-core:6.4.0 (3 constraints: af28dab7)
+com.fasterxml.jackson:jackson-bom:2.14.1 (12 constraints: 36f86334)
+com.fasterxml.jackson.core:jackson-annotations:2.14.1 (10 constraints: 89beae04)
+com.fasterxml.jackson.core:jackson-core:2.14.1 (13 constraints: 2a028008)
+com.fasterxml.jackson.core:jackson-databind:2.14.1 (18 constraints: c863ae0d)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.1 (1 constraints: b80ea766)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.1 (2 constraints: a42445e0)
+com.fasterxml.woodstox:woodstox-core:6.4.0 (3 constraints: af28dcb7)
com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
com.github.junrar:junrar:7.5.2 (1 constraints: 650c1002)
@@ -107,7 +107,7 @@ io.prometheus:simpleclient_common:0.2.0 (1 constraints: e51014af)
io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
io.swagger.core.v3:swagger-annotations:2.2.2 (1 constraints: 0805fd35)
-jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: ba28fcbd)
+jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: bb282bbe)
jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9)
jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (10 constraints: c1cce3ec)
@@ -340,12 +340,12 @@ com.amazonaws:aws-java-sdk-core:1.12.15 (2 constraints: 501a5183)
com.amazonaws:aws-java-sdk-kms:1.12.15 (1 constraints: d60cb42a)
com.amazonaws:aws-java-sdk-s3:1.12.15 (1 constraints: e0125c30)
com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.4 (2 constraints: 601c12f1)
-com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4 (2 constraints: a719c812)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4 (2 constraints: 0c243982)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4 (3 constraints: 7d3d5a10)
-com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4 (2 constraints: a61d2f60)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4 (2 constraints: 0c243982)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.1 (2 constraints: 5e1c12f1)
+com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.1 (2 constraints: a519c812)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.1 (2 constraints: 0a24c381)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1 (3 constraints: 7b3d5a0f)
+com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1 (2 constraints: a41dd75f)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.1 (2 constraints: 0a24c381)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)
com.google.cloud:google-cloud-nio:0.124.14 (1 constraints: c90e1c7b)
com.nimbusds:content-type:2.2 (1 constraints: d80b68eb)
@@ -389,7 +389,7 @@ org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constrain
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)
org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
-org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 602486e2)
+org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2)
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (2 constraints: 5e203d24)
org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
diff --git a/versions.props b/versions.props
index 95a10dc8226..431c8fe086a 100644
--- a/versions.props
+++ b/versions.props
@@ -3,7 +3,7 @@ com.adobe.testing:s3mock-junit4=2.1.34
com.carrotsearch.randomizedtesting:*=2.8.1
com.carrotsearch:hppc=0.9.1
com.cybozu.labs:langdetect=1.1-20120112
-com.fasterxml.jackson:jackson-bom=2.13.4.20221013
+com.fasterxml.jackson:jackson-bom=2.14.1
com.fasterxml.woodstox:woodstox-core=6.4.0
com.github.ben-manes.caffeine:caffeine=3.1.1
com.github.spotbugs:*=4.7.2