This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9_1
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_1 by this push:
new 93d6905e185 SOLR-16598: Upgrade Protobuf to 3.21.12 (#1252)
93d6905e185 is described below
commit 93d6905e1854c7122c78991310044ccfc6f05ebc
Author: David Smiley <[email protected]>
AuthorDate: Sat Dec 31 17:37:09 2022 -0500
SOLR-16598: Upgrade Protobuf to 3.21.12 (#1252)
from 3.21.8
Fixes some CVEs.
---
solr/CHANGES.txt | 2 ++
solr/licenses/protobuf-java-3.21.12.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.21.4.jar.sha1 | 1 -
solr/licenses/protobuf-java-util-3.21.12.jar.sha1 | 1 +
solr/licenses/protobuf-java-util-3.21.4.jar.sha1 | 1 -
versions.lock | 4 ++--
versions.props | 1 +
7 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d3072bcdc81..8bfbccc7c84 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -20,6 +20,8 @@ Other Changes
* SOLR-16568: Upgrade woodstox-core to 6.4.0 (Kira Traynor)
+* SOLR-16598: Upgrade Protobuf to 3.21.12 (David Smiley)
+
================== 9.1.0 ==================
New Features
diff --git a/solr/licenses/protobuf-java-3.21.12.jar.sha1
b/solr/licenses/protobuf-java-3.21.12.jar.sha1
new file mode 100644
index 00000000000..7757be40e25
--- /dev/null
+++ b/solr/licenses/protobuf-java-3.21.12.jar.sha1
@@ -0,0 +1 @@
+5589e79a33cb6509f7e681d7cf4fc59d47c51c71
diff --git a/solr/licenses/protobuf-java-3.21.4.jar.sha1
b/solr/licenses/protobuf-java-3.21.4.jar.sha1
deleted file mode 100644
index 7a2fa3257e4..00000000000
--- a/solr/licenses/protobuf-java-3.21.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9947febd7a6d0695726c78f603a149b7b7c108e0
diff --git a/solr/licenses/protobuf-java-util-3.21.12.jar.sha1
b/solr/licenses/protobuf-java-util-3.21.12.jar.sha1
new file mode 100644
index 00000000000..c23f066d1a2
--- /dev/null
+++ b/solr/licenses/protobuf-java-util-3.21.12.jar.sha1
@@ -0,0 +1 @@
+1a800bf7976d939217c8d91ed9a17d7a78bf2187
diff --git a/solr/licenses/protobuf-java-util-3.21.4.jar.sha1
b/solr/licenses/protobuf-java-util-3.21.4.jar.sha1
deleted file mode 100644
index 59db3352551..00000000000
--- a/solr/licenses/protobuf-java-util-3.21.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3300eee68565acbdaae14885b9ebf32ba5cb6e97
diff --git a/versions.lock b/versions.lock
index c43e7d67939..c9967dd00cc 100644
--- a/versions.lock
+++ b/versions.lock
@@ -45,8 +45,8 @@ com.google.http-client:google-http-client-gson:1.42.2 (6
constraints: e6619899)
com.google.http-client:google-http-client-jackson2:1.42.2 (1 constraints:
1d1003a6)
com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)
com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.21.4 (9 constraints: 3183ce88)
-com.google.protobuf:protobuf-java-util:3.21.4 (3 constraints: 332b642b)
+com.google.protobuf:protobuf-java:3.21.12 (9 constraints: 6083a7fc)
+com.google.protobuf:protobuf-java-util:3.21.12 (4 constraints: 9d303921)
com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
com.googlecode.juniversalchardet:juniversalchardet:1.0.3 (1 constraints:
5b0ce401)
diff --git a/versions.props b/versions.props
index 45bf263b753..b6e3670a6ae 100644
--- a/versions.props
+++ b/versions.props
@@ -11,6 +11,7 @@ com.github.zafarkhaja:java-semver=0.9.0
com.google.cloud:google-cloud-bom=0.178.0
com.google.errorprone:*=2.15.0
com.google.guava:guava=31.1-jre
+com.google.protobuf:protobuf-java-util=3.21.12
com.google.re2j:re2j=1.2
com.jayway.jsonpath:json-path=2.7.0
com.lmax:disruptor=3.4.2
