summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2018-09-10 15:36:56 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2018-09-10 15:36:56 +0800
commit70c84e1630045fa8f8c9ab7e83cbc9f8eec51828 (patch)
treeab32a3160777ad209a2e48cc86976dc9575f750e
parentc1d46335c4f43bd5eef7e02a631fbe1816256c08 (diff)
Update the Jetty Dependencies Version
Change-Id: If413ac7cc332e85642254faa13d3e225a5279fee Issue-ID: HOLMES-165 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
-rw-r--r--dmaap-dsa/pom.xml26
-rw-r--r--pom.xml29
2 files changed, 53 insertions, 2 deletions
diff --git a/dmaap-dsa/pom.xml b/dmaap-dsa/pom.xml
index f16de8e..1a78b64 100644
--- a/dmaap-dsa/pom.xml
+++ b/dmaap-dsa/pom.xml
@@ -101,9 +101,32 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
@@ -299,7 +322,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
<resources>
<resource>
diff --git a/pom.xml b/pom.xml
index a05b80b..2f4949d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,35 @@
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>${dropwizard.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.11.v20180605</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>9.4.11.v20180605</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>