X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=892ca6fbc72826e41f89361cd5a41e1422f98732;hb=ef2afb662e0051397034e6fd3ece039a04c684c0;hp=49237943e456d98983c924c36fe3e1465b3bb873;hpb=81b0ffb7296c715c6a09c94a5144c03c1680f84d;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 49237943..892ca6fb 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.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ric-dash-be</artifactId>
 	<name>RIC Dashboard Webapp backend</name>
@@ -43,11 +43,6 @@ 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>
@@ -67,7 +62,7 @@ limitations under the License.
 		<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>
@@ -181,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. 
@@ -281,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>
@@ -292,8 +279,6 @@ limitations under the License.
 									<descriptorRef>artifact</descriptorRef>
 								</assembly>
 								<runCmds>
-									<!-- Include debug tool for limited network -->
-									<runCmd><![CDATA[apt-get update && apt-get -y install curl]]></runCmd>
 									<!-- Ensure logs dir exists and is world writable -->
 									<runCmd>mkdir /logs</runCmd>
 									<runCmd>chmod -R 777 /logs</runCmd>