Fix mvn build issue

[sdc.git] / integration-tests / pom.xml

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 0db0050..c5f20b0 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.5-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -228,8 +228,8 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
             <version>${httpclient.version}</version>
             <scope>test</scope>
             <exclusions>
@@ -281,11 +281,22 @@ limitations under the License.
         </dependency>
 
         <!--FOR the Frontend -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
             <scope>test</scope>
             <version>${selenium.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
@@ -297,6 +308,10 @@ limitations under the License.
                     <groupId>javax.servlet</groupId>
                     <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -304,6 +319,12 @@ limitations under the License.
             <artifactId>selenium-firefox-driver</artifactId>
             <version>${selenium.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -322,6 +343,10 @@ limitations under the License.
                     <groupId>org.slf4j</groupId>
                     <artifactId>jcl-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -376,6 +401,18 @@ limitations under the License.
                     <groupId>javax.servlet</groupId>
                     <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-aaf</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.authz</groupId>
+                    <artifactId>aaf-cadi-core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -653,8 +690,8 @@ limitations under the License.
                 <artifactId>docker-maven-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
+                        <groupId>org.apache.httpcomponents.client5</groupId>
+                        <artifactId>httpclient5</artifactId>
                         <version>${httpclient.version}</version>
                     </dependency>
                 </dependencies>
@@ -1080,6 +1117,7 @@ limitations under the License.
                             <name>${docker.namespace}/sdc-integration-tests-init</name>
                             <alias>integration-tests-init</alias>
                             <build>
+                                <skip>${it.test-model.disabled}</skip>
                                 <cleanup>try</cleanup>
                                 <dockerFileDir>${project.basedir}/integration-tests-init</dockerFileDir>
                                 <tags>
@@ -1158,12 +1196,9 @@ limitations under the License.
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>true</reuseForks>
-                    <systemProperties>
-                        <property>
-                            <name>testng.dtd.http</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
+                    <systemPropertyVariables>
+                        <testng.dtd.http>true</testng.dtd.http>
+                    </systemPropertyVariables>
                     <suiteXmlFiles>
                         <file>src/test/resources/ci/testSuites/backend/onapApiSanity.xml</file>
                         <file>src/test/resources/ci/testSuites/frontend/onapUiSanity.xml</file>
@@ -1222,12 +1257,9 @@ limitations under the License.
                         <configuration>
                             <forkCount>1</forkCount>
                             <reuseForks>true</reuseForks>
-                            <systemProperties>
-                                <property>
-                                    <name>testng.dtd.http</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <testng.dtd.http>true</testng.dtd.http>
+                            </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <file>src/test/resources/ci/testSuites/backend/onapApiSanity.xml</file>
                                 <file>src/test/resources/ci/testSuites/frontend/onapUiSanity.xml</file>
@@ -1256,12 +1288,9 @@ limitations under the License.
                         <configuration>
                             <forkCount>1</forkCount>
                             <reuseForks>true</reuseForks>
-                            <systemProperties>
-                                <property>
-                                    <name>testng.dtd.http</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <testng.dtd.http>true</testng.dtd.http>
+                            </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <file>src/test/resources/ci/testSuites/backend/onapApiSanity.xml</file>
                                 <file>src/test/resources/ci/testSuites/backend/helmValidatorTests.xml</file>
@@ -1288,12 +1317,9 @@ limitations under the License.
                         <configuration>
                             <forkCount>1</forkCount>
                             <reuseForks>true</reuseForks>
-                            <systemProperties>
-                                <property>
-                                    <name>testng.dtd.http</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
+                            <systemPropertyVariables>
+                                <testng.dtd.http>true</testng.dtd.http>
+                            </systemPropertyVariables>
                             <suiteXmlFiles>
                                 <file>src/test/resources/ci/testSuites/frontend/onapUiSanity.xml</file>
                                 <file>src/test/resources/ci/testSuites/frontend/helmValidatorTests.xml</file>