X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=e2-mgr-client%2Fpom.xml;h=997c90bd5fb5a47ff22320e8d9f6aab0f1e2a1c4;hb=9d33149c7bdc8566d0135406b601fc1a901ff2f5;hp=6e213c7eeba88039607a102c3abd9a198c4e06e1;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git

diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index 6e213c7e..997c90bd 100644
--- a/e2-mgr-client/pom.xml
+++ b/e2-mgr-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
@@ -25,16 +25,19 @@ limitations under the License.
 	<parent>
 		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<!-- This groupId will NOT allow deployment in LF -->
 	<groupId>org.o-ran-sc.ric.e2mgr.client</groupId>
 	<artifactId>e2-mgr-client</artifactId>
 	<name>RIC E2 Manager client</name>
-	<version>02052019-SNAPSHOT</version>
+	<version>20190515-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- Jenkins invokes maven with -Dbuild.number=.. -->
+		<build.number>0</build.number>
+		<!-- same as groupId BUT without hyphens -->
 		<client.base.package.name>org.oransc.ric.e2mgr.client</client.base.package.name>
 	</properties>
 	<!-- Successful compilation requires generated code dependencies -->
@@ -101,7 +104,7 @@ limitations under the License.
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<inputSpec>${project.basedir}/src/main/resources/e2_manager_02052019.yaml</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/e2_manager_2019-05-15.yaml</inputSpec>
 							<language>java</language>
 							<packageName>${client.base.package.name}</packageName>
 							<modelPackage>${client.base.package.name}.model</modelPackage>
@@ -131,20 +134,6 @@ limitations under the License.
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<!-- Generate javadoc jar; see profile for Java 8 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<!-- <version>2.10.3</version> -->
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<!-- Generate source jar -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -159,6 +148,23 @@ limitations under the License.
 					</execution>
 				</executions>
 			</plugin>
+	<!-- add build information to manifest. Java provides access to the implementation 
+		version for a package, so cram the build number into there. -->
+	<plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-jar-plugin</artifactId>
+		<!-- version>2.5</version> -->
+		<configuration>
+			<archive>
+				<manifest>
+					<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+				</manifest>
+				<manifestEntries>
+					<Implementation-Version>${project.version}-b${build.number}</Implementation-Version>
+				</manifestEntries>
+			</archive>
+		</configuration>
+	</plugin>
 			<!-- Skip the deploy-jar-to-nexus step -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>