Merge "Update PAP documentation"

[policy/parent.git] / integration / pom.xml

diff --git a/integration/pom.xml b/integration/pom.xml
index 3ef1cbb..d803da8 100644 (file)
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -2,8 +2,8 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2018-2021 AT&T. All rights reserved.
-   Modifications Copyright (C) 2019-2020 Nordix Foundation.
-   Modifications Copyright (C) 2020 Bell Canada.
+   Modifications Copyright (C) 2019-2021 Nordix Foundation.
+   Modifications Copyright (C) 2020-2021 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -43,12 +43,13 @@
         <version.drools>7.33.0.Final</version.drools>
         <version.jersey>2.33</version.jersey>
         <version.jackson>2.11.3</version.jackson>
-        <version.ccsdk>0.4.4</version.ccsdk>
+        <version.ccsdk>0.7.5</version.ccsdk>
         <version.swagger>1.6.2</version.swagger>
         <version.javax.bind>2.3.1</version.javax.bind>
         <version.javax.json>1.1.4</version.javax.json>
-        <version.netty>4.1.58.Final</version.netty>
+        <version.netty>4.1.63.Final</version.netty>
         <jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
+        <repo.npm>https://nexus3.onap.org/repository/npm.public/npm/-/</repo.npm>
     </properties>
 
     <distributionManagement>
@@ -281,11 +282,17 @@
                 <version>${version.dmaap}</version>
             </dependency>
 
-            <!-- Common Controller SDK -->
+            <!-- CDS dependencies -->
             <dependency>
-                <groupId>org.onap.ccsdk.cds.components</groupId>
-                <artifactId>proto-definition</artifactId>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <artifactId>blueprint-proto</artifactId>
                 <version>${version.ccsdk}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.springfox</groupId>
+                        <artifactId>springfox-boot-starter</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- AAF Client -->
@@ -572,6 +579,71 @@
                                                 <ignore />
                                             </action>
                                         </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>org.jacoco</groupId>
+                                                <artifactId>jacoco-maven-plugin</artifactId>
+                                                <versionRange>[0.7.1.201405082137,)</versionRange>
+                                                <goals>
+                                                    <goal>prepare-agent</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>de.jpdigital</groupId>
+                                                <artifactId>hibernate52-ddl-maven-plugin</artifactId>
+                                                <versionRange>[2.3.0,)</versionRange>
+                                                <goals>
+                                                    <goal>gen-ddl</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>org.codehaus.groovy.maven</groupId>
+                                                <artifactId>gmaven-plugin</artifactId>
+                                                <versionRange>[1.0,)</versionRange>
+                                                <goals>
+                                                    <goal>execute</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>org.codehaus.mojo</groupId>
+                                                <artifactId>exec-maven-plugin</artifactId>
+                                                <versionRange>[3.0.0,)</versionRange>
+                                                <goals>
+                                                    <goal>exec</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
+                                        <pluginExecution>
+                                            <pluginExecutionFilter>
+                                                <groupId>org.codehaus.mojo</groupId>
+                                                <artifactId>keytool-maven-plugin</artifactId>
+                                                <versionRange>[1.5.0,)</versionRange>
+                                                <goals>
+                                                    <goal>generateKeyPair</goal>
+                                                </goals>
+                                            </pluginExecutionFilter>
+                                            <action>
+                                                <ignore />
+                                            </action>
+                                        </pluginExecution>
                                     </pluginExecutions>
                                 </lifecycleMappingMetadata>
                             </configuration>
@@ -733,31 +805,31 @@
                         </configuration>
                     </execution>
                     <execution>
-                      <id>pre-integration-test</id>
-                      <phase>pre-integration-test</phase>
-                      <goals>
-                        <goal>prepare-agent</goal>
-                      </goals>
-                      <configuration>
-                        <skip>true</skip>
-                      </configuration>
+                        <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>
+                        <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>
+                        <id>report-aggregate</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
                     </execution>
                 </executions>
             </plugin>