From be2c3fd920fffb4c8f6191a8491d8fba3c682a66 Mon Sep 17 00:00:00 2001
From: "Sonsino, Ofir (os0695)" <os0695@intl.att.com>
Date: Mon, 9 Apr 2018 18:21:17 +0300
Subject: Update Dockerfile

Change-Id: Iec9b90bfa7b53c6f100e6b3c66545adc183f8547
Issue-ID: VID-209
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---
 deliveries/src/main/docker/docker-files/Dockerfile |  8 ++++----
 epsdk-app-onap/pom.xml                             | 10 ----------
 pom.xml                                            |  5 -----
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 43e472da3..626b48340 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -25,7 +25,7 @@ ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs
 ENV VID_AAI_HOST aai.api.simpledemo.openecomp.org
 ENV VID_AAI_PORT 8443
 ENV VID_APP_DISPLAY_NAME VID
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context
+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/onapportal/context
 ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080
 ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks
 ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins
@@ -45,9 +45,9 @@ ENV AAI_VID_UID VID
 ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9
 ENV AAI_USE_CLIENT_CERT false
 ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED
-ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
-ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context
+ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/login.htm
+ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/auxapi
+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/context
 ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com
 
 ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index e5b88ba3f..306917a38 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -273,22 +273,12 @@
 			<version>${epsdk.version}</version>
 			<type>jar</type>
 			<exclusions>
-				<exclusion>
-					<groupId>commons-fileupload</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
 					<artifactId>jackson-core</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!--Upgrade fileupload version-->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.vid</groupId>
 			<artifactId>vid-app-common</artifactId>
diff --git a/pom.xml b/pom.xml
index 231d2cfb6..0a2bb0f79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,11 +254,6 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.2</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-- 
cgit 1.2.3-korg