Skip to content

[IOTDB-1792]remove tomcat-embed dependency and make all transitive dependencies versions consistent #4077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveYurongSu merged 4 commits into from
Oct 11, 2021
Merged

[IOTDB-1792]remove tomcat-embed dependency and make all transitive dependencies versions consistent #4077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1b895c
remove tomcat-embed dependency and make all transitive dependencies v…
Oct 5, 2021
be0664e
Bump jline.version to 2.14.6
SteveYurongSu Oct 11, 2021
a7768c2
bump jetty.version to 11.0.6
SteveYurongSu Oct 11, 2021
f81fc99
Revert "bump jetty.version to 11.0.6"
SteveYurongSu Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hive-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.2</version>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Expand Down
56 changes: 54 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -134,7 +134,7 @@
<common.logging.version>1.1.3</common.logging.version>
<org.slf4j.version>1.7.30</org.slf4j.version>
<guava.version>24.1.1</guava.version>
<jline.version>2.14.5</jline.version>
<jline.version>2.14.6</jline.version>
<jetty.version>9.4.35.v20201120</jetty.version>
<metrics.version>3.2.6</metrics.version>
<javax.xml.bind.version>2.4.0-b180725.0427</javax.xml.bind.version>
Expand All @@ -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
Expand Down Expand Up @@ -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>
Expand All @@ -489,6 +495,52 @@
<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>
<!-- for hive connector-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>11.0.6</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down
3 changes: 2 additions & 1 deletion server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,15 @@
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
</dependency>
<!-- for mqtt sink in trigger-->
<dependency>
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
</dependency>
<!-- used for communicate with alter manager-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.5</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down