Merge "Fixed Duplicate Search Result - User Search"

[portal.git] / portal-BE / pom.xml

diff --git a/portal-BE/pom.xml b/portal-BE/pom.xml
index 13477b6..f7f9c37 100644 (file)
--- a/portal-BE/pom.xml
+++ b/portal-BE/pom.xml
@@ -5,7 +5,7 @@
       <parent>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-parent</artifactId>
-            <version>2.2.0.M4</version>
+            <version>2.2.1.RELEASE</version>
             <relativePath/> <!-- lookup parent from repository -->
       </parent>
       <groupId>org.onap</groupId>
@@ -141,59 +141,52 @@
                   <scope>compile</scope>
             </dependency>
             <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>2.0.0-rc2</version>
-                  <scope>compile</scope>
-            </dependency>
-            <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>2.0.0-rc2</version>
-                  <scope>compile</scope>
-            </dependency>
-            <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>1.5.20</version>
-            </dependency>
-            <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>2.0.0-rc2</version>
-                  <scope>compile</scope>
-            </dependency>
-            <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>1.5.20</version>
-            </dependency>
-            <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>2.0.0-rc2</version>
-                  <scope>compile</scope>
-            </dependency>
-            <dependency>
-                  <groupId>io.swagger</groupId>
-                  <artifactId>swagger-annotations</artifactId>
-                  <version>2.0.0-rc2</version>
+                  <groupId>org.apache.cxf</groupId>
+                  <artifactId>cxf-rt-rs-client</artifactId>
+                  <version>3.3.4</version>
                   <scope>compile</scope>
             </dependency>
+          <dependency>
+              <groupId>org.hibernate.validator</groupId>
+              <artifactId>hibernate-validator</artifactId>
+              <version>6.0.18.Final</version>
+              <scope>compile</scope>
+          </dependency>
             <dependency>
                   <groupId>io.swagger</groupId>
                   <artifactId>swagger-annotations</artifactId>
-                  <version>1.5.20</version>
-            </dependency>
-            <dependency>
-                  <groupId>org.apache.cxf</groupId>
-                  <artifactId>cxf-rt-rs-client</artifactId>
-                  <version>3.3.2</version>
+                  <version>1.5.13</version>
                   <scope>compile</scope>
             </dependency>
+        <dependency>
+          <groupId>org.glassfish.jersey.core</groupId>
+          <artifactId>jersey-client</artifactId>
+          <version>2.29.1</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
+          <version>9.4.18.v20190429</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.jaxrs</groupId>
+          <artifactId>jackson-jaxrs-json-provider</artifactId>
+          <version>2.10.0</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.onap.portal.sdk</groupId>
+          <artifactId>epsdk-app-common</artifactId>
+          <version>2.6.0</version>
+          <scope>compile</scope>
+        </dependency>
       </dependencies>
       <properties>
             <docker.image.prefix>portal</docker.image.prefix>
+            <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+                       <sonar.skip>true</sonar.skip>
       </properties>
       <build>
             <plugins>
@@ -247,6 +240,25 @@
                               </execution>
                         </executions>
                   </plugin>
+                  <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.7.7.201606060606</version>
+                        <executions>
+                              <execution>
+                                    <goals>
+                                          <goal>prepare-agent</goal>
+                                    </goals>
+                              </execution>
+                              <execution>
+                                    <id>report</id>
+                                    <phase>prepare-package</phase>
+                                    <goals>
+                                          <goal>report</goal>
+                                    </goals>
+                              </execution>
+                        </executions>
+                  </plugin>
             </plugins>
             <resources>
                   <resource>