Disable SecurityFilter

[sdc.git] / ui-ci / pom.xml

diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index b167cc1..1582946 100644 (file)
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -9,7 +9,7 @@
        <parent>
                <groupId>org.openecomp.sdc</groupId>
                <artifactId>sdc-main</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.6.2-SNAPSHOT</version>
        </parent>
 
        <properties>
@@ -23,22 +23,36 @@
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
-                       <!-- <version>21.0</version> -->
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.seleniumhq.selenium</groupId>
                        <artifactId>selenium-java</artifactId>
+
                        <version>2.53.1</version>
-                       <!-- <version>3.4.0</version> -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.eclipse.jetty</groupId>
+                                       <artifactId>jetty-util</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>io.netty</groupId>
+                                       <artifactId>netty</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.eclipse.jetty</groupId>
+                       <artifactId>jetty-util</artifactId>
+                       <version>${jetty.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.seleniumhq.selenium</groupId>
                        <artifactId>selenium-server</artifactId>
                        <version>2.53.1</version>
-                       <!-- <version>3.4.0</version> -->
                        <scope>runtime</scope>
                </dependency>
 
@@ -134,27 +148,6 @@
                        <scope>compile</scope>
                </dependency>
 
-               <!-- TITAN -->
-               <dependency>
-                       <groupId>com.thinkaurelius.titan</groupId>
-                       <artifactId>titan-core</artifactId>
-                       <version>${titan.version}</version>
-                       <scope>compile</scope>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>commons-collections</artifactId>
-                                       <groupId>commons-collections</groupId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.sdc.sdc-titan-cassandra</groupId>
-                       <artifactId>sdc-titan-cassandra</artifactId>
-                       <version>${sdc.titan.version}</version>
-                       <scope>compile</scope>
-               </dependency>
-
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
                        <artifactId>jackson-mapper-asl</artifactId>
@@ -176,6 +169,20 @@
                        <scope>compile</scope>
                </dependency>
 
+               <dependency>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest</artifactId>
+                       <version>${hamcrest.version}</version>
+                       <scope>compile</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest-library</artifactId>
+                       <version>${hamcrest.version}</version>
+                       <scope>compile</scope>
+               </dependency>
+
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
@@ -294,6 +301,11 @@
                                                                        <directory>${project.basedir}/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/testSuites</directory>
                                                                        <followSymlinks>false</followSymlinks>
                                                                </fileset>
+                                                               <!-- Package files -->
+                                                               <fileset>
+                                                                       <directory>${project.basedir}/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/Files</directory>
+                                                                       <followSymlinks>false</followSymlinks>
+                                                               </fileset>
                                                        </filesets>
                                                </configuration>
                                        </execution>
@@ -398,12 +410,14 @@
                                                                        <goal>copy-resources</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <outputDirectory>sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/Files/VNFs</outputDirectory>
+                                                                       <outputDirectory>sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/Files</outputDirectory>
                                                                        <resources>
                                                                                <resource>
-                                                                                       <directory>${project.parent.basedir}/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/VNFs</directory>
+                                                                                       <directory>${project.parent.basedir}/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files</directory>
+                                                                                       <filtering>false</filtering>
                                                                                        <includes>
-                                                                                               <include>*</include>
+                                                                                               <include>VNFs/*</include>
+                                                                                               <include>PNFs/*</include>
                                                                                        </includes>
                                                                                </resource>
                                                                        </resources>