This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new b72077011b [Fix-13987][bom] set 3.17.2 version protobuf-java (#13998)
b72077011b is described below
commit b72077011bd667e44784abb094302a34ae4e5789
Author: eye-gu <[email protected]>
AuthorDate: Tue Jul 11 21:54:24 2023 +0800
[Fix-13987][bom] set 3.17.2 version protobuf-java (#13998)
Co-authored-by: eye <[email protected]>
---
dolphinscheduler-bom/pom.xml | 7 +++++++
dolphinscheduler-dist/release-docs/LICENSE | 1 -
tools/dependencies/known-dependencies.txt | 1 -
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml
index af622b1a86..b3050b86b0 100644
--- a/dolphinscheduler-bom/pom.xml
+++ b/dolphinscheduler-bom/pom.xml
@@ -114,6 +114,7 @@
<fabric8.client.version>6.0.0</fabric8.client.version>
<casdoor.version>1.6.0</casdoor.version>
<azure-sdk-bom.version>1.2.10</azure-sdk-bom.version>
+ <protobuf.version>3.17.2</protobuf.version>
</properties>
<dependencyManagement>
@@ -888,6 +889,12 @@
<artifactId>snowflake-jdbc</artifactId>
<version>${snowflake-jdbc.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>
diff --git a/dolphinscheduler-dist/release-docs/LICENSE
b/dolphinscheduler-dist/release-docs/LICENSE
index e3b49541d7..6f5b8dace7 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -578,7 +578,6 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
jsch 0.1.42: https://mvnrepository.com/artifact/com.jcraft/jsch/0.1.42, BSD
leveldbjni-all 1.8:
https://mvnrepository.com/artifact/org.fusesource.leveldbjni/leveldbjni-all/1.8,
BSD 3-clause
postgresql 42.4.1:
https://mvnrepository.com/artifact/org.postgresql/postgresql/42.4.1, BSD
2-clause
- protobuf-java 2.5.0:
https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java/2.5.0, BSD
2-clause
paranamer 2.3:
https://mvnrepository.com/artifact/com.thoughtworks.paranamer/paranamer/2.3, BSD
re2j 1.1: https://github.com/google/re2j/blob/re2j-1.1/LICENSE, BSD
3-clause
stax2-api 4.2.1:
https://mvnrepository.com/artifact/org.codehaus.woodstox/stax2-api/4.2.1, BSD
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index 3137fa83da..5d36636a86 100644
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -257,7 +257,6 @@ poi-ooxml-schemas-4.1.2.jar
postgresql-42.4.1.jar
presto-jdbc-0.238.1.jar
profiles-2.17.282.jar
-protobuf-java-2.5.0.jar
protocol-core-2.17.282.jar
protostuff-api-1.7.2.jar
protostuff-collectionschema-1.7.2.jar