Disable SecurityFilter

[sdc.git] / utils / webseal-simulator / pom.xml

diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 4aa6fa4..9dbefa3 100644 (file)
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -9,12 +9,11 @@
        <parent>
                <groupId>org.openecomp.sdc</groupId>
                <artifactId>sdc-main</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.6.2-SNAPSHOT</version>
                <relativePath>../../</relativePath>
        </parent>
 
        <properties>
-               <jetty-version>9.2.10.v20150310</jetty-version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <nexus.proxy>https://nexus.onap.org</nexus.proxy>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,12 +37,18 @@
                        <scope>compile</scope>
                </dependency>
 
+               <!--<dependency>-->
+                       <!--<groupId>commons-httpclient</groupId>-->
+                       <!--<artifactId>commons-httpclient</artifactId>-->
+                       <!--<version>3.1</version>-->
+               <!--</dependency>-->
                <dependency>
-                       <groupId>commons-httpclient</groupId>
-                       <artifactId>commons-httpclient</artifactId>
-                       <version>3.1</version>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
+                       <version>4.5.3</version>
                </dependency>
 
+
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging-api</artifactId>
@@ -66,14 +71,14 @@
                <dependency>
                        <groupId>org.eclipse.jetty</groupId>
                        <artifactId>jetty-proxy</artifactId>
-                       <version>9.2.10.v20150310</version>
+                       <version>${jetty.version}</version>
                        <scope>compile</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.eclipse.jetty</groupId>
                        <artifactId>jetty-servlets</artifactId>
-            <version>${jetty-version}</version>
+            <version>${jetty.version}</version>
                        <scope>compile</scope>
                </dependency>
 
@@ -85,25 +90,48 @@
                        <scope>compile</scope>
                </dependency>
 
+               <dependency>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+                       <version>1.2.17</version>
+                       <scope>compile</scope>
+               </dependency>
+
+
        </dependencies>
        <build>
                <finalName>WSSimulator-${project.version}</finalName>
-               <plugins>
-                       <!-- ================================================== -->
-                       <!-- Set the JDK compiler version. -->
-                       <!-- ================================================== -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>2.5.1</version>
-                               <inherited>true</inherited>
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
-
-               </plugins>
+                       <plugins>
+                               <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>
+                                                                       </validationSet>
+                                                                       <validationSet>
+                                                                               <includes>
+                                                                                       <include>src/main/resources/**/*.json</include>
+                                                                                       <include>src/test/resources/**/*.json</include>
+                                                                               </includes>
+                                                                       </validationSet>
+                                                               </validationSets>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </plugin>
+                       </plugins>
        </build>
        
        <repositories>
@@ -154,11 +182,6 @@
                                                                                        </includes>
                                                                                        <followSymlinks>false</followSymlinks>
                                                                                </fileset>
-                                                                               <fileset>
-                                                                                       <directory>${project.basedir}/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default</directory>
-                                                                                       <includes>logback.xml</includes>
-                                                                                       <followSymlinks>false</followSymlinks>
-                                                                               </fileset>
                                                                        </filesets>
                                                                </configuration>
                                                        </execution>
@@ -167,7 +190,6 @@
                                        
                                        <plugin>
                                                <artifactId>maven-resources-plugin</artifactId>
-                                               <version>3.0.2</version>
                                                <executions>
                                                        <execution>
                                                                <id>copy-resources-simulator</id>
@@ -187,24 +209,6 @@
                                                                        </resources>
                                                                </configuration>
                                                        </execution>
-                                                       <execution>
-                                                               <id>copy-configurations-simulator</id>
-                                                               <phase>verify</phase>
-                                                               <goals>
-                                                                       <goal>copy-resources</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <outputDirectory>${basedir}/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default</outputDirectory>
-                                                                       <resources>
-                                                                               <resource>
-                                                                                       <directory>${basedir}/src/main/resources</directory>
-                                                                                       <includes>
-                                                                                               <include>logback.xml</include>
-                                                                                       </includes>
-                                                                               </resource>
-                                                                       </resources>
-                                                               </configuration>
-                                                       </execution>
                                                </executions>
                                        </plugin>
 
@@ -213,10 +217,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>
@@ -235,7 +236,6 @@
                                                                                <dockerFileDir>${basedir}${file.separator}sdc-simulator</dockerFileDir>
                                                                                <tags>
                                                                                        <tag>${docker.tag}</tag>
-                                                                                       <tag>${docker.latest.tag}</tag>
                                                                                        <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
                                                                                </tags>
                                                                        </build>