X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=a7ee92bab6f54537cf4e514dcc7e07880b2bbfc3;hb=a38e36caa736b48ca6aefafc3f03eeb966f6efb5;hp=f426920907db7c7f7e443e353cbd526f3767237f;hpb=80f26bbeef6caea8f9946e8a0e1a5e0319dacc38;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index f4269209..a7ee92ba 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -25,16 +25,22 @@ limitations under the License.
 	<parent>
 		<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
 		<artifactId>ric-dash-parent</artifactId>
-		<version>1.0.4-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>
+	<repositories>
+		<repository>
+			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+	</repositories>
 	<dependencies>
 		<!-- xApps -->
 		<dependency>
@@ -46,7 +52,7 @@ limitations under the License.
 		<dependency>
 			<groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
 			<artifactId>a1-med-client</artifactId>
-			<version>0.4.0-SNAPSHOT</version>
+			<version>0.10.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
@@ -56,7 +62,56 @@ limitations under the License.
 		<dependency>
 			<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
 			<artifactId>e2-mgr-client</artifactId>
-			<version>20190620-SNAPSHOT</version>
+			<version>20190703-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.portal.sdk</groupId>
+			<artifactId>epsdk-fw</artifactId>
+			<version>2.4.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>apache-log4j-extras</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-fileupload</groupId>
+					<artifactId>commons-fileupload</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-beanutils</groupId>
+					<artifactId>commons-beanutils</artifactId>
+				</exclusion>
+				<!-- EELF omits "test" scope on this dependency -->
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-module-junit4</artifactId>
+				</exclusion>
+				<!-- EELF omits "test" scope on this dependency -->
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -66,6 +121,11 @@ limitations under the License.
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
+		<!-- Bridge uses of Apache commons logging, like EPSDK-FW -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
@@ -84,20 +144,40 @@ limitations under the License.
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>${springfox.version}</version>
 		</dependency>
+		<!-- Test dependencies -->
 		<!-- Mockito supports development, not just testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
 		</dependency>
-		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<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>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
@@ -119,20 +199,6 @@ limitations under the License.
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<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, 
@@ -140,7 +206,6 @@ limitations under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<!-- Spring sets the <version>2.5</version> -->
 				<configuration>
 					<archive>
 						<manifest>
@@ -154,7 +219,6 @@ limitations under the License.
 			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<!-- spring-boot sets the <version>3.1.0</version> -->
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -177,11 +241,30 @@ limitations under the License.
 			<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>
@@ -195,9 +278,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>
@@ -207,12 +291,21 @@ limitations under the License.
 								</assembly>
 								<runCmds>
 									<!-- Ensure logs dir exists and is world writable -->
-									<runCmd>mkdir /maven/logs</runCmd>
-									<runCmd>chmod -R 777 /maven</runCmd>
+									<runCmd>mkdir /logs</runCmd>
+									<runCmd>chmod -R 777 /logs</runCmd>
 								</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>
+									<!-- Include maven dir on classpath for prop files -->
+									<exec>
+										<arg>java</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>
 								</cmd>
 							</build>
 						</image>