X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=xapp-mgr-client%2Fpom.xml;h=86639f48844306f4fc6d62b092054cd9a6faff40;hb=52d66fff0881226fe6ae0b1a2cd6c2c2e2837af4;hp=3f468a994969331730b41b857b4d6d6d2bcd2fac;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git

diff --git a/xapp-mgr-client/pom.xml b/xapp-mgr-client/pom.xml
index 3f468a99..86639f48 100644
--- a/xapp-mgr-client/pom.xml
+++ b/xapp-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.xappmgr.client</groupId>
 	<artifactId>xapp-mgr-client</artifactId>
 	<name>RIC xApp Manager client</name>
-	<version>0.0.10-SNAPSHOT</version>
+	<version>0.1.4-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.xappmgr.client</client.base.package.name>
 	</properties>
 	<!-- Successful compilation requires generated code dependencies -->
@@ -101,13 +104,13 @@ limitations under the License.
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<inputSpec>${project.basedir}/src/main/resources/xapp_manager_rest_api_v0_0_10.json</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/xapp_manager_rest_api_v0_1_4.yaml</inputSpec>
 							<language>java</language>
 							<configOptions>
 								<groupId>${project.groupId}</groupId>
 								<artifactId>${project.artifactId}</artifactId>
 								<artifactVersion>${project.version}</artifactVersion>
-								<artifactUrl>www.oran-osc.org</artifactUrl>
+								<artifactUrl>www.O-RAN-SC.org</artifactUrl>
 								<artifactDescription>xApp manager client library</artifactDescription>
 								<library>resttemplate</library>
 								<java8>true</java8>
@@ -133,20 +136,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>
@@ -161,6 +150,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>
@@ -192,7 +198,7 @@ limitations under the License.
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore/>
+										<ignore />
 									</action>
 								</pluginExecution>
 							</pluginExecutions>