[VID-6] Fixed pom files

Change-Id: Ib3c47aba4e7b5c3bf4e73418998b8e700077a7b3
Signed-off-by: jimmydot <jf2512@att.com>

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index e82abd2..0477940 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -84,12 +84,46 @@
                                        <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>\r
                                </repository>\r
                        </repositories>\r
+                       <distributionManagement>\r
+                               <repository>\r
+                                       <id>ecomp-releases</id>\r
+                                       <name>VID Release Repository</name>\r
+                                       <url>${nexusproxy}/${releaseNexusPath}</url>\r
+                               </repository>\r
+                               <snapshotRepository>\r
+                                       <id>ecomp-snapshots</id>\r
+                                       <name>VID Snapshot Repository</name>\r
+                                       <url>${nexusproxy}/${snapshotNexusPath}</url>\r
+                               </snapshotRepository>\r
+                               <!-- added for javadoc -->\r
+                               <site>\r
+                                       <id>ecomp-site</id>\r
+                                       <url>dav:${nexusproxy}${sitePath}</url>\r
+                               </site>\r
+                       </distributionManagement>\r
                </profile>\r
        </profiles>\r
 \r
        <build>\r
                <finalName>vid</finalName>\r
                <plugins>\r
+                       <plugin>\r
+                               <groupId>org.codehaus.mojo</groupId>\r
+                               <artifactId>versions-maven-plugin</artifactId>\r
+                               <version>1.3.1</version>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin>\r
+\r
                        <!-- Compile to Java 1.8 class output format -->\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r

diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
new file mode 100644 (file)
index 0000000..e2595ba
--- /dev/null
+++ b/epsdk-app-onap/version.properties
@@ -0,0 +1,13 @@
+# Versioning variables\r
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
+# because they are used in Jenkins, whose plug-in doesn't support\r
+\r
+major=1\r
+minor=1\r
+patch=0\r
+\r
+base_version=${major}.${minor}.${patch}\r
+\r
+# Release must be completed with git revision # in Jenkins\r
+release_version=${base_version}\r
+snapshot_version=${base_version}-SNAPSHOT\r

diff --git a/pom.xml b/pom.xml
index 839f53b..746a343 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,36 @@
                                </configuration>\r
                        </plugin>\r
 \r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-site-plugin</artifactId>\r
+                               <version>3.6</version>\r
+                               <dependencies>\r
+                                       <dependency>\r
+                                               <groupId>org.apache.maven.wagon</groupId>\r
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>\r
+                                               <version>2.10</version>\r
+                                       </dependency>\r
+                               </dependencies>\r
+                       </plugin>\r
+                       <plugin>\r
+\r
+                               <groupId>org.codehaus.mojo</groupId>\r
+                               <artifactId>versions-maven-plugin</artifactId>\r
+                               <version>1.3.1</version>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin>\r
+\r
                        <!-- license plugin for open source -->\r
                        <plugin>\r
                                <groupId>org.codehaus.mojo</groupId>\r

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f1a07d..296f5cb 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -15,54 +15,89 @@
        <description>VID Common code for opensource version</description>\r
 \r
        <properties>\r
-         <encoding>UTF-8</encoding>\r
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-         <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>\r
-         <springframework.version>4.2.0.RELEASE</springframework.version>\r
-         <hibernate.version>4.3.11.Final</hibernate.version>\r
-         <!-- Skip assembling the zip by default -->\r
-         <skipassembly>true</skipassembly>\r
-         <!-- Tests usually require some setup that maven cannot do, so skip. -->\r
-         <skiptests>true</skiptests>\r
-         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-         <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
+               <encoding>UTF-8</encoding>\r
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
+               <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>\r
+               <springframework.version>4.2.0.RELEASE</springframework.version>\r
+               <hibernate.version>4.3.11.Final</hibernate.version>\r
+               <!-- Skip assembling the zip by default -->\r
+               <skipassembly>true</skipassembly>\r
+               <!-- Tests usually require some setup that maven cannot do, so skip. -->\r
+               <skiptests>true</skiptests>\r
+               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <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
        </properties>\r
