Step version to 1.12.4-SNAPSHOT

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

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1056fbd..b418672 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.10.0-SNAPSHOT</version>
+        <version>1.12.4-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -52,10 +52,11 @@ limitations under the License.
         <it.docker.version>latest</it.docker.version>
         <it.ui.firefox.version>86.0</it.ui.firefox.version>
         <it.helm-validator.disabled>true</it.helm-validator.disabled>
-        <it.helm-validator.version>1.2.2</it.helm-validator.version>
+        <it.helm-validator.version>1.3.1</it.helm-validator.version>
 
         <!-- parser-->
-        <sdc-tosca-parser.version>1.6.6</sdc-tosca-parser.version>
+        <sdc-tosca-parser.version>1.8.0</sdc-tosca-parser.version>
+        <docker.showLogs>false</docker.showLogs>
     </properties>
 
     <dependencies>
@@ -94,12 +95,32 @@ limitations under the License.
             <artifactId>catalog-model</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.be</groupId>
             <artifactId>catalog-dao</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
@@ -118,7 +139,27 @@ limitations under the License.
             <artifactId>extentreports</artifactId>
             <version>3.0.6</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jsoup</groupId>
+                    <artifactId>jsoup</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpmime</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>mongodb-driver</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver</artifactId>
+            <version>3.12.10</version>
+        </dependency>
+
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
@@ -126,8 +167,12 @@ limitations under the License.
             <scope>test</scope>
             <exclusions>
                 <exclusion>
+                    <groupId>org.apache.tinkerpop</groupId>
                     <artifactId>gremlin-groovy</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.tinkerpop</groupId>
+                    <artifactId>gremlin-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
@@ -157,6 +202,10 @@ limitations under the License.
                     <groupId>dom4j</groupId>
                     <artifactId>dom4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -187,6 +236,10 @@ limitations under the License.
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -238,6 +291,12 @@ limitations under the License.
             <artifactId>selenium-server</artifactId>
             <version>${selenium.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
@@ -258,6 +317,10 @@ limitations under the License.
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -271,6 +334,16 @@ limitations under the License.
             <artifactId>proxy-vole</artifactId>
             <version>1.0.2</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna-platform</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
@@ -278,18 +351,38 @@ limitations under the License.
             <version>3.3</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.13.1</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-fw</artifactId>
+            <version>${ecomp.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.owasp.esapi</groupId>
+                    <artifactId>esapi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.functionaljava</groupId>
+            <artifactId>functionaljava</artifactId>
+            <version>${functionaljava.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -312,6 +405,12 @@ limitations under the License.
                                     <filtering>true</filtering>
                                     <includes>
                                         <include>integration-test.json</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <directory>environments</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
                                         <include>plugins-configuration.yaml</include>
                                     </includes>
                                 </resource>
@@ -435,9 +534,10 @@ limitations under the License.
                     <verbose>${verbose}</verbose>
                     <apiVersion>${docker.api.version}</apiVersion>
                     <autoCreateCustomNetworks>true</autoCreateCustomNetworks>
+                    <startParallel>true</startParallel>
                     <images>
                         <image>
-                            <name>onap/sdc-cassandra:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-cassandra:${it.docker.version}</name>
                             <alias>sdc-cassandra</alias>
                             <run>
                                 <env>
@@ -487,7 +587,7 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-cassandra-init:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-cassandra-init:${it.docker.version}</name>
                             <alias>sdc-cassandra-init</alias>
                             <run>
                                 <dependsOn>
@@ -520,11 +620,11 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-onboard-cassandra-init:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version}</name>
                             <alias>sdc-cassandra-onboard-init</alias>
                             <run>
                                 <dependsOn>
-                                    <container>sdc-cassandra</container>
+                                    <container>sdc-cassandra-init</container>
                                 </dependsOn>
                                 <env>
                                     <RELEASE>${project.version}</RELEASE>
@@ -554,10 +654,10 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-onboard-backend:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-onboard-backend:${it.docker.version}</name>
                             <alias>sdc-onboard-backend</alias>
                             <run>
-                               <dependsOn>
+                                <dependsOn>
                                     <container>sdc-cassandra-onboard-init</container>
                                 </dependsOn>
                                 <env>
@@ -607,7 +707,7 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-backend-all-plugins:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-backend-all-plugins:${it.docker.version}</name>
                             <alias>sdc-backend</alias>
                             <run>
                                 <dependsOn>
@@ -659,7 +759,7 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-backend-init:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-backend-init:${it.docker.version}</name>
                             <alias>sdc-backend-init</alias>
                             <run>
                                 <dependsOn>
@@ -689,7 +789,7 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-frontend:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-frontend:${it.docker.version}</name>
                             <alias>sdc-frontend</alias>
                             <run>
                                 <env>
@@ -735,12 +835,9 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>onap/sdc-simulator:${it.docker.version}</name>
+                            <name>${docker.namespace}/sdc-simulator:${it.docker.version}</name>
                             <alias>sdc-simulator</alias>
                             <run>
-                                <dependsOn>
-                                    <container>sdc-frontend</container>
-                                </dependsOn>
                                 <env>
                                     <!--<FE_URL>${it.env.name}</FE_URL>-->
                                     <JAVA_OPTIONS>-Xmx128m -Xms128m -Xss1m</JAVA_OPTIONS>
@@ -761,13 +858,15 @@ limitations under the License.
                                         <ports>
                                             <port>8080</port>
                                             <port>8443</port>
+                                            <port>5000</port>
                                         </ports>
                                     </tcp>
                                 </wait>
                                 <ports>
                                     <!-- http://localhost:8285/login to access SDC -->
-                                   <port>8285:8080</port>
+                                    <port>8285:8080</port>
                                     <port>8286:8443</port>
+                                    <port>5000:5000</port>
                                 </ports>
                                 <network>
                                     <mode>custom</mode>
@@ -821,32 +920,32 @@ limitations under the License.
                                 </volumes>
                             </run>
                         </image>
-                      <image>
-                        <name>onap/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version}</name>
-                        <alias>helm-validator</alias>
-                        <run>
-                          <skip>${it.helm-validator.disabled}</skip>
-                          <hostname>helm-validator</hostname>
-                          <wait>
-                            <time>20000</time>
-                            <tcp>
-                              <host>helm-validator</host>
-                              <mode>direct</mode>
-                              <ports>
-                                <port>8080</port>
-                              </ports>
-                            </tcp>
-                          </wait>
-                          <ports>
-                            <port>8085:8080</port>
-                          </ports>
-                          <network>
-                            <mode>custom</mode>
-                            <name>sdc-network</name>
+                        <image>
+                            <name>${docker.namespace}/sdc-helm-validator:${it.helm-validator.version}</name>
                             <alias>helm-validator</alias>
-                          </network>
-                        </run>
-                      </image>
+                            <run>
+                                <skip>${it.helm-validator.disabled}</skip>
+                                <hostname>helm-validator</hostname>
+                                <wait>
+                                    <time>20000</time>
+                                    <tcp>
+                                        <host>helm-validator</host>
+                                        <mode>direct</mode>
+                                        <ports>
+                                            <port>8080</port>
+                                        </ports>
+                                    </tcp>
+                                </wait>
+                                <ports>
+                                    <port>8085:8080</port>
+                                </ports>
+                                <network>
+                                    <mode>custom</mode>
+                                    <name>sdc-network</name>
+                                    <alias>helm-validator</alias>
+                                </network>
+                            </run>
+                        </image>
                     </images>
                 </configuration>
                 <executions>