You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2023/02/09 02:02:34 UTC
[ozone] branch master updated: HDDS-7924. Remove non-conflicting transitive-only dependency versions (#4261)
This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d1319d8187 HDDS-7924. Remove non-conflicting transitive-only dependency versions (#4261)
d1319d8187 is described below
commit d1319d8187c35054db6f074218431be6247120d9
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Thu Feb 9 03:02:29 2023 +0100
HDDS-7924. Remove non-conflicting transitive-only dependency versions (#4261)
---
hadoop-hdds/hadoop-dependency-server/pom.xml | 4 ++
hadoop-ozone/common/pom.xml | 2 -
hadoop-ozone/csi/pom.xml | 3 -
hadoop-ozone/dist/src/main/license/jar-report.txt | 14 -----
hadoop-ozone/interface-client/pom.xml | 2 -
hadoop-ozone/ozone-manager/pom.xml | 20 +++++++
hadoop-ozone/s3gateway/pom.xml | 3 -
pom.xml | 71 +++++------------------
8 files changed, 39 insertions(+), 80 deletions(-)
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 5dd3ca38b9..dab371a51a 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -75,6 +75,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>kerb-simplekdc</artifactId>
+ </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index fa8e8f0c43..b3ebf71fc0 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -33,12 +33,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
- <version>${io.grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index c989783c7b..ab41621c9c 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -71,7 +71,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -101,7 +100,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${io.grpc.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -112,7 +110,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 569c185067..367380d584 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -90,14 +90,11 @@ share/ozone/lib/ion-java.jar
share/ozone/lib/istack-commons-runtime.jar
share/ozone/lib/j2objc-annotations.jar
share/ozone/lib/jackson-annotations.jar
-share/ozone/lib/jackson-core-asl.jar
share/ozone/lib/jackson-core.jar
share/ozone/lib/jackson-databind.jar
share/ozone/lib/jackson-dataformat-cbor.jar
share/ozone/lib/jackson-dataformat-xml.jar
share/ozone/lib/jackson-datatype-jsr310.jar
-share/ozone/lib/jackson-jaxrs.jar
-share/ozone/lib/jackson-mapper-asl.jar
share/ozone/lib/jackson-module-jaxb-annotations.jar
share/ozone/lib/jaeger-client.jar
share/ozone/lib/jaeger-core.jar
@@ -155,20 +152,10 @@ share/ozone/lib/json-smart.jar
share/ozone/lib/jsp-api.jar
share/ozone/lib/jsr305.jar
share/ozone/lib/jsr311-api.jar
-share/ozone/lib/kerb-admin.jar
-share/ozone/lib/kerb-client.jar
-share/ozone/lib/kerb-common.jar
share/ozone/lib/kerb-core.jar
-share/ozone/lib/kerb-crypto.jar
-share/ozone/lib/kerb-identity.jar
-share/ozone/lib/kerb-server.jar
-share/ozone/lib/kerb-simplekdc.jar
-share/ozone/lib/kerb-util.jar
share/ozone/lib/kerby-asn1.jar
-share/ozone/lib/kerby-config.jar
share/ozone/lib/kerby-pkix.jar
share/ozone/lib/kerby-util.jar
-share/ozone/lib/kerby-xdr.jar
share/ozone/lib/kotlin-stdlib-common.jar
share/ozone/lib/kotlin-stdlib.jar
share/ozone/lib/libthrift.jar
@@ -264,7 +251,6 @@ share/ozone/lib/spring-tx.jar
share/ozone/lib/sqlite-jdbc.jar
share/ozone/lib/stax2-api.jar
share/ozone/lib/stax-ex.jar
-share/ozone/lib/token-provider.jar
share/ozone/lib/txw2.jar
share/ozone/lib/weld-servlet.Final.jar
share/ozone/lib/woodstox-core.jar
diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml
index feb8312198..37d47de704 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -44,12 +44,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 44b8beeea2..c5969004a2 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -169,6 +169,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcs-connector</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
@@ -177,6 +185,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.apache.lucene</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>*</artifactId>
@@ -205,6 +217,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.opensearch.client</groupId>
+ <artifactId>opensearch-rest-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index 40021f42fb..d9e6ca8168 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -100,17 +100,14 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/pom.xml b/pom.xml
index 64cf3f159f..8cc6c87590 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,10 +101,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<jetty.version>9.4.49.v20220914</jetty.version>
- <jetbrains.kotlin.version>1.6.21</jetbrains.kotlin.version>
<java.dev.jna.version>5.2.0</java.dev.jna.version>
- <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
- <apache.curator>4.2.0</apache.curator>
+ <curator.version>4.2.0</curator.version>
<test.exclude>_</test.exclude>
<test.exclude.pattern>_</test.exclude.pattern>
@@ -179,7 +177,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<disruptor.version>3.4.2</disruptor.version>
<reload4j.version>1.2.22</reload4j.version>
- <kerby.version>1.0.1</kerby.version>
<kotlin.version>1.6.21</kotlin.version>
<metainf-services.version>1.8</metainf-services.version>
<picocli.version>4.6.1</picocli.version>
@@ -201,14 +198,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<jakarta.activation.version>1.2.2</jakarta.activation.version>
<okhttp3.version>4.9.3</okhttp3.version>
<stax2.version>4.2.1</stax2.version>
- <nimbus.version>9.8.1</nimbus.version>
- <checker.version>3.12.0</checker.version>
<jakarta.inject.version>2.6.1</jakarta.inject.version>
<jakarta.annotation.version>1.3.5</jakarta.annotation.version>
<joda.time.version>2.10.6</joda.time.version>
- <commons.lang.version>2.6</commons.lang.version>
- <zookeeper.version>3.5.6</zookeeper.version>
- <snappy.java.version>1.1.8.2</snappy.java.version>
<compile-testing.version>0.19</compile-testing.version>
<errorprone-annotations.version>2.2.0</errorprone-annotations.version>
@@ -759,6 +751,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -1335,6 +1332,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>metrics-core</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${io.grpc.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
@@ -1425,11 +1429,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<version>${dnsjava.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
- <version>${kerby.version}</version>
- </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -1499,16 +1498,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>stax2-api</artifactId>
<version>${stax2.version}</version>
</dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>${nimbus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- <version>${checker.version}</version>
- </dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
@@ -1534,45 +1523,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>joda-time</artifactId>
<version>${joda.time.version}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${apache.curator}</version>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
- <version>${apache.curator}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy.java.version}</version>
+ <version>${curator.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org