POM fixes due to update in cadi-aaf

[policy/engine.git] / POLICY-SDK-APP / pom.xml

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 1203797..9f7f267 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -68,7 +68,7 @@
        </build>
        <properties>
                <encoding>UTF-8</encoding>
-               <epsdk.version>2.1.0-SNAPSHOT</epsdk.version>
+               <epsdk.version>2.1.0</epsdk.version>
                <springframework.version>4.2.0.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <skipassembly>true</skipassembly>
@@ -76,6 +76,11 @@
            <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/*</sonar.exclusions>               
        </properties>
        <dependencies>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-core</artifactId>
@@ -85,6 +90,10 @@
                                        <groupId>mysql</groupId>
                                <artifactId>mysql-connector-java</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>com.thoughtworks.xstream</groupId>
+                                       <artifactId>xstream</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
        <!-- Spring -->
@@ -152,11 +161,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>
@@ -176,7 +180,7 @@
                <dependency>
                        <groupId>org.elasticsearch</groupId>
                        <artifactId>elasticsearch</artifactId>
-                       <version>2.2.0</version>
+                       <version>6.2.2</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
@@ -192,6 +196,10 @@
                                        <groupId>commons-logging</groupId>
                                        <artifactId>commons-logging</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.httpcomponents</groupId>
+                                       <artifactId>httpclient</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -244,12 +252,6 @@
                    <artifactId>yamlbeans</artifactId>
                    <version>1.08</version>
                </dependency>           
-               <!-- https://mvnrepository.com/artifact/org.easymock/easymock -->
-               <dependency>
-                   <groupId>org.easymock</groupId>
-                   <artifactId>easymock</artifactId>
-                   <version>3.1</version>
-               </dependency>   
                <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
                <dependency>
                    <groupId>org.yaml</groupId>