update jetty version

Change-Id: I4dbe6a4056a21af5a72b1ee9d5316674109fdd21
Issue-ID: SDC-1707
Signed-off-by: Yuli Shlosberg <ys9693@att.com>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index ac7d789..f7e4589 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -513,13 +513,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>

diff --git a/pom.xml b/pom.xml
index 60bdc2b..fa27ae4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@ Modifications copyright (c) 2018 Nokia
         <elastic-search.version>2.4.0</elastic-search.version>
         <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
         <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
-        <jetty.version>9.3.20.v20170531</jetty.version>
+        <jetty.version>9.4.11.v20180605</jetty.version>
 
         <!-- JSON and YAML Parsing -->
         <jackson.version>2.8.10</jackson.version>

diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index b167cc1..7d2b6af 100644 (file)
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -23,22 +23,32 @@
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
-                       <!-- <version>21.0</version> -->
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.seleniumhq.selenium</groupId>
                        <artifactId>selenium-java</artifactId>
+
                        <version>2.53.1</version>
-                       <!-- <version>3.4.0</version> -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.eclipse.jetty</groupId>
+                                       <artifactId>jetty-util</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.eclipse.jetty</groupId>
+                       <artifactId>jetty-util</artifactId>
+                       <version>${jetty.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.seleniumhq.selenium</groupId>
                        <artifactId>selenium-server</artifactId>
                        <version>2.53.1</version>
-                       <!-- <version>3.4.0</version> -->
                        <scope>runtime</scope>
                </dependency>