diff options
author | vasraz <vasyl.razinkov@est.tech> | 2021-11-26 15:57:50 +0000 |
---|---|---|
committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2021-11-26 16:00:36 +0000 |
commit | e9171113772c0c7dc3f7514ffd0660d1e0f8ef02 (patch) | |
tree | 54fee46d19cb93a69bb1f1d7a858c1205e29dcb3 /utils/webseal-simulator | |
parent | f2eb0c84057d745b8cc7e77a027dcd47122a7a5b (diff) |
Revert accidentally formatted POMs
Change-Id: I17ee875dcc2c63d6014c68345113df76cb2aa9b9
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3757
Diffstat (limited to 'utils/webseal-simulator')
-rw-r--r-- | utils/webseal-simulator/pom.xml | 235 |
1 files changed, 117 insertions, 118 deletions
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 180ac3cff1..e9801c9402 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -1,137 +1,164 @@ -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> - <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> + <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> + <dependencies> <dependency> - <artifactId>javax.servlet-api</artifactId> <groupId>javax.servlet</groupId> - <scope>compile</scope> - <version>${servlet-api.version}</version> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet.version}</version> </dependency> <dependency> - <artifactId>httpclient</artifactId> <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> <version>${httpclient.version}</version> </dependency> <dependency> - <artifactId>commons-logging-api</artifactId> <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> <version>1.0.4</version> </dependency> <dependency> - <artifactId>commons-io</artifactId> <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> </dependency> <dependency> - <artifactId>commons-codec</artifactId> <groupId>commons-codec</groupId> - <scope>compile</scope> + <artifactId>commons-codec</artifactId> <version>${commons-codec}</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-proxy</artifactId> + <version>${jetty.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>jetty-http</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> </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> - <artifactId>jetty-http</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> </exclusion> </exclusions> - <groupId>org.eclipse.jetty</groupId> - <scope>compile</scope> - <version>${jetty.version}</version> </dependency> <!-- Proxy servlet --> <dependency> - <artifactId>config</artifactId> <groupId>com.typesafe</groupId> - <scope>compile</scope> + <artifactId>config</artifactId> <version>1.0.2</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-logging-api</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>powermock-module-junit4</artifactId> <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc</groupId> - <version>${project.version}</version> </dependency> </dependencies> - <modelVersion>4.0.0</modelVersion> - - <packaging>war</packaging> + <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> - <parent> - <artifactId>sdc-main</artifactId> - <groupId>org.openecomp.sdc</groupId> - <relativePath>../../</relativePath> - <version>1.10.0-SNAPSHOT</version> - </parent> + <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> <profiles> <profile> + <id>docker</id> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -140,33 +167,38 @@ <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> @@ -179,29 +211,28 @@ </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> - <password>docker</password> <username>docker</username> + <password>docker</password> </pull> </authConfig> <images> <!-- Build simulator image --> <image> + <name>onap/sdc-simulator</name> <alias>sdc-simulator</alias> <build> <cleanup>try</cleanup> @@ -217,67 +248,35 @@ </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> |