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 0af1242..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>
@@ -146,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>
@@ -266,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>
@@ -320,12 +351,6 @@ 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>
@@ -337,6 +362,26 @@ limitations under the License.
             <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>
 
@@ -360,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>
@@ -870,7 +921,7 @@ limitations under the License.
                             </run>
                         </image>
                         <image>
-                            <name>${docker.namespace}/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version}</name>
+                            <name>${docker.namespace}/sdc-helm-validator:${it.helm-validator.version}</name>
                             <alias>helm-validator</alias>
                             <run>
                                 <skip>${it.helm-validator.disabled}</skip>