From 60a91a3e8779ce06d6fedb900aece96271adecdd Mon Sep 17 00:00:00 2001
From: Li Zi <li.zi30@zte.com.cn>
Date: Tue, 14 Aug 2018 07:58:54 +0000
Subject: [PATCH] Fix the security issue about jetty

Issue-ID: AAI-1475

Change-Id: Iefff5dd5e1e14ed0a40da862018e9d1285a573f6
Signed-off-by: Li Zi <li.zi30@zte.com.cn>
---
 pom.xml | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 103 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ba9b505..2a3ef1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>oparent</artifactId>
         <version>1.1.0</version>
     </parent>
-	
+
 	<groupId>org.onap.aai.esr-server</groupId>
     <artifactId>aai-esr-server</artifactId>
     <packaging>pom</packaging>
@@ -34,7 +34,7 @@
         <module>esr-mgr</module>
 		<module>standalone</module>
     </modules>
-	
+
 	<properties>
         <dropwizard.version>1.3.0</dropwizard.version>
         <swagger.version>1.5.3</swagger.version>
@@ -42,6 +42,7 @@
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
         <junit.version>4.10</junit.version>
+		<jetty.version>9.4.11.v20180605</jetty.version>
         <org.apache.ant.version>1.9.4</org.apache.ant.version>
     </properties>
 
@@ -72,7 +73,106 @@
 				<artifactId>hibernate-validator</artifactId>
 				<version>5.4.2.Final</version>
 			</dependency>
-			
+
+			<!-- Jetty -->
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-util</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-webapp</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-continuation</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlet</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlet</artifactId>
+				<classifier>tests</classifier>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<classifier>tests</classifier>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-alpn-openjdk8-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.http2</groupId>
+				<artifactId>http2-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.http2</groupId>
+				<artifactId>http2-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.http2</groupId>
+				<artifactId>http2-http-client-transport</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-alpn-openjdk8-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-alpn-conscrypt-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
+				<artifactId>jetty-setuid-java</artifactId>
+				<version>1.0.3</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.eclipse.jetty</groupId>
+						<artifactId>jetty-util</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.eclipse.jetty</groupId>
+						<artifactId>jetty-server</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
             <!-- jersey -->
             <dependency>
                 <groupId>org.glassfish.jersey.core</groupId>
-- 
2.16.6