You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by fr...@apache.org on 2022/10/10 12:34:56 UTC
[druid] branch master updated: Dependency cleanup (#13194)
This is an automated email from the ASF dual-hosted git repository.
frankchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new d30cf8c308 Dependency cleanup (#13194)
d30cf8c308 is described below
commit d30cf8c3089e72ef4a12e7aab4afb094a2bb6813
Author: Frank Chen <fr...@outlook.com>
AuthorDate: Mon Oct 10 20:34:38 2022 +0800
Dependency cleanup (#13194)
* Clean up dependency in extensions
* Bump protobuf/aws.sdk
* Bump aws-sdk to 1.12.317
* Fix CI
* Fix CI
* Update license
* Update license
---
extensions-contrib/compressed-bigdecimal/pom.xml | 1 -
extensions-core/kafka-extraction-namespace/pom.xml | 13 ++++------
extensions-core/kafka-indexing-service/pom.xml | 4 ++--
extensions-core/protobuf-extensions/pom.xml | 1 -
integration-tests/pom.xml | 1 -
licenses.yaml | 28 ++++++++++++++++++----
pom.xml | 5 ++--
7 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/extensions-contrib/compressed-bigdecimal/pom.xml b/extensions-contrib/compressed-bigdecimal/pom.xml
index ebf7ebdf7d..a9929c3c94 100644
--- a/extensions-contrib/compressed-bigdecimal/pom.xml
+++ b/extensions-contrib/compressed-bigdecimal/pom.xml
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
- <version>1.21.0</version>
<scope>provided</scope>
</dependency>
diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml
index c58d593a80..29f39f4dc2 100644
--- a/extensions-core/kafka-extraction-namespace/pom.xml
+++ b/extensions-core/kafka-extraction-namespace/pom.xml
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.druid.extensions</groupId>
<artifactId>druid-kafka-extraction-namespace</artifactId>
@@ -123,12 +124,6 @@
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.13</artifactId>
@@ -146,10 +141,10 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency><!-- Required by dependency check, used by kafka_2.13 -->
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.13.3</version>
+ <version>${scala.library.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml
index 7f89865700..61102acc2b 100644
--- a/extensions-core/kafka-indexing-service/pom.xml
+++ b/extensions-core/kafka-indexing-service/pom.xml
@@ -191,10 +191,10 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency><!-- Required by dependency check, used by kafka_2.13 -->
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.13.3</version>
+ <version>${scala.library.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml
index a301136261..e2e8c4a116 100644
--- a/extensions-core/protobuf-extensions/pom.xml
+++ b/extensions-core/protobuf-extensions/pom.xml
@@ -55,7 +55,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index bdcea9605f..5ee56c51f8 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -406,7 +406,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.11.0</version>
</dependency>
<!-- Tests -->
diff --git a/licenses.yaml b/licenses.yaml
index 3607ce4efb..0a81365b37 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -178,7 +178,7 @@ name: AWS SDK for Java
license_category: binary
module: java-core
license_name: Apache License version 2.0
-version: 1.12.264
+version: 1.12.317
libraries:
- com.amazonaws: aws-java-sdk-core
- com.amazonaws: aws-java-sdk-ec2
@@ -957,6 +957,16 @@ libraries:
---
+name: io.swagger swagger-annotations
+license_category: binary
+module: extensions/druid-kubernetes-extensions
+license_name: Apache License version 2.0
+version: 2.8.6
+libraries:
+ - com.google.code.gson: gson
+
+---
+
name: io.prometheus simpleclient_httpserver
license_category: binary
module: extensions/druid-kubernetes-extensions
@@ -3869,12 +3879,22 @@ name: Gson
license_category: binary
module: extensions/protobuf-extensions
license_name: Apache License version 2.0
-version: 2.8.6
+version: 2.8.9
libraries:
- com.google.code.gson: gson
---
+name: j2objc
+license_category: binary
+module: extensions/protobuf-extensions
+license_name: Apache License version 2.0
+version: 1.3
+libraries:
+ - com.google.j2objc: j2objc-annotations
+
+---
+
name: Checker Qual
license_category: binary
module: java-core
@@ -3986,7 +4006,7 @@ name: Protocol Buffers
license_category: binary
module: java-core
license_name: BSD-3-Clause License
-version: 3.11.0
+version: 3.21.7
copyright: Google, Inc.
license_file_path:
- licenses/bin/protobuf-java.BSD3
@@ -4175,7 +4195,7 @@ name: Protocol Buffers
license_category: binary
module: extensions/druid-protobuf-extensions
license_name: BSD-3-Clause License
-version: 3.11.0
+version: 3.21.7
copyright: Google, Inc.
license_file_path: licenses/bin/protobuf-java.BSD3
libraries:
diff --git a/pom.xml b/pom.xml
index 7ffba214f3..9fc48fd849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
<apache.kafka.version>3.3.1</apache.kafka.version>
<apache.ranger.version>2.0.0</apache.ranger.version>
<apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
+ <scala.library.version>2.13.9</scala.library.version>
<avatica.version>1.17.0</avatica.version>
<avro.version>1.9.2</avro.version>
<!-- sql/src/main/codegen/config.fmpp is based on a file from calcite-core, and needs to be
@@ -105,13 +106,13 @@
<netty3.version>3.10.6.Final</netty3.version>
<netty4.version>4.1.68.Final</netty4.version>
<postgresql.version>42.4.1</postgresql.version>
- <protobuf.version>3.11.0</protobuf.version>
+ <protobuf.version>3.21.7</protobuf.version>
<resilience4j.version>1.3.1</resilience4j.version>
<slf4j.version>1.7.36</slf4j.version>
<!-- If compiling with different hadoop version also modify default hadoop coordinates in TaskConfig.java -->
<hadoop.compile.version>2.8.5</hadoop.compile.version>
<mockito.version>4.3.1</mockito.version>
- <aws.sdk.version>1.12.264</aws.sdk.version>
+ <aws.sdk.version>1.12.317</aws.sdk.version>
<caffeine.version>2.8.0</caffeine.version>
<jacoco.version>0.8.7</jacoco.version>
<hibernate-validator.version>5.2.5.Final</hibernate-validator.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org