Add a1, appmgr submodules to provide API specs

[portal/ric-dashboard.git] / webapp-backend / pom.xml

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index d7e12ec..a1e30f2 100644 (file)
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -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>1.2.4-SNAPSHOT</version>
        </parent>
        <artifactId>ric-dash-be</artifactId>
        <name>RIC Dashboard Webapp backend</name>
@@ -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>
@@ -45,17 +52,66 @@ 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.3-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.7-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.5-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>
@@ -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>
@@ -83,12 +144,13 @@ 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>
@@ -107,6 +169,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>
@@ -207,7 +271,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 -->
@@ -229,12 +293,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>-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>-Djava.security.egd=file:/dev/./urandom</arg>
+                                                                               <arg>org.springframework.boot.loader.PropertiesLauncher</arg>
+                                                                       </exec>
                                                                </cmd>
                                                        </build>
                                                </image>