-       \r
-       \r
+\r
+\r
        <!-- this should be commented for local debugging -->\r
        <!-- <deployenv>local</deployenv> -->\r
-       \r
+\r
        <repositories>\r
-         <repository>\r
-           <id>ecomp-releases</id>\r
-           <name>VID Release Repository</name>\r
-           <url>${nexusproxy}${releaseNexusPath}</url>\r
-         </repository>\r
-         <repository>\r
-           <id>ecomp-snapshots</id>\r
-           <name>VID Snapshot Repository</name>\r
-           <url>${nexusproxy}${snapshotNexusPath}</url>\r
-         </repository>\r
-         <repository>\r
-           <id>ecomp-staging</id>\r
-           <name>VID Staging Repository</name>\r
-           <url>${nexusproxy}${stagingNexusPath}</url>\r
-         </repository>\r
-         <repository>\r
-           <!-- Snapshots repository has ECOMP snapshot artifacts -->\r
-           <id>oss-snapshots</id>\r
-           <name>oss Central - Snapshots</name>\r
-           <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>\r
-         </repository>\r
+               <repository>\r
+                       <id>ecomp-releases</id>\r
+                       <name>VID Release Repository</name>\r
+                       <url>${nexusproxy}${releaseNexusPath}</url>\r
+               </repository>\r
+               <repository>\r
+                       <id>ecomp-snapshots</id>\r
+                       <name>VID Snapshot Repository</name>\r
+                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
+               </repository>\r
+               <repository>\r
+                       <id>ecomp-staging</id>\r
+                       <name>VID Staging Repository</name>\r
+                       <url>${nexusproxy}${stagingNexusPath}</url>\r
+               </repository>\r
+               <repository>\r
+                       <!-- Snapshots repository has ECOMP snapshot artifacts -->\r
+                       <id>oss-snapshots</id>\r
+                       <name>oss Central - Snapshots</name>\r
+                       <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>\r
+               </repository>\r
+\r
        </repositories>\r
-       \r
+       <distributionManagement>\r
+               <repository>\r
+                       <id>ecomp-releases</id>\r
+                       <name>VID Release Repository</name>\r
+                       <url>${nexusproxy}/${releaseNexusPath}</url>\r
+               </repository>\r
+               <snapshotRepository>\r
+                       <id>ecomp-snapshots</id>\r
+                       <name>VID Snapshot Repository</name>\r
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>\r
+               </snapshotRepository>\r
+               <!-- added for javadoc -->\r
+               <site>\r
+                       <id>ecomp-site</id>\r
+                       <url>dav:${nexusproxy}${sitePath}</url>\r
+               </site>\r
+       </distributionManagement>\r
+\r
        <build>\r
                <finalName>vid-common</finalName>\r
+\r
                <plugins>\r
+                       <plugin>\r
+                               <groupId>org.codehaus.mojo</groupId>\r
+                               <artifactId>versions-maven-plugin</artifactId>\r
+                               <version>1.3.1</version>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin>\r
                        <plugin>\r
                                <groupId>org.codehaus.mojo</groupId>\r
                                <artifactId>cobertura-maven-plugin</artifactId>\r
@@ -196,7 +231,7 @@
                        <version>${epsdk.version}</version>\r
                        <type>jar</type>\r
                </dependency>\r
-               \r
+\r
                <dependency>\r
                        <groupId>org.openecomp.ecompsdkos</groupId>\r
                        <artifactId>epsdk-core</artifactId>\r

diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
new file mode 100644 (file)
index 0000000..e2595ba
--- /dev/null
+++ b/vid-app-common/version.properties
@@ -0,0 +1,13 @@
+# Versioning variables\r
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
+# because they are used in Jenkins, whose plug-in doesn't support\r
+\r
+major=1\r
+minor=1\r
+patch=0\r
+\r
+base_version=${major}.${minor}.${patch}\r
+\r
+# Release must be completed with git revision # in Jenkins\r
+release_version=${base_version}\r
+snapshot_version=${base_version}-SNAPSHOT\r