aboutsummaryrefslogtreecommitdiffstats
path: root/utils/webseal-simulator/pom.xml
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-11-15 12:27:54 +0000
committerMichael Morris <michael.morris@est.tech>2021-11-22 09:46:54 +0000
commitf0d4dd5c846f1c56d8b2641934c028b8151b31b3 (patch)
tree720f5e350dd5a6eba6f14eacfc73a7a209f668ab /utils/webseal-simulator/pom.xml
parent86671624c83f8d6af7523d1527858e9f93b35f11 (diff)
Fix test cases failing incorrectly
https://gerrit.onap.org/r/c/sdc/+/124980 Change-Id: I9fbd8a0b5b83d04928feea7624e593b45441ac9b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3757
Diffstat (limited to 'utils/webseal-simulator/pom.xml')
-rw-r--r--utils/webseal-simulator/pom.xml235
1 files changed, 118 insertions, 117 deletions
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index e9801c9402..180ac3cff1 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -1,164 +1,137 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
<artifactId>webseal-simulator</artifactId>
- <packaging>war</packaging>
-
- <parent>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>sdc-main</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
-
- <properties>
- <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>
- <sonar.skip>true</sonar.skip>
- </properties>
-
+ <build>
+ <finalName>WSSimulator-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <skip>${skipYamlJsonValidator}</skip>
+ <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>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <id>validate</id>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
+ <groupId>javax.servlet</groupId>
+ <scope>compile</scope>
+ <version>${servlet-api.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
+ <groupId>commons-logging</groupId>
<version>1.0.4</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec}</version>
+ <groupId>commons-codec</groupId>
<scope>compile</scope>
+ <version>${commons-codec}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
</exclusion>
</exclusions>
+ <groupId>org.eclipse.jetty</groupId>
+ <scope>compile</scope>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
</exclusion>
</exclusions>
+ <groupId>org.eclipse.jetty</groupId>
+ <scope>compile</scope>
+ <version>${jetty.version}</version>
</dependency>
<!-- Proxy servlet -->
<dependency>
- <groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
- <version>1.0.2</version>
+ <groupId>com.typesafe</groupId>
<scope>compile</scope>
+ <version>1.0.2</version>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-api</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
+ <groupId>org.powermock</groupId>
</exclusion>
</exclusions>
+ <groupId>org.openecomp.sdc</groupId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <finalName>WSSimulator-${project.version}</finalName>
- <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>
- <skip>${skipYamlJsonValidator}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
- <repositories>
- <!-- LF repositories -->
- <repository>
- <id>ecomp-releases</id>
- <name>Release Repository</name>
- <url>${nexus.proxy}/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>ecomp-snapshots</id>
- <name>Snapshots Repository</name>
- <url>${nexus.proxy}/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>ecomp-public</id>
- <name>Public Repository</name>
- <url>${nexus.proxy}/content/repositories/public/</url>
- </repository>
- <!-- LF repositories END-->
- </repositories>
+ <packaging>war</packaging>
+
+ <parent>
+ <artifactId>sdc-main</artifactId>
+ <groupId>org.openecomp.sdc</groupId>
+ <relativePath>../../</relativePath>
+ <version>1.10.0-SNAPSHOT</version>
+ </parent>
<profiles>
<profile>
- <id>docker</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
@@ -167,38 +140,33 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
- <id>clean-static-files</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/sdc-simulator</directory>
+ <followSymlinks>false</followSymlinks>
<includes>
<include>*.war</include>
</includes>
- <followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <id>clean-static-files</id>
+ <phase>clean</phase>
</execution>
</executions>
+ <version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-resources-simulator</id>
- <phase>verify</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
<configuration>
<outputDirectory>${project.basedir}/sdc-simulator
</outputDirectory>
@@ -211,28 +179,29 @@
</resource>
</resources>
</configuration>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <id>copy-resources-simulator</id>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
- <verbose>${verbose}</verbose>
<apiVersion>${docker.api.version}</apiVersion>
- <registry>nexus3.onap.org:10001</registry>
<authConfig>
<pull>
- <username>docker</username>
<password>docker</password>
+ <username>docker</username>
</pull>
</authConfig>
<images>
<!-- Build simulator image -->
<image>
- <name>onap/sdc-simulator</name>
<alias>sdc-simulator</alias>
<build>
<cleanup>try</cleanup>
@@ -248,35 +217,67 @@
</tag>
</tags>
</build>
+ <name>onap/sdc-simulator</name>
</image>
</images>
+ <registry>nexus3.onap.org:10001</registry>
+ <verbose>${verbose}</verbose>
</configuration>
<executions>
<execution>
- <id>clean-images</id>
- <phase>pre-clean</phase>
<goals>
<goal>remove</goal>
</goals>
+ <id>clean-images</id>
+ <phase>pre-clean</phase>
</execution>
<execution>
- <id>generate-images</id>
- <phase>install</phase>
<goals>
<goal>build</goal>
</goals>
+ <id>generate-images</id>
+ <phase>install</phase>
</execution>
<execution>
- <id>push-images</id>
- <phase>deploy</phase>
<goals>
<goal>push</goal>
</goals>
+ <id>push-images</id>
+ <phase>deploy</phase>
</execution>
</executions>
+ <groupId>io.fabric8</groupId>
</plugin>
</plugins>
</build>
+ <id>docker</id>
</profile>
</profiles>
+
+ <properties>
+ <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>
+ <sonar.skip>true</sonar.skip>
+ </properties>
+
+ <repositories>
+ <!-- LF repositories -->
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Release Repository</name>
+ <url>${nexus.proxy}/content/repositories/releases/</url>
+ </repository>
+ <repository>
+ <id>ecomp-snapshots</id>
+ <name>Snapshots Repository</name>
+ <url>${nexus.proxy}/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>ecomp-public</id>
+ <name>Public Repository</name>
+ <url>${nexus.proxy}/content/repositories/public/</url>
+ </repository>
+ <!-- LF repositories END-->
+ </repositories>
</project>