From: GuangrongFu <fu.guangrong@zte.com.cn>
Date: Mon, 10 Sep 2018 07:36:56 +0000 (+0800)
Subject: Update the Jetty Dependencies Version
X-Git-Tag: 1.2.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fdsa.git;a=commitdiff_plain;h=70c84e1630045fa8f8c9ab7e83cbc9f8eec51828

Update the Jetty Dependencies Version

Change-Id: If413ac7cc332e85642254faa13d3e225a5279fee
Issue-ID: HOLMES-165
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
---

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>