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/10/05 03:02:09 UTC
[iotdb] branch fix_cve created (now 2101be2)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_cve
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 2101be2 remove tomcat-embed dependency and make all transitive dependencies versions consistent
This branch includes the following new commits:
new 2101be2 remove tomcat-embed dependency and make all transitive dependencies versions consistent
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: remove tomcat-embed dependency and make all
transitive dependencies versions consistent
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_cve
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2101be26186f8596dca1813731e19da58cefdafb
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Oct 5 11:01:33 2021 +0800
remove tomcat-embed dependency and make all transitive dependencies versions consistent
---
hadoop/pom.xml | 10 ++++++++++
hive-connector/pom.xml | 17 +++++++++++++++-
pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++-
server/pom.xml | 1 -
4 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 79e03fc..202a763 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -38,6 +38,11 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
<version>${project.version}</version>
@@ -56,6 +61,11 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</exclusion>
+ <!-- we use httpclient.version 4.5.13 -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- this is just used by hadoop-common-->
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index 8dcd940..8af2389 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -35,6 +35,11 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
<version>${project.version}</version>
@@ -99,6 +104,11 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
+ <!-- we use httpclient.version 4.5.13 -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -162,13 +172,18 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.2</version>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>11.0.6</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<!-- org.pentaho:pentaho-aggdesigner-algorithm is removed from repo.spring.io and we have to claim
diff --git a/pom.xml b/pom.xml
index 7330d54..40b2549 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<scala.version>2.11.12</scala.version>
<hadoop2.version>2.10.0</hadoop2.version>
<hive2.version>2.3.6</hive2.version>
- <junit.version>4.12</junit.version>
+ <junit.version>4.13.2</junit.version>
<slf4j.version>1.7.12</slf4j.version>
<logback.version>1.2.3</logback.version>
<joda.version>2.9.9</joda.version>
@@ -157,6 +157,8 @@
<!-- disable enforcer by default-->
<enforcer.skip>true</enforcer.skip>
<spotless.version>2.4.2</spotless.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <httpcore.version>4.4.13</httpcore.version>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
@@ -465,6 +467,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -489,6 +495,46 @@
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
+ <!-- for test container -->
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.5.0</version>
+ </dependency>
+ <!-- for hadoop connector -->
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+ <!-- for test-container and hadoop conflict-->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.21</version>
+ </dependency>
+ <!-- for spark-iotdb-connector and hadoop connector conflict -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <!-- for spark-iotdb conflict -->
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -516,6 +562,11 @@
<version>1.15.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
diff --git a/server/pom.xml b/server/pom.xml
index 7949b02..4278c0a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -197,7 +197,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.5</version>
<scope>compile</scope>
</dependency>
<dependency>