X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration%2Fpom.xml;h=978ecbbadc8abcf4322e7ebbe4564a14c34e7559;hb=b00006fd6505588ec3210d826020fc87939ee076;hp=bc034daa6563cd41febab7c4f6fb9b0c2a77077d;hpb=d7a4365ca56060b8afb0f33e7755e9bdb7f825c4;p=policy%2Fparent.git

diff --git a/integration/pom.xml b/integration/pom.xml
index bc034daa..978ecbba 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,8 +1,9 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2018-2019 AT&T. All rights reserved.
+   Modifications Copyright (C) 2018-2020 AT&T. All rights reserved.
    Modifications Copyright (C) 2019 Nordix Foundation.
+   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>policy-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>integration</artifactId>
     <packaging>pom</packaging>
@@ -34,16 +35,21 @@
     <description>Policy Integration POM</description>
 
     <properties>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <java.version>11</java.version>
         <version.logback>1.2.3</version.logback>
         <version.dmaap>1.1.9</version.dmaap>
-        <version.powermock>1.7.4</version.powermock>
-        <version.eclipselink>2.7.0</version.eclipselink>
+        <version.powermock>2.0.4</version.powermock>
+        <version.eclipselink>2.7.5</version.eclipselink>
         <version.jackson>2.10.0.pr3</version.jackson>
-        <version.drools>7.28.0.Final</version.drools>
-        <version.jersey>2.29.1</version.jersey>
+        <version.drools>7.33.0.Final</version.drools>
+        <version.jersey>2.30.1</version.jersey>
+        <version.ccsdk>0.4.4</version.ccsdk>
+        <version.swagger>1.6.0</version.swagger>
+        <version.javax.bind>2.3.1</version.javax.bind>
+        <version.javax.json>1.1.4</version.javax.json>
+        <version.json>20190722</version.json>
+        <version.netty>4.1.48.Final</version.netty>
+        <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
     </properties>
 
     <distributionManagement>
@@ -177,7 +183,7 @@
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-jersey2-jaxrs</artifactId>
-                <version>1.5.24</version>
+                <version>${version.swagger}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.glassfish.jersey.containers</groupId>
@@ -190,7 +196,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.11</version>
+                <version>1.14</version>
             </dependency>
 
             <dependency>
@@ -232,21 +238,21 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.9</version>
+                <version>4.5.11</version>
             </dependency>
 
             <!-- HttpComponents Core (blocking I/O) -->
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.9</version>
+                <version>4.4.13</version>
             </dependency>
 
             <!-- JSON marshalling and unmarshalling -->
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
-                <version>2.8.4</version>
+                <version>2.8.6</version>
             </dependency>
 
             <!-- Lombok -->
@@ -277,7 +283,7 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${version.logback}</version>
             </dependency>
-            
+
             <!-- Dmaap Client -->
             <dependency>
                 <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
@@ -285,6 +291,13 @@
                 <version>${version.dmaap}</version>
             </dependency>
 
+            <!-- Common Controller SDK -->
+            <dependency>
+                <groupId>org.onap.ccsdk.cds.components</groupId>
+                <artifactId>proto-definition</artifactId>
+                <version>${version.ccsdk}</version>
+            </dependency>
+
             <!-- AAF Client -->
             <dependency>
                 <groupId>org.onap.aaf.authz</groupId>
@@ -322,7 +335,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.24</version>
+                <version>1.26</version>
             </dependency>
 
             <!-- Drools -->
@@ -416,7 +429,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.12</version>
+                <version>4.13</version>
                 <scope>test</scope>
             </dependency>
 
@@ -424,13 +437,13 @@
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-java</artifactId>
-                <version>4.2.0</version>
+                <version>5.4.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-junit</artifactId>
-                <version>4.2.0</version>
+                <version>5.4.0</version>
                 <scope>test</scope>
             </dependency>
 
@@ -443,6 +456,12 @@
             </dependency>
 
             <!-- Mock libraries -->
+            <dependency>
+                <groupId>com.openpojo</groupId>
+                <artifactId>openpojo</artifactId>
+                <version>0.8.10</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
@@ -457,7 +476,7 @@
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
+                <artifactId>powermock-api-mockito2</artifactId>
                 <version>${version.powermock}</version>
                 <scope>test</scope>
             </dependency>
@@ -468,11 +487,36 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>com.openpojo</groupId>
-                <artifactId>openpojo</artifactId>
-                <version>0.8.10</version>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>3.2.4</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- Awaitility -->
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>4.0.2</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- Netty -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${version.netty}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http2</artifactId>
+                <version>${version.netty}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler-proxy</artifactId>
+                <version>${version.netty}</version>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>
@@ -572,8 +616,7 @@
                     <version>3.8.1</version>
                     <configuration>
                         <encoding>${project.build.sourceEncoding}</encoding>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
+                        <release>${java.version}</release>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -610,6 +653,59 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${jacoco.dataFile}</destFile>
+                            <append>true</append>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${jacoco.dataFile}</dataFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                      <id>pre-integration-test</id>
+                      <phase>pre-integration-test</phase>
+                      <goals>
+                        <goal>prepare-agent</goal>
+                      </goals>
+                      <configuration>
+                        <skip>true</skip>
+                      </configuration>
+                    </execution>
+                    <execution>
+                      <id>post-integration-test</id>
+                      <phase>post-integration-test</phase>
+                      <goals>
+                        <goal>report</goal>
+                      </goals>
+                      <configuration>
+                        <skip>true</skip>
+                      </configuration>
+                    </execution>
+                    <execution>
+                      <id>report-aggregate</id>
+                      <phase>prepare-package</phase>
+                      <goals>
+                        <goal>report-aggregate</goal>
+                      </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>