From f88fada056b2a2ec9811b5feca5cf5b43e9786e0 Mon Sep 17 00:00:00 2001
From: jimmydot <jf2512@att.com>
Date: Sun, 7 May 2017 19:42:59 -0400
Subject: [VID-6] Fixed pom files

Change-Id: Ib3c47aba4e7b5c3bf4e73418998b8e700077a7b3
Signed-off-by: jimmydot <jf2512@att.com>
---
 vid-app-common/pom.xml            | 117 +++++++++++++++++++++++++-------------
 vid-app-common/version.properties |  13 +++++
 2 files changed, 89 insertions(+), 41 deletions(-)
 create mode 100644 vid-app-common/version.properties

(limited to 'vid-app-common')

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f1a07dea..296f5cbf9 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -15,54 +15,89 @@
 	<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>
@@ -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 000000000..e2595ba14
--- /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
-- 
cgit 1.2.3-korg