This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 767a4aa exclusion servlet in iotdb-jdbc (#408)
767a4aa is described below
commit 767a4aa0e5f746b6f765c7084510e9789eead775
Author: Jialin Qiao <[email protected]>
AuthorDate: Fri Sep 20 12:59:23 2019 +0800
exclusion servlet in iotdb-jdbc (#408)
---
grafana/pom.xml | 6 ++++++
pom.xml | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/grafana/pom.xml b/grafana/pom.xml
index e472115..fd1a712 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -62,6 +62,12 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>0.9.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 56391ea..38f69f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,11 +105,6 @@
<version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.31</version>