X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fpom.xml;h=95de721fa00032e07496f5e1f0cc14416a7b51f1;hb=5a1021b3264044b0f329f11ace6dc9e8a9c5d3fe;hp=ff92311d6ae20c6dc4ec67e5c085e037156fafb9;hpb=22cfc3d48f2c8fdd395d820d623c11924af960f8;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index ff92311..95de721 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-<![CDATA[
+<!--<![CDATA[
 ========================LICENSE_START=================================
 O-RAN-SC
 %%
@@ -30,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>
@@ -43,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>
@@ -108,6 +106,10 @@ limitations under the License.
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -151,6 +153,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>
@@ -178,9 +185,37 @@ limitations under the License.
             <artifactId>junit-platform-launcher</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <scope>test</scope>
+        </dependency>
     </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>
@@ -211,19 +246,6 @@ limitations under the License.
                     use mvn spotless:apply to rewrite source files use mvn spotless:check to
                     validate source files -->
             </plugin>
-            <plugin>
-                <!-- Most configuration and all execution is inherited -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <roots>
-                        <root>src</root>
-                    </roots>
-                    <excludes>
-                        <exclude>**/*.json</exclude>
-                    </excludes>
-                </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,