This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new c8c1a352d73 SOLR-16598: Upgrade Protobuf to 3.21.12 (#1252)
c8c1a352d73 is described below
commit c8c1a352d73d00de2059347d252aa6a2061f9777
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/licenses/protobuf-java-3.21.12.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.21.8.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 +
6 files changed, 5 insertions(+), 4 deletions(-)
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.8.jar.sha1
b/solr/licenses/protobuf-java-3.21.8.jar.sha1
deleted file mode 100644
index d88ce20792b..00000000000
--- a/solr/licenses/protobuf-java-3.21.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a1eebb74b844d9ccdf1d22eb2f57cec709698a9
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 e7c99f910d6..a42252e1c2a 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.8 (10 constraints: 649360d7)
-com.google.protobuf:protobuf-java-util:3.21.4 (3 constraints: 332b642b)
+com.google.protobuf:protobuf-java:3.21.12 (10 constraints: 93937b5b)
+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 88e0c01aea6..924d066f98b 100644
--- a/versions.props
+++ b/versions.props
@@ -10,6 +10,7 @@ com.github.spotbugs:*=4.7.2
com.google.cloud:google-cloud-bom=0.178.0
com.google.errorprone:*=2.16
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
