From: Yuli Shlosberg <ys9693@att.com>
Date: Tue, 2 Oct 2018 14:51:22 +0000 (+0300)
Subject: update jetty version
X-Git-Tag: 1.3.0~58
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d4929e3b2a53ae05b6f213da9b3255c2bce12d3f;p=sdc.git

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 ac7d789d8a..f7e458973e 100644
--- 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 60bdc2bbeb..fa27ae4519 100644
--- 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 b167cc1992..7d2b6af5f1 100644
--- 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>