[VID-6] Fixed pom files

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

2 files changed, 89 insertions, 41 deletions

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f1a07de..296f5cbf 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -15,56 +15,91 @@
 	<description>VID Common code for opensource version</description>

 

 	<properties>

-	  <encoding>UTF-8</encoding>

-	  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-	  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-	  <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>

-	  <springframework.version>4.2.0.RELEASE</springframework.version>

-	  <hibernate.version>4.3.11.Final</hibernate.version>

-	  <!-- Skip assembling the zip by default -->

-	  <skipassembly>true</skipassembly>

-	  <!-- Tests usually require some setup that maven cannot do, so skip. -->

-	  <skiptests>true</skiptests>

-	  <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>

+		<encoding>UTF-8</encoding>

+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

+		<epsdk.version>1.1.0-SNAPSHOT</epsdk.version>

+		<springframework.version>4.2.0.RELEASE</springframework.version>

+		<hibernate.version>4.3.11.Final</hibernate.version>

+		<!-- Skip assembling the zip by default -->

+		<skipassembly>true</skipassembly>

+		<!-- Tests usually require some setup that maven cannot do, so skip. -->

+		<skiptests>true</skiptests>

+		<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>

 	</properties>

-	

-	

+

+

 	<!-- this should be commented for local debugging -->

 	<!-- <deployenv>local</deployenv> -->

-	

+

 	<repositories>

-	  <repository>

-	    <id>ecomp-releases</id>

-	    <name>VID Release Repository</name>

-	    <url>${nexusproxy}${releaseNexusPath}</url>

-	  </repository>

-	  <repository>

-	    <id>ecomp-snapshots</id>

-	    <name>VID Snapshot Repository</name>

-	    <url>${nexusproxy}${snapshotNexusPath}</url>

-	  </repository>

-	  <repository>

-	    <id>ecomp-staging</id>

-	    <name>VID Staging Repository</name>

-	    <url>${nexusproxy}${stagingNexusPath}</url>

-	  </repository>

-	  <repository>

-	    <!-- Snapshots repository has ECOMP snapshot artifacts -->

-	    <id>oss-snapshots</id>

-	    <name>oss Central - Snapshots</name>

-	    <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>

-	  </repository>

+		<repository>

+			<id>ecomp-releases</id>

+			<name>VID Release Repository</name>

+			<url>${nexusproxy}${releaseNexusPath}</url>

+		</repository>

+		<repository>

+			<id>ecomp-snapshots</id>

+			<name>VID Snapshot Repository</name>

+			<url>${nexusproxy}${snapshotNexusPath}</url>

+		</repository>

+		<repository>

+			<id>ecomp-staging</id>

+			<name>VID Staging Repository</name>

+			<url>${nexusproxy}${stagingNexusPath}</url>

+		</repository>

+		<repository>

+			<!-- Snapshots repository has ECOMP snapshot artifacts -->

+			<id>oss-snapshots</id>

+			<name>oss Central - Snapshots</name>

+			<url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>

+		</repository>

+

 	</repositories>

-	

+	<distributionManagement>

+		<repository>

+			<id>ecomp-releases</id>

+			<name>VID Release Repository</name>

+			<url>${nexusproxy}/${releaseNexusPath}</url>

+		</repository>

+		<snapshotRepository>

+			<id>ecomp-snapshots</id>

+			<name>VID Snapshot Repository</name>

+			<url>${nexusproxy}/${snapshotNexusPath}</url>

+		</snapshotRepository>

+		<!-- added for javadoc -->

+		<site>

+			<id>ecomp-site</id>

+			<url>dav:${nexusproxy}${sitePath}</url>

+		</site>

+	</distributionManagement>

+

 	<build>

 		<finalName>vid-common</finalName>

+

 		<plugins>

 			<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>

+				<configuration>

+					<nexusUrl>${nexusproxy}</nexusUrl>

+					<stagingProfileId>176c31dfe190a</stagingProfileId>

+					<serverId>ecomp-staging</serverId>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.codehaus.mojo</groupId>

 				<artifactId>cobertura-maven-plugin</artifactId>

 				<version>2.7</version>

 				<configuration>

@@ -196,7 +231,7 @@
 			<version>${epsdk.version}</version>

 			<type>jar</type>

 		</dependency>

-		

+

 		<dependency>

 			<groupId>org.openecomp.ecompsdkos</groupId>

 			<artifactId>epsdk-core</artifactId>

diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
new file mode 100644
index 00000000..e2595ba1
--- /dev/null
+++ b/vid-app-common/version.properties
@@ -0,0 +1,13 @@
+# Versioning variables

+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )

+# because they are used in Jenkins, whose plug-in doesn't support

+

+major=1

+minor=1

+patch=0

+

+base_version=${major}.${minor}.${patch}

+

+# Release must be completed with git revision # in Jenkins

+release_version=${base_version}

+snapshot_version=${base_version}-SNAPSHOT