X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=cf1936780470394b9172d727c3f6b55441043e52;hb=0aa99919dea387fd2216b3b13bc06d3a10868089;hp=b604eeda62996b575c7f32ec09f4629d2b1fd0df;hpb=056a49df629daf4189a34c37ee30b1f5ad88a59d;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index b604eeda..cf193678 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/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
 %%
@@ -23,51 +23,56 @@ limitations under the License.
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.oranosc.ric.portal.dashboard</groupId>
+		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>ric-dash-be</artifactId>
 	<name>RIC Dashboard Webapp backend</name>
 	<properties>
 		<java.version>1.8</java.version>
 		<springfox.version>2.9.2</springfox.version>
-		<docker.push.registry>${env.NEXUS3_PUSH_REGISTRY}</docker.push.registry>
+		<!-- Set by Jenkins -->
+		<build.number>0</build.number>
 	</properties>
 	<dependencies>
+		<!-- xApps -->
 		<dependency>
-			<groupId>org.oranosc.ric.e2mgr.client</groupId>
-			<artifactId>e2-mgr-client</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<groupId>org.o-ran-sc.ric.xapp.anr.client</groupId>
+			<artifactId>anr-xapp-client</artifactId>
+			<version>0.0.8-SNAPSHOT</version>
 		</dependency>
+		<!-- Platform components -->
 		<dependency>
-			<groupId>org.oranosc.ric.xappmgr.client</groupId>
-			<artifactId>xapp-mgr-client</artifactId>
-			<version>0.0.10-SNAPSHOT</version>
+			<groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
+			<artifactId>a1-med-client</artifactId>
+			<version>0.4.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
+			<artifactId>app-mgr-client</artifactId>
+			<version>0.1.5-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
+			<artifactId>e2-mgr-client</artifactId>
+			<version>20190630-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<!-- Spring-boot sets the version -->
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<!-- Spring-boot sets the version -->
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<!-- Spring-boot sets the version -->
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
@@ -79,24 +84,20 @@ limitations under the License.
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>${springfox.version}</version>
 		</dependency>
+		<!-- Mockito supports development, not just testing -->
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
+		<!-- Test dependencies -->
 		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<!-- spring sets the <version>5.4.2</version> -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
-			<!-- do not deploy a jar or pom file -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<!-- spring sets the <version>2.8</version> -->
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
@@ -122,6 +123,35 @@ limitations under the License.
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</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>
+			<!-- Add the build number to the jar manifest. Spring-Boot uses a complex 
+				packaging process that makes access to the original Manifest.MF very difficult. 
+				However, 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>
+				<!-- Spring sets the <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>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<!-- spring-boot sets the <version>3.1.0</version> -->
@@ -143,6 +173,15 @@ limitations under the License.
 					</execution>
 				</executions>
 			</plugin>
+			<!-- do not deploy a jar or pom file -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<!-- spring sets the <version>2.8</version> -->
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 			<!-- https://stackoverflow.com/questions/39126226/fabric8-springboot-full-example -->
 			<plugin>
 				<groupId>io.fabric8</groupId>
@@ -150,9 +189,9 @@ limitations under the License.
 				<version>0.28.0</version>
 				<configuration>
 					<verbose>true</verbose>
-					<!-- Not supplied to all jobs; e.g., Javadoc -->
-					<docker.pull.registry>nexus3.oran-osc.org:10001</docker.pull.registry>
-					<pushRegistry>${docker.push.registry}</pushRegistry>
+					<!-- environment variables supplied by Jenkins -->
+					<pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
+					<pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
 					<images>
 						<image>
 							<!-- Specify a tag to avoid default tag "latest" -->