X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=test-apis-ci%2Fpom.xml;h=78a1a3907129703f24ba178b0336261756036d38;hb=refs%2Fheads%2Fcasablanca;hp=999f112f879d4e5160957449cb00cf4b557da97e;hpb=d8a0deaf32e6a545a0359ad84c886b40c4ad625b;p=sdc.git

diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 999f112f87..78a1a39071 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.7-SNAPSHOT</version>
     </parent>
 	
 	<properties>
@@ -29,18 +29,12 @@
             <version>${junit.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!--<dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>-->
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
@@ -88,13 +82,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!--	<dependency>
-                <groupId>org.openecomp.sdc</groupId>
-                <artifactId>dmaap-publisher</artifactId>
-                <version>1.0.0</version>
-                <scope>provided</scope>
-            </dependency>-->
-
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>common-app-api</artifactId>
@@ -248,6 +235,14 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>groovy</artifactId>
+                    <groupId>org.codehaus.groovy</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -286,7 +281,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.ecompsdkos</groupId>
+            <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-fw</artifactId>
             <version>${ecomp.version}</version>
             <scope>compile</scope>
@@ -305,9 +300,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.sdc.sdc-tosca</groupId>
+            <groupId>org.onap.sdc.sdc-tosca</groupId>
             <artifactId>sdc-tosca</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.4.6</version>
             <scope>compile</scope>
         </dependency>
 
@@ -348,6 +343,12 @@
             <artifactId>mockserver-netty</artifactId>
             <version>3.10.4</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -379,54 +380,39 @@
             <version>${cassandra.driver.version}</version>
             <scope>compile</scope>
         </dependency>
-
         <!-- CASSANDRA END -->
-    </dependencies>
 
-    <build>
-        <plugins>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+        </dependency>
 
-            <!-- ============================================= -->
-            <!-- Get the next build number -->
-            <!-- ============================================= -->
-            <!--<plugin> -->
-            <!--<groupId>org.codehaus.mojo</groupId> -->
-            <!--<artifactId>properties-maven-plugin</artifactId> -->
-            <!--<version>1.0-alpha-1</version> -->
-            <!--<inherited>false</inherited> -->
-
-            <!--<executions> -->
-            <!--<execution> -->
-            <!--<id>tests</id> -->
-            <!--<phase>initialize</phase> -->
-            <!--<goals> -->
-            <!--<goal>read-project-properties</goal> -->
-            <!--</goals> -->
-
-            <!--<configuration> -->
-            <!--<files> -->
-            <!--<file>../target/FullReleaseVersion.properties</file> -->
-            <!--</files> -->
-            <!--</configuration> -->
-            <!--</execution> -->
-            <!--</executions> -->
-            <!--</plugin> -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+        </dependency>
 
+    </dependencies>
 
+    <build>
+        <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
-                        <id>clean.tosca.chef.os.folder</id>
+                        <id>clean.testsuit.folder</id>
                         <phase>clean</phase>
                         <goals>
                             <goal>clean</goal>
                         </goals>
                         <configuration>
                             <filesets>
-
                                 <!-- Sanity jar -->
                                 <fileset>
                                     <directory>${project.basedir}/sdc-api-tests</directory>
@@ -449,7 +435,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.7</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -481,6 +466,43 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.github.sylvainlaurent.maven</groupId>
+                <artifactId>yaml-json-validator-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                        <configuration>
+                            <validationSets>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.y*ml</include>
+                                        <include>src/test/resources/**/*.y*ml</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure*.y*ml</exclude>
+                                        <exclude>src/test/resources/CI/tests/importToscaResourceByCreateUrl/noContent*.y*ml</exclude>
+                                        <exclude>src/test/resources/CI/tests/HeatDeploymentArtifacts/invalid*.y*ml</exclude>
+                                    </excludes>
+                                </validationSet>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.json</include>
+                                        <include>src/test/resources/**/*.json</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>src/test/resources/CI/tests/HeatDeploymentArtifacts/invalid*.json</exclude>
+                                    </excludes>
+                                </validationSet>
+                            </validationSets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -492,8 +514,8 @@
         <build>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
                     <executions>
                         <execution>
                             <id>copy-tests-suites</id>
@@ -538,10 +560,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>${fabric8.version}</version>
-
                     <configuration>
-                        <verbose>true</verbose>
                         <apiVersion>1.23</apiVersion>
                         <registry>nexus3.onap.org:10001</registry>
                         <authConfig>