Merge "Dockerize the frontend of controlpanel"

[portal/nonrtric-controlpanel.git] / webapp-backend / pom.xml

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 3ec22cb..d49b53b 100644 (file)
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <parent>
         <groupId>org.o-ran-sc.portal.nonrtric.controlpanel</groupId>
         <artifactId>nonrtric-controlpanel-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>nonrtric-controlpanel-be</artifactId>
     <name>Non-RT RIC Control Panel Webapp backend</name>
@@ -40,6 +40,7 @@ limitations under the License.
         <spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
         <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+        <json.version>20190722</json.version>
         <!-- Set by Jenkins -->
         <build.number>0</build.number>
     </properties>
@@ -51,56 +52,6 @@ limitations under the License.
         </repository>
     </repositories>
     <dependencies>
-        <!-- Platform components -->
-        <dependency>
-            <groupId>org.onap.portal.sdk</groupId>
-            <artifactId>epsdk-fw</artifactId>
-            <version>${epsdk-fw.version}</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>
@@ -118,6 +69,11 @@ limitations under the License.
             <artifactId>axis2-kernel</artifactId>
             <version>${apache-axis2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- Bridge uses of Apache commons logging, like EPSDK-FW -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -152,6 +108,11 @@ limitations under the License.
             <artifactId>gson</artifactId>
             <version>${immutable.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${json.version}</version>
+        </dependency>
         <!-- Test dependencies -->
         <!-- Mockito supports development, not just testing -->
         <dependency>
@@ -258,26 +219,6 @@ limitations under the License.
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/classes/resources/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.parent.basedir}/webapp-frontend/dist/controlpanelApp/</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <!-- do not deploy a jar or pom file -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -320,7 +261,7 @@ limitations under the License.
                         <image>
                             <!-- Specify a tag to avoid default tag "latest" -->
                             <!-- Avoid maven artifact name here -->
-                            <name>o-ran-sc/nonrtric-controlpanel:${project.version}</name>
+                            <name>o-ran-sc/nonrtric-controlpanel-backend:${project.version}</name>
                             <build>
                                 <from>openjdk:11-jre-slim</from>
                                 <tags>