X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=7c3a2dd188b23744e2f23a4aa6e5f30c6946bf76;hb=refs%2Fchanges%2F25%2F2225%2F2;hp=a7ee92bab6f54537cf4e514dcc7e07880b2bbfc3;hpb=a38e36caa736b48ca6aefafc3f03eeb966f6efb5;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index a7ee92ba..7c3a2dd1 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -3,7 +3,7 @@
 ========================LICENSE_START=================================
 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,7 +25,7 @@ limitations under the License.
 	<parent>
 		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ric-dash-be</artifactId>
 	<name>RIC Dashboard Webapp backend</name>
@@ -43,31 +43,26 @@ limitations under the License.
 	</repositories>
 	<dependencies>
 		<!-- xApps -->
-		<dependency>
-			<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.10.0-SNAPSHOT</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
 			<artifactId>app-mgr-client</artifactId>
-			<version>0.1.5-SNAPSHOT</version>
+			<version>0.1.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
 			<artifactId>e2-mgr-client</artifactId>
-			<version>20190703-SNAPSHOT</version>
+			<version>2.0.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-fw</artifactId>
-			<version>2.4.0</version>
+			<version>2.6.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -169,6 +164,8 @@ limitations under the License.
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
+			<!-- Override Spring-Boot choice for Eclipse -->
+			<version>1.4.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -179,25 +176,17 @@ limitations under the License.
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
+				<!-- Most configuration and all execution is inherited -->
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>update-file-header</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<organizationName>${lmp.organization.name}</organizationName>
-							<inceptionYear>${lmp.inception.year}</inceptionYear>
-							<projectName>${lmp.project.name}</projectName>
-							<licenseName>${lmp.license.name}</licenseName>
-							<processStartTag>${lmp.process.start.tag}</processStartTag>
-							<processEndTag>${lmp.process.end.tag}</processEndTag>
-							<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-						</configuration>
-					</execution>
-				</executions>
+				<configuration>
+					<roots>
+						<root>src</root>
+					</roots>
+					<excludes>
+						<exclude>**/*.json</exclude>
+					</excludes>
+				</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. 
@@ -269,7 +258,7 @@ limitations under the License.
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.28.0</version>
+				<version>0.30.0</version>
 				<configuration>
 					<verbose>true</verbose>
 					<!-- environment variables supplied by Jenkins -->
@@ -279,7 +268,7 @@ limitations under the License.
 						<image>
 							<!-- Specify a tag to avoid default tag "latest" -->
 							<!-- Avoid maven artifact name here -->
-							<name>ric-dashboard:${project.version}</name>
+							<name>o-ran-sc/ric-dashboard:${project.version}</name>
 							<build>
 								<from>openjdk:11-jre-slim</from>
 								<tags>
@@ -298,11 +287,11 @@ limitations under the License.
 									<!-- Include maven dir on classpath for prop files -->
 									<exec>
 										<arg>java</arg>
+										<arg>-Xms128m</arg>
+										<arg>-Xmx256m</arg>
 										<arg>-cp</arg>
 										<arg>maven:maven/${project.artifactId}-${project.version}.${project.packaging}</arg>
 										<arg>-Dloader.main=org.oransc.ric.portal.dashboard.DashboardApplication</arg>
-										<arg>-Xms128m</arg>
-										<arg>-Xmx256m</arg>
 										<arg>-Djava.security.egd=file:/dev/./urandom</arg>
 										<arg>org.springframework.boot.loader.PropertiesLauncher</arg>
 									</exec>