X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=d7e12ec73d99c2164520d692ef1c3dc73ede16db;hb=93a44cb851a49c923126f32016646860d104075c;hp=7c041c124b935b663323ae59743a182d79023206;hpb=f6f3f33ef28b28f936c596376731d950e35d9071;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 7c041c12..d7e12ec7 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -25,34 +25,37 @@ limitations under the License.
 	<parent>
 		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.0.3-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>
+		<!-- Set by Jenkins -->
+		<build.number>0</build.number>
 	</properties>
 	<dependencies>
+		<!-- xApps -->
 		<dependency>
-			<groupId>org.o-ran-sc.ric.a1med.client</groupId>
+			<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.anrxapp.client</groupId>
-			<artifactId>anr-xapp-client</artifactId>
-			<version>0.0.5-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.e2mgr.client</groupId>
+			<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
 			<artifactId>e2-mgr-client</artifactId>
-			<version>20190515-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.o-ran-sc.ric.xappmgr.client</groupId>
-			<artifactId>xapp-mgr-client</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<version>20190703-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -91,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>
@@ -124,13 +137,26 @@ 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>
+				<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> -->
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -149,6 +175,34 @@ 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>
+				<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>
@@ -162,9 +216,10 @@ limitations under the License.
 					<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>
@@ -179,7 +234,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>