X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=anr-xapp-client%2Fpom.xml;h=956918eea7a97fffc73e79c05fce0827155b2472;hb=refs%2Fchanges%2F88%2F488%2F5;hp=08689f92cd26b7f45abd9f737c6555dacd1021d3;hpb=9457e10be41282c973744cdced34cdeff65837f7;p=portal%2Fric-dashboard.git

diff --git a/anr-xapp-client/pom.xml b/anr-xapp-client/pom.xml
index 08689f92..956918ee 100644
--- a/anr-xapp-client/pom.xml
+++ b/anr-xapp-client/pom.xml
@@ -25,21 +25,28 @@ limitations under the License.
 	<parent>
 		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<!-- This groupId will NOT allow deployment in LF -->
-	<groupId>org.o-ran-sc.ric.anrxapp.client</groupId>
+	<groupId>org.o-ran-sc.ric.xapp.anr.client</groupId>
 	<artifactId>anr-xapp-client</artifactId>
 	<name>RIC ANR xApp client</name>
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.8-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.anrxapp.client</client.base.package.name>
 	</properties>
 	<!-- Successful compilation requires generated code dependencies -->
 	<dependencies>
+		<!-- Required for Java 9 and later -->
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-annotations</artifactId>
@@ -102,14 +109,12 @@ limitations under the License.
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<inputSpec>${project.basedir}/src/main/resources/anr_swagger_0.0.3.yaml</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/anr_swagger_0.0.8.yaml</inputSpec>
 							<language>java</language>
 							<configOptions>
 								<groupId>${project.groupId}</groupId>
 								<artifactId>${project.artifactId}</artifactId>
 								<artifactVersion>${project.version}</artifactVersion>
-								<artifactUrl>www.O-RAN-SC.org</artifactUrl>
-								<artifactDescription>ANR xApp client library</artifactDescription>
 								<library>resttemplate</library>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
@@ -124,37 +129,21 @@ limitations under the License.
 					</execution>
 				</executions>
 			</plugin>
-			<!-- Require Java 1.8 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<!-- Spring sets the <version></version> -->
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<!-- Generate source jar -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<!-- <version>3.0.0</version> -->
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- Skip the deploy-jar-to-nexus step -->
+			<!-- 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-deploy-plugin</artifactId>
-				<!-- Spring sets the <version>2.8</version> -->
+				<artifactId>maven-jar-plugin</artifactId>
+				<!-- version>2.5</version> -->
 				<configuration>
-					<skip>true</skip>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Implementation-Version>${project.version}-b${build.number}</Implementation-Version>
+						</manifestEntries>
+					</archive>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -179,7 +168,7 @@ limitations under the License.
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore/>
+										<ignore />
 									</action>
 								</pluginExecution>
 							</pluginExecutions>