X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=4dfba6ef98014f169f6b024340290967487be7bd;hb=refs%2Fchanges%2F75%2F5175%2F4;hp=8b6599d2498677e5186d18fd0afc83771c2d6417;hpb=0bcfde8903ba3f1fb99fcab3bf39f7f4e6ccbe1e;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 8b6599d..4dfba6e 100644
--- 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.0.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>
@@ -192,6 +153,24 @@ limitations under the License.
     </dependencies>
     <build>
         <plugins>
+        <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>build-helper-maven-plugin</artifactId>
+             <executions>
+              <execution>
+               <id>add-source</id>
+               <phase>generate-sources</phase>
+               <goals>
+                <goal>add-source</goal>
+               </goals>
+               <configuration>
+                <sources>
+                 <source>${project.build.directory}/generated-sources/annotations/</source>
+                </sources>
+               </configuration>
+              </execution>
+             </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>