X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=a1-med-client%2Fpom.xml;h=c66f5fab8fd8d520a8f5726b33f38fd0162c4dd4;hb=73f474280f9f270d84db23498c62db8cfe1d315c;hp=772c462d28e4a53810cacd8dbd67ccfed340242c;hpb=ace0b71ff6e424193ff6d6519a529d279e7ade58;p=portal%2Fric-dashboard.git

diff --git a/a1-med-client/pom.xml b/a1-med-client/pom.xml
index 772c462d..c66f5fab 100644
--- a/a1-med-client/pom.xml
+++ b/a1-med-client/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
-Copyright (C) 2019 AT&T Intellectual Property and Nokia
+Copyright (C) 2019 AT&T Intellectual Property
 %%
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,20 +25,29 @@ 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.2.5-SNAPSHOT</version>
 	</parent>
 	<!-- This groupId will NOT allow deployment in LF -->
-	<groupId>org.o-ran-sc.ric.a1med.client</groupId>
+	<groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
 	<artifactId>a1-med-client</artifactId>
 	<name>RIC A1 Mediator client</name>
-	<version>0.3.0-SNAPSHOT</version>
+	<!-- Update to match submodule tag -->
+	<version>0.10.3-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.a1med.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.core.v3</groupId>
 			<artifactId>swagger-annotations</artifactId>
@@ -52,39 +61,32 @@ limitations under the License.
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<!-- <version>${spring-web-version}</version> -->
 		</dependency>
 		<!-- JSON processing: jackson -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<!-- <version>${jackson-version}</version> -->
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<!-- <version>${jackson-version}</version> -->
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<!-- <version>${jackson-version}</version> -->
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<!-- <version>${jackson-version}</version> -->
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<!-- <version>${jackson-version}</version> -->
 		</dependency>
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<!-- spring sets the <version>5.4.2</version> -->
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -101,7 +103,7 @@ limitations under the License.
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<inputSpec>${project.basedir}/src/main/resources/a1_mediator_0.3.0.yaml</inputSpec>
+							<inputSpec>${project.basedir}/ric-plt-a1/a1/openapi.yaml</inputSpec>
 							<language>java</language>
 							<packageName>${client.base.package.name}</packageName>
 							<modelPackage>${client.base.package.name}.model</modelPackage>
@@ -121,51 +123,20 @@ 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 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>
-				<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>
 				<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>