X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fpom.xml;h=40db7710cafbe7aa268c3541e4de3786d8b6b97c;hb=3f812ea25d352ec33d07f5ffa4c2aa2a77e8e793;hp=e96777fe847a1c164e4187951ba1a08a2ce08593;hpb=de17870a15d4ad8bd12828c27950aa681165413b;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index e96777fe..40db7710 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -34,6 +34,13 @@ limitations under the License.
 		<!-- 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>
@@ -57,6 +64,55 @@ limitations under the License.
 			<artifactId>e2-mgr-client</artifactId>
 			<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>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -65,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>
@@ -230,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 -Xmx256m -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>