Merge "org.onap migration"

diff --combined epsdk-app-onap/pom.xml
index a3c417d,4e87e50..dd0c1ab
--- 1/epsdk-app-onap/pom.xml
--- 2/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@@ -8,7 -8,7 +8,7 @@@
                the Portal team. -->\r
        <groupId>org.onap.vid</groupId>\r
        <artifactId>epsdk-app-onap</artifactId>\r
 -      <version>1.1.1-SNAPSHOT</version>\r
 +      <version>1.2.1-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>ECOMP SDK Webapp for OpenSource</name>\r
        <description>ECOMP SDK Web Application for public release</description>\r
@@@ -28,7 -28,7 +28,7 @@@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/openecomp/vid/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
  \r
                <!-- SONAR -->\r
                <sonar.language>java</sonar.language>\r
@@@ -163,7 -163,7 +163,7 @@@
                                        </archive>\r
                                        <overlays>\r
                                                <overlay>\r
-                                                       <groupId>org.openecomp.vid</groupId>\r
+                                                       <groupId>org.onap.vid</groupId>\r
                                                        <artifactId>vid-app-common</artifactId>\r
                                                </overlay>\r
                                                <overlay>\r
@@@ -274,13 -274,13 +274,13 @@@
                        <type>jar</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>jar</type>\r
@@@ -308,13 -308,13 +308,13 @@@
                        <version>1.0.0</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>jar</type>\r