This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 15ccf1f82 [ISSUE-3942]Bump protobuf-java from 3.15.8 to 3.16.3 (#3943)
15ccf1f82 is described below
commit 15ccf1f828995c7682fa20188b6a55051af2f354
Author: 成彬彬 <[email protected]>
AuthorDate: Fri Dec 9 14:20:52 2022 +0800
[ISSUE-3942]Bump protobuf-java from 3.15.8 to 3.16.3 (#3943)
---
linkis-dist/release-docs/LICENSE | 2 +-
pom.xml | 11 ++++++-----
tool/dependencies/known-dependencies.txt | 3 +--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/linkis-dist/release-docs/LICENSE b/linkis-dist/release-docs/LICENSE
index 16b30a63c..534bf6742 100644
--- a/linkis-dist/release-docs/LICENSE
+++ b/linkis-dist/release-docs/LICENSE
@@ -659,7 +659,7 @@ See licenses/ for text of these licenses.
(The 3-Clause BSD License) (WTFPL) Reflections
(org.reflections:reflections:0.9.10 - http://github.com/ronmamo/reflections)
(The 3-Clause BSD License) Commons Compiler
(org.codehaus.janino:commons-compiler:2.7.6 -
http://docs.codehaus.org/display/JANINO/Home/commons-compiler)
(The 3-Clause BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3 -
https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
- (The 3-Clause BSD License) Protocol Buffer Java API
(com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf)
+ (The 3-Clause BSD License) Protocol Buffer Java API
(com.google.protobuf:protobuf-java:3.16.3 - http://code.google.com/p/protobuf)
(The 3-Clause BSD License) Py4J (net.sf.py4j:py4j:0.10.4 -
http://nexus.sonatype.org/oss-repository-hosting.html/py4j)
(The 3-Clause BSD License) Scala Compiler
(org.scala-lang:scala-compiler:2.11.12 - http://www.scala-lang.org/)
(The 3-Clause BSD License) Scala Compiler
(org.scala-lang:scala-reflect:2.11.12 - http://www.scala-lang.org/)
diff --git a/pom.xml b/pom.xml
index fbdd6af48..cac98f02c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<commons-compress.version>1.21</commons-compress.version>
<commons-configuration.version>1.10</commons-configuration.version>
<commons-exec.version>1.3</commons-exec.version>
- <protobuf.version>3.15.8</protobuf.version>
+ <protobuf.version>3.16.3</protobuf.version>
<cglib.version>3.3.0</cglib.version>
<asm-bom.version>9.3</asm-bom.version>
<slf4j.version>1.7.30</slf4j.version>
@@ -441,6 +441,11 @@
<artifactId>jersey-guice</artifactId>
<version>${jersey.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
@@ -541,10 +546,6 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
diff --git a/tool/dependencies/known-dependencies.txt
b/tool/dependencies/known-dependencies.txt
index b7051966f..c0723dc66 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -424,8 +424,7 @@ presto-client-0.234.jar
presto-client-1.5.0.jar
presto-resource-group-managers-0.234.jar
presto-spi-0.234.jar
-protobuf-java-3.14.0.jar
-protobuf-java-3.15.8.jar
+protobuf-java-3.16.3.jar
protostuff-api-1.6.2.jar
protostuff-collectionschema-1.6.2.jar
protostuff-core-1.6.2.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
