You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/06/04 19:26:52 UTC
[iotdb] branch dependency_enforcer_check_0.12 created (now aa6c03b)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch dependency_enforcer_check_0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at aa6c03b upgrade netty and claim exclusion for enforcer check
This branch includes the following new commits:
new aa6c03b upgrade netty and claim exclusion for enforcer check
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: upgrade netty and claim exclusion for enforcer check
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch dependency_enforcer_check_0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aa6c03b83f9ca84ebe91b6ffb5c4c2aec6a3ac63
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Jun 5 03:26:01 2021 +0800
upgrade netty and claim exclusion for enforcer check
---
LICENSE-binary | 20 ++++++++++----------
hadoop/pom.xml | 18 ++++++++++++++++++
hive-connector/pom.xml | 4 ++++
pom.xml | 8 +++++---
server/pom.xml | 4 ++--
spark-iotdb-connector/pom.xml | 26 ++++++++++++++++++++++++++
zeppelin-interpreter/pom.xml | 6 ++++++
7 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 2daecb4..26827b0 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -251,16 +251,16 @@ io.dropwizard.metrics:metrics-json:3.2.6
io.dropwizard.metrics:metrics-jvm:3.2.6
com.librato.metrics:metrics-librato:5.1.0
de.fraunhofer.iosb.io.moquette:moquette-broker:0.14.3
-io.netty:netty-buffer:4.1.27.Final
-io.netty:netty-codec:4.1.27.Final
-io.netty:netty-codec-http:4.1.27.Final
-io.netty:netty-codec-mqtt:4.1.27.Final
-io.netty:netty-common:4.1.27.Final
-io.netty:netty-handler:4.1.27.Final
-io.netty:netty-resolver:4.1.27.Final
-io.netty:netty-transport:4.1.27.Final
-io.netty:netty-transport-native-epoll:4.1.27.Final:linux-x86_64
-io.netty:netty-transport-native-unix-common:4.1.27.Final
+io.netty:netty-buffer:4.1.53.Final
+io.netty:netty-codec:4.1.53.Final
+io.netty:netty-codec-http:4.1.53.Final
+io.netty:netty-codec-mqtt:4.1.53.Final
+io.netty:netty-common:4.1.53.Final
+io.netty:netty-handler:4.1.53.Final
+io.netty:netty-resolver:4.1.53.Final
+io.netty:netty-transport:4.1.53.Final
+io.netty:netty-transport-native-epoll:4.1.53.Final:linux-x86_64
+io.netty:netty-transport-native-unix-common:4.1.53.Final
com.nimbusds:nimbus-jose-jwt:8.14.1
com.nimbusds:oauth2-oidc-sdk:8.3
org.osgi:org.osgi.core:6.0.0
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index c65712e..e6f84a5 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -50,6 +50,24 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <!--commons-configuration uses commons-lang:commons-lang:2.4
+ while others use commons-lang 2.6-->
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- this is just used by hadoop-common-->
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index a3d9ba9..e8c137d 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -95,6 +95,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 76172c1..01a8f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,7 @@
<javax.xml.bind.version>2.4.0-b180725.0427</javax.xml.bind.version>
<felix.version>5.1.1</felix.version>
<snappy.version>1.1.8.4</snappy.version>
+ <netty.version>4.1.53.Final</netty.version>
<!-- URL of the ASF SonarQube server -->
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>apache</sonar.organization>
@@ -236,17 +237,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.27.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.27.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.27.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -696,6 +697,7 @@
<!-- Ensure we're not mixing dependency versions -->
<execution>
<id>enforce-version-convergence</id>
+ <phase>validate</phase>
<configuration>
<rules>
<dependencyConvergence/>
diff --git a/server/pom.xml b/server/pom.xml
index 3df5a3a..64ceac2 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.5.15</version>
+ <version>8.5.46</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -182,7 +182,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.27.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index e1ed83c..66a27ff 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -59,6 +59,24 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <!--commons-configuration uses commons-lang:commons-lang:2.4
+ while others use commons-lang 2.6-->
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- this is just used by hadoop-common-->
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
@@ -67,6 +85,14 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>[${guava.version},)</version>
+ <exclusions>
+ <!-- iotdb-server depends on com.github.ben-manes.caffeine:caffeine:2.9.1,
+ which depends on checker-qual 3.10.0 -->
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index 773d4fb..ca48d7f 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -41,6 +41,12 @@
<artifactId>zeppelin-interpreter</artifactId>
<version>${zeppelin.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>