POM fixes due to update in cadi-aaf

[policy/engine.git] / ONAP-PAP-REST / pom.xml

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 0c04a86..9d3d3d2 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -21,7 +21,6 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
        <modelVersion>4.0.0</modelVersion>
        <artifactId>ONAP-PAP-REST</artifactId>
        <description>ONAP-PAP-REST</description>
@@ -84,7 +83,7 @@
                                        <artifactId>cambriaClient</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>com.att.cadi</groupId>
+                                       <groupId>org.onap.aaf.cadi</groupId>
                                        <artifactId>cadi-aaf</artifactId>
                                </exclusion>
                        </exclusions>
@@ -109,16 +108,6 @@
                        <groupId>org.onap.policy.common</groupId>
                        <artifactId>ONAP-Logging</artifactId>
                        <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-module-junit4</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-api-mockito</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -176,12 +165,6 @@
                        <artifactId>org.eclipse.jgit</artifactId>
                        <version>3.2.0.201312181205-r</version>
                </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-jdbc</artifactId>
@@ -211,21 +194,11 @@
             <artifactId>mariadb-java-client</artifactId>
             <version>2.1.1</version>
         </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-mock</artifactId>
-                       <version>2.0.8</version>
-               </dependency>
                <dependency>
                        <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
                        <artifactId>policy-yaml</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.mockrunner</groupId>
-                       <artifactId>mockrunner</artifactId>
-                       <version>0.3.1</version>
-               </dependency>
                <!-- Spring -->
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -284,11 +257,6 @@
                        <artifactId>jackson-core</artifactId>
                        <version>${jackson.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
                        <artifactId>jackson-module-jaxb-annotations</artifactId>
@@ -307,7 +275,7 @@
                <dependency>
                        <groupId>org.elasticsearch</groupId>
                        <artifactId>elasticsearch</artifactId>
-                       <version>5.1.2</version>
+                       <version>6.2.2</version>
                </dependency>
                <dependency>
                        <groupId>io.searchbox</groupId>
@@ -331,19 +299,6 @@
                        <artifactId>tomcat-dbcp</artifactId>
                        <version>8.5.9</version>
                </dependency>
-               <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
-               <dependency>
-               <groupId>org.powermock</groupId>
-               <artifactId>powermock-api-mockito</artifactId>
-               <version>1.7.3</version>
-               <scope>test</scope>
-               </dependency>
-               <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.7.3</version>
-            <scope>test</scope>
-        </dependency>
        </dependencies>
        <properties>
                <springframework.version>4.3.3.RELEASE</springframework.version>