X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=89a8315e30a444b82e85037e13f4eac6fefaf805;hb=6b1a3570356fd1a5624ea64db8d1f029ce0ab002;hp=6f7147c3284aa858c9565cfff1b7e19a082dd082;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 6f7147c3..89a8315e 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
 %%
@@ -25,25 +25,37 @@ 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.0-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.o-ran-sc.ric.e2mgr.client</groupId>
-			<artifactId>e2-mgr-client</artifactId>
-			<version>02052019-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.o-ran-sc.ric.plt.a1med.client</groupId>
+			<artifactId>a1-med-client</artifactId>
+			<version>0.4.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.o-ran-sc.ric.xappmgr.client</groupId>
-			<artifactId>xapp-mgr-client</artifactId>
-			<version>0.0.10-SNAPSHOT</version>
+			<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>20190703-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -82,17 +94,27 @@ limitations under the License.
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</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>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -115,9 +137,24 @@ limitations under the License.
 					</execution>
 				</executions>
 			</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.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<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>
@@ -140,6 +177,35 @@ 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>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.4</version>
+				<executions>
+					<execution>
+						<id>default-prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>default-report</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<!-- https://stackoverflow.com/questions/39126226/fabric8-springboot-full-example -->
 			<plugin>
 				<groupId>io.fabric8</groupId>
@@ -147,15 +213,16 @@ 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" -->
-							<name>${project.artifactId}:${project.version}</name>
+							<!-- Avoid maven artifact name here -->
+							<name>ric-dashboard:${project.version}</name>
 							<build>
-								<from>openjdk:8-jre-slim</from>
+								<from>openjdk:11-jre-slim</from>
 								<tags>
 									<!-- Add tag with build number -->
 									<tag>${project.version}</tag>
@@ -170,7 +237,7 @@ limitations under the License.
 								</runCmds>
 								<cmd>
 									<!-- CDATA prevents Eclipse formatter from breaking line -->
-									<shell><![CDATA[cd /maven; java -Xms128m -Xmx1024m -Djava.security.egd=file:/dev/./urandom -jar ${project.artifactId}-${project.version}.${project.packaging}]]></shell>
+									<shell><![CDATA[cd /maven; java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar ${project.artifactId}-${project.version}.${project.packaging}]]></shell>
 								</cmd>
 							</build>
 						</image>