From 3b3fec4b4cb6c1e9240cddd76b9d1f837d6dbd65 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 24 Jun 2019 09:53:06 +0300
Subject: Migrate to gerrit-maven-stage (VID)

Cherry picked and squashed from master's commits:

- Migrate to gerrit-maven-stage (VID) (97bec3c4)
- Un-SNAPSHOT all modules while build (e67fc391)
- Remove maven-deploy-plugin (46adb535)
- Normalize slashes in repositories paths (b93b96bc)
- Bump vid-webpack-master for versions-maven-plugin (d97e9d0a)

Issue-ID: CIMAN-234

Change-Id: Ibe838682f7601abbd9a6fb47bf7698afbd3baf9f
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 deliveries/pom.xml                 |  8 --------
 epsdk-app-onap/pom.xml             | 30 +++++++++---------------------
 pom.xml                            | 35 ++++++++++++-----------------------
 vid-app-common/pom.xml             | 30 +++++++++---------------------
 vid-ext-services-simulator/pom.xml |  8 ++++----
 vid-webpack-master/pom.xml         |  2 +-
 6 files changed, 35 insertions(+), 78 deletions(-)

diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index 81d72703e..73ac7372d 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -96,14 +96,6 @@
 
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 090f7c6d3..af679251c 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.3</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -31,10 +31,10 @@
         <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
         <skipassembly>true</skipassembly>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-        <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+        <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+        <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
 
         <!-- SONAR -->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -48,17 +48,17 @@
         <repository>
             <id>ecomp-releases</id>
             <name>VID Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
         </repository>
         <repository>
             <id>ecomp-snapshots</id>
             <name>VID Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
         </repository>
         <repository>
             <id>ecomp-staging</id>
             <name>VID Staging Repository</name>
-            <url>${nexusproxy}${stagingNexusPath}</url>
+            <url>${nexusproxy}/${stagingNexusPath}</url>
         </repository>
         <repository>
             <!-- Snapshots repository has ECOMP snapshot artifacts -->
@@ -81,7 +81,7 @@
         <!-- added for javadoc -->
         <site>
             <id>ecomp-site</id>
-            <url>dav:${nexusproxy}${sitePath}</url>
+            <url>dav:${nexusproxy}/${sitePath}</url>
         </site>
     </distributionManagement>
 
@@ -110,18 +110,6 @@
     <build>
         <finalName>vid</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
-            </plugin>
-
             <!-- Compile to Java 1.8 class output format -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index be1f0a5d5..c44651d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.3</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -66,7 +66,7 @@
                 <!-- added for javadoc -->
                 <site>
                     <id>ecomp-site</id>
-                    <url>dav:${nexusproxy}${sitePath}</url>
+                    <url>dav:${nexusproxy}/${sitePath}</url>
                 </site>
             </distributionManagement>
 
@@ -88,10 +88,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <build.version>4.3.1-SNAPSHOT</build.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-        <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+        <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+        <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
     </properties>
 
     <build>
@@ -99,20 +99,15 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>1.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
+                <version>2.7</version>
                 <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
+                  <!--
+                  Update all modules of aggregator
+                  http://www.mojohaus.org/versions-maven-plugin/set-mojo.html#artifactId
+                  -->
+                  <artifactId>*</artifactId>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -126,12 +121,6 @@
                 </dependencies>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8</version>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 787533ff7..40f1a8de7 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.3</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -36,10 +36,10 @@
         <!-- Skip assembling the zip by default -->
         <skipassembly>true</skipassembly>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-        <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+        <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+        <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
 
         <aspectj.version>1.8.9</aspectj.version>
         <kotlin.version>1.3.11</kotlin.version>
@@ -58,17 +58,17 @@
         <repository>
             <id>ecomp-releases</id>
             <name>VID Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
+            <url>${nexusproxy}/${releaseNexusPath}</url>
         </repository>
         <repository>
             <id>ecomp-snapshots</id>
             <name>VID Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
+            <url>${nexusproxy}/${snapshotNexusPath}</url>
         </repository>
         <repository>
             <id>ecomp-staging</id>
             <name>VID Staging Repository</name>
-            <url>${nexusproxy}${stagingNexusPath}</url>
+            <url>${nexusproxy}/${stagingNexusPath}</url>
         </repository>
         <repository>
             <!-- Snapshots repository has ECOMP snapshot artifacts -->
@@ -92,7 +92,7 @@
         <!-- added for javadoc -->
         <site>
             <id>ecomp-site</id>
-            <url>dav:${nexusproxy}${sitePath}</url>
+            <url>dav:${nexusproxy}/${sitePath}</url>
         </site>
     </distributionManagement>
 
@@ -126,18 +126,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 8596b973c..d7a2436a6 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -38,10 +38,10 @@
                 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                 <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>
                 <nexusproxy>https://nexus.onap.org</nexusproxy>
-                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-                <sitePath>/content/sites/site/org/openecomp/vid/${project.version}</sitePath>
+                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+                <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+                <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+                <sitePath>content/sites/site/org/openecomp/vid/${project.version}</sitePath>
             </properties>
 
             <repositories>
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index c86d61308..9a1c0a86f 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -9,7 +9,7 @@
       inherit from a parent maven module. -->
   <groupId>org.onap.vid</groupId>
   <artifactId>vid-webpack-master</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.3.1-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>VID UI</name>
   <description>VID UI</description>
-- 
cgit 1.2.3-korg