Update Dockerfile

Change-Id: Iec9b90bfa7b53c6f100e6b3c66545adc183f8547
Issue-ID: VID-209
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 43e472d..626b483 100755 (executable)
--- 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\r
 ENV VID_AAI_PORT 8443\r
 ENV VID_APP_DISPLAY_NAME VID\r
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context\r
+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/onapportal/context\r
 ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080\r
 ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks\r
 ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins\r
@@ -45,9 +45,9 @@ ENV AAI_VID_UID VID
 ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9\r
 ENV AAI_USE_CLIENT_CERT false\r
 ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED\r
-ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm\r
-ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi\r
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context\r
+ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/login.htm\r
+ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/auxapi\r
+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/context\r
 ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com\r
 \r
 ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=\r

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index e5b88ba..306917a 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -273,22 +273,12 @@
                        <version>${epsdk.version}</version>\r
                        <type>jar</type>\r
                        <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>commons-fileupload</groupId>\r
-                                       <artifactId>commons-fileupload</artifactId>\r
-                               </exclusion>\r
                                <exclusion>\r
                                        <groupId>com.fasterxml.jackson.core</groupId>\r
                                        <artifactId>jackson-core</artifactId>\r
                                </exclusion>\r
                        </exclusions>\r
                </dependency>\r
-               <!--Upgrade fileupload version-->\r
-               <dependency>\r
-                       <groupId>commons-fileupload</groupId>\r
-                       <artifactId>commons-fileupload</artifactId>\r
-                       <version>1.3.3</version>\r
-               </dependency>\r
                <dependency>\r
                        <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r

diff --git a/pom.xml b/pom.xml
index 231d2cf..0a2bb0f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -254,11 +254,6 @@
                        <artifactId>commons-collections</artifactId>\r
                        <version>3.2.2</version>\r
                </dependency>\r
-               <dependency>\r
-                       <groupId>commons-fileupload</groupId>\r
-                       <artifactId>commons-fileupload</artifactId>\r
-                       <version>1.3.3</version>\r
-               </dependency>\r
                <dependency>\r
                        <groupId>org.apache.poi</groupId>\r
                        <artifactId>poi</artifactId>\r