<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.13.3-SNAPSHOT</version>
</parent>
<properties>
<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>
</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>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<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>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<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>
<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>
<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>
<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>
<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>
<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>
<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>