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 | |
| parent | f2eb0c84057d745b8cc7e77a027dcd47122a7a5b (diff) | |
Revert accidentally formatted POMs
Change-Id: I17ee875dcc2c63d6014c68345113df76cb2aa9b9
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3757
| -rw-r--r-- | catalog-be/pom.xml | 1208 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 618 | ||||
| -rw-r--r-- | onboarding/pom.xml | 322 | ||||
| -rw-r--r-- | openecomp-be/backend/openecomp-sdc-security-util/pom.xml | 44 | ||||
| -rw-r--r-- | pom.xml | 856 | ||||
| -rw-r--r-- | utils/webseal-simulator/pom.xml | 235 |
6 files changed, 1637 insertions, 1646 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 97cd8b6df0..befbad13b2 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -1,748 +1,452 @@ -<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/xsd/maven-4.0.0.xsd"> - <artifactId>catalog-be</artifactId> + <modelVersion>4.0.0</modelVersion> - <build> - <finalName>catalog-be</finalName> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <artifactId>lifecycle-mapping</artifactId> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <artifactId>download-maven-plugin</artifactId> - <goals> - <goal>wget</goal> - </goals> - <groupId>com.googlecode.maven-download-plugin</groupId> - <versionRange>[1.2.1,)</versionRange> - </pluginExecutionFilter> - </pluginExecution> + <artifactId>catalog-be</artifactId> + <packaging>war</packaging> - <pluginExecution> - <action> - <execute/> - </action> - <pluginExecutionFilter> - <artifactId>jcabi-maven-plugin</artifactId> - <goals> - <goal>ajc</goal> - </goals> - <groupId>com.jcabi</groupId> - <versionRange>[0.0,)</versionRange> - </pluginExecutionFilter> - </pluginExecution> + <parent> + <groupId>org.openecomp.sdc</groupId> + <artifactId>sdc-main</artifactId> + <version>1.10.0-SNAPSHOT</version> + </parent> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - <groupId>org.eclipse.m2e</groupId> - <version>1.0.0</version> - </plugin> - </plugins> - </pluginManagement> + <properties> + <java-hamcrest.version>2.0.0.0</java-hamcrest.version> + <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version> + <swagger-ui.version>3.25.0</swagger-ui.version> + <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version> + <replacer.plugin.version>1.5.3</replacer.plugin.version> + </properties> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1C</forkCount> - <reuseForks>false</reuseForks> - </configuration> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - <plugin> - <!-- Download Swagger UI webjar. --> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <configuration> - <artifactItems> - <artifactItem> - <artifactId>swagger-ui</artifactId> - <groupId>org.webjars</groupId> - <version>${swagger-ui.version}</version> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/swagger-ui</outputDirectory> - </configuration> - <goals> - <goal>unpack</goal> - </goals> - <phase>prepare-package</phase> - </execution> - </executions> - <version>${maven-dependency-plugin.version}</version> - </plugin> - <plugin> - <!-- Replace the OpenAPI specification example URL with the local one. --> - <artifactId>replacer</artifactId> - <configuration> - <file> - ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html - </file> - <replacements> - <replacement> - <token>https://petstore.swagger.io/v2/swagger.json</token> - <value>/sdc/openapi.json</value> - </replacement> - </replacements> - </configuration> - <executions> - <execution> - <goals> - <goal>replace</goal> - </goals> - <phase>prepare-package</phase> - </execution> - </executions> - <groupId>com.google.code.maven-replacer-plugin</groupId> - <version>${replacer.plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - </manifest> - <manifestEntries> - <SDC-Version>${project.version}</SDC-Version> - </manifestEntries> - </archive> - <attachClasses>true</attachClasses> - <packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar, - WEB-INF/classes/elasticsearch.yml, - WEB-INF/classes/portal.properties - </packagingExcludes> - <webResources combine.children="append"> - <resource> - <directory> - ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version} - </directory> - <includes> - <include>**/*.*</include> - </includes> - <targetPath>swagger-ui</targetPath> - </resource> - </webResources> - </configuration> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - <plugin> - <artifactId>yaml-json-validator-maven-plugin</artifactId> - <executions> - <execution> - <configuration> - <skip>${skipYamlJsonValidator}</skip> - <validationSets> - <validationSet> - <excludes> - <exclude> - src/test/resources/artifacts/pnfSoftwareInformation/** - </exclude> - </excludes> - <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> - <plugin> - <artifactId>jcabi-maven-plugin</artifactId> - <dependencies> - <dependency> - <artifactId>aspectjtools</artifactId> - <groupId>org.aspectj</groupId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <artifactId>aspectjweaver</artifactId> - <groupId>org.aspectj</groupId> - <version>${aspectj.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <goals> - <goal>ajc</goal> - </goals> - </execution> - </executions> - <groupId>com.jcabi</groupId> - <version>${jcabi.maven.plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/assembly/normatives.xml</descriptor> - </descriptors> - <finalName>normatives</finalName> - </configuration> - <goals> - <goal>single</goal> - </goals> - <id>normatives</id> - <phase>prepare-package</phase> - </execution> - </executions> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <configuration> - <filesets> - <fileset> - <directory> - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default - </directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>normatives.tar.gz</include> - </includes> - </fileset> - </filesets> - </configuration> - <goals> - <goal>clean</goal> - </goals> - <id>clean.sdc.backend.folder</id> - <phase>clean</phase> - </execution> - </executions> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - <plugin> - <artifactId>swagger-maven-plugin</artifactId> - <executions> - <execution> - <configuration> - <configurationFilePath> - ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml - </configurationFilePath> - <contextId>sdce-2-sdce-5</contextId> - <outputFileName>swagger-sdce-2-sdce-5</outputFileName> - <outputFormat>JSON</outputFormat> - <outputPath>${project.build.directory}/generated/swagger</outputPath> - <skip>${swagger.skip}</skip> - </configuration> - <goals> - <goal>resolve</goal> - </goals> - <id>sdce-2-sdce-5</id> - <phase>compile</phase> - </execution> - <execution> - <configuration> - <configurationFilePath> - ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml - </configurationFilePath> - <contextId>sdce-4</contextId> - <outputFileName>swagger-sdce-4</outputFileName> - <outputFormat>JSON</outputFormat> - <outputPath>${project.build.directory}/generated/swagger</outputPath> - <skip>${swagger.skip}</skip> - </configuration> - <goals> - <goal>resolve</goal> - </goals> - <id>sdce-4</id> - <phase>compile</phase> - </execution> - <execution> - <configuration> - <configurationFilePath> - ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml - </configurationFilePath> - <contextId>sdce-6</contextId> - <outputFileName>swagger-sdce-6</outputFileName> - <outputFormat>JSON</outputFormat> - <outputPath>${project.build.directory}/generated/swagger</outputPath> - <skip>${swagger.skip}</skip> - </configuration> - <goals> - <goal>resolve</goal> - </goals> - <id>sdce-6</id> - <phase>compile</phase> - </execution> - <execution> - <configuration> - <configurationFilePath> - ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml - </configurationFilePath> - <contextId>sdce-7</contextId> - <outputFileName>swagger-sdce-7</outputFileName> - <outputFormat>JSON</outputFormat> - <outputPath>${project.build.directory}/generated/swagger</outputPath> - <skip>${swagger.skip}</skip> - </configuration> - <goals> - <goal>resolve</goal> - </goals> - <id>sdce-7</id> - <phase>compile</phase> - </execution> - </executions> - <groupId>io.swagger.core.v3</groupId> - <version>${swagger-core-mvn-plugin.version}</version> - </plugin> - </plugins> - <!-- Swagger Plugins End --> - </build> <dependencies> <dependency> + <groupId>org.openecomp.sdc</groupId> <artifactId>togglz-rest-services</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>woodstox-core</artifactId> <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc</groupId> - <version>${project.version}</version> </dependency> <!--JSON and YAML Parsing--> <dependency> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <version>${jackson.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>com.fasterxml.jackson.core</groupId> - <version>${jackson.version}</version> </dependency> <dependency> - <artifactId>onap-generic-artifact-browser-service</artifactId> <groupId>org.onap.sdc.common</groupId> - <scope>compile</scope> + <artifactId>onap-generic-artifact-browser-service</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <!-- Swagger Dependencies Start --> <dependency> + <groupId>io.swagger.core.v3</groupId> <artifactId>swagger-jaxrs2</artifactId> + <version>${swagger.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>io.swagger.core.v3</groupId> - <version>${swagger.version}</version> </dependency> <dependency> - <artifactId>swagger-annotations</artifactId> <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-annotations</artifactId> <version>${swagger.version}</version> </dependency> <!-- Swagger Dependencies End --> <dependency> - <artifactId>hibernate-validator</artifactId> <groupId>org.hibernate.validator</groupId> + <artifactId>hibernate-validator</artifactId> <version>${hibernate.validator.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc</groupId> <artifactId>common-app-api</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc</groupId> - <version>${project.version}</version> </dependency> <dependency> - <artifactId>javax.ws.rs-api</artifactId> <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> <version>${ws.rs.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc.be</groupId> <artifactId>common-be</artifactId> + <version>${project.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc.be</groupId> - <scope>compile</scope> - <version>${project.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc.be</groupId> <artifactId>common-be</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> <exclusions> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc.be</groupId> - <scope>test</scope> - <type>test-jar</type> - <version>${project.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc.be</groupId> <artifactId>catalog-dao</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc.be</groupId> - <version>${project.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc.be</groupId> <artifactId>catalog-model</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc.be</groupId> - <version>${project.version}</version> </dependency> <dependency> - <artifactId>logback-classic</artifactId> <groupId>ch.qos.logback</groupId> - <scope>compile</scope> + <artifactId>logback-classic</artifactId> <version>${logback.version}</version> + <scope>compile</scope> </dependency> <!-- Snake Yaml --> <dependency> - <artifactId>snakeyaml</artifactId> <groupId>org.yaml</groupId> - <scope>compile</scope> + <artifactId>snakeyaml</artifactId> <version>${snakeyaml.version}</version> + <scope>compile</scope> </dependency> <!-- File changes listener --> <dependency> + <groupId>org.apache.commons</groupId> <artifactId>commons-jci-core</artifactId> + <version>${commons-jci-core.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>commons-io</artifactId> <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </exclusion> </exclusions> - <groupId>org.apache.commons</groupId> - <scope>compile</scope> - <version>${commons-jci-core.version}</version> </dependency> <!-- Gson --> <dependency> - <artifactId>gson</artifactId> <groupId>com.google.code.gson</groupId> - <scope>compile</scope> + <artifactId>gson</artifactId> <version>${gson.version}</version> + <scope>compile</scope> </dependency> <!-- jersey --> <dependency> + <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> + <version>${jersey-bom.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>org.glassfish.jersey.media</groupId> - <version>${jersey-bom.version}</version> </dependency> <dependency> - <artifactId>jersey-container-servlet-core</artifactId> <groupId>org.glassfish.jersey.containers</groupId> - <scope>compile</scope> + <artifactId>jersey-container-servlet-core</artifactId> <version>${jersey-bom.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jersey-media-multipart</artifactId> <groupId>org.glassfish.jersey.media</groupId> - <scope>compile</scope> + <artifactId>jersey-media-multipart</artifactId> <version>${jersey-bom.version}</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-spring4</artifactId> + <version>${jersey-bom.version}</version> <exclusions> <exclusion> - <artifactId>spring-web</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> </exclusion> <exclusion> - <artifactId>spring-beans</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> </exclusion> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> <exclusion> - <artifactId>spring-aop</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> </exclusion> <!-- Transitive dependency of spring-bridge --> <exclusion> - <artifactId>spring-context</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> </exclusion> <exclusion> - <artifactId>hibernate-validator</artifactId> <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> </exclusion> </exclusions> - <groupId>org.glassfish.jersey.ext</groupId> - <version>${jersey-bom.version}</version> </dependency> <!--asm-all-repackaged is a jersey dependency. in current version jersey depends on a version that was compiled using java 9 compiler currently our jetty (v9.3.6) does not support java 9. as soon as jetty gets upgraded we will remove this dependency--> <dependency> - <artifactId>asm-all-repackaged</artifactId> <groupId>org.glassfish.hk2.external</groupId> + <artifactId>asm-all-repackaged</artifactId> </dependency> <dependency> + <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-bean-validation</artifactId> <exclusions> <exclusion> - <artifactId>hibernate-validator</artifactId> <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> </exclusion> </exclusions> - <groupId>org.glassfish.jersey.ext</groupId> </dependency> <!-- http client --> <dependency> - <artifactId>httpclient</artifactId> <groupId>org.apache.httpcomponents</groupId> - <scope>compile</scope> + <artifactId>httpclient</artifactId> <version>${httpclient.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>httpcore</artifactId> <groupId>org.apache.httpcomponents</groupId> - <scope>compile</scope> + <artifactId>httpcore</artifactId> <version>${httpcore.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> - <scope>compile</scope> + <artifactId>commons-logging</artifactId> <version>${commons-logging}</version> + <scope>compile</scope> </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> <!-- http client END --> <dependency> - <artifactId>javax.servlet-api</artifactId> <groupId>javax.servlet</groupId> - <scope>provided</scope> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <dependency> - <artifactId>org.eclipse.jgit</artifactId> <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> <version>3.4.1.201406201815-r</version> </dependency> <!-- spring - used by A4C --> <dependency> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> - <scope>compile</scope> + <artifactId>spring-core</artifactId> <version>${spring.version}</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>spring-expression</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> </exclusion> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <scope>compile</scope> - <version>${spring.version}</version> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <scope>compile</scope> - <version>${spring.version}</version> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>spring-expression</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> </exclusion> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> <exclusion> - <artifactId>spring-web</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <scope>compile</scope> - <version>${spring.version}</version> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <scope>compile</scope> - <version>${spring.version}</version> </dependency> <dependency> - <artifactId>spring-beans</artifactId> <groupId>org.springframework</groupId> - <scope>compile</scope> + <artifactId>spring-beans</artifactId> <version>${spring.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>spring-expression</artifactId> <groupId>org.springframework</groupId> - <scope>compile</scope> + <artifactId>spring-expression</artifactId> <version>${spring.version}</version> + <scope>compile</scope> </dependency> <!-- Spring integration (optional) --> <dependency> - <artifactId>togglz-spring-web</artifactId> <groupId>org.togglz</groupId> + <artifactId>togglz-spring-web</artifactId> <version>${togglz.version}</version> </dependency> <dependency> - <artifactId>janino</artifactId> <groupId>org.codehaus.janino</groupId> - <scope>compile</scope> + <artifactId>janino</artifactId> <version>${janino.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>commons-compiler</artifactId> <groupId>org.codehaus.janino</groupId> - <scope>compile</scope> + <artifactId>commons-compiler</artifactId> <version>${janino.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>guava</artifactId> <groupId>com.google.guava</groupId> - <scope>compile</scope> + <artifactId>guava</artifactId> <version>${guava.version}</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.janusgraph</groupId> <artifactId>janusgraph-core</artifactId> + <version>${janusgraph.version}</version> + <scope>compile</scope> <exclusions> <exclusion> <artifactId>gremlin-groovy</artifactId> <groupId>org.apache.tinkerpop</groupId> </exclusion> <exclusion> - <artifactId>json</artifactId> <groupId>org.json</groupId> + <artifactId>json</artifactId> </exclusion> <exclusion> <artifactId>slf4j-log4j12</artifactId> @@ -753,37 +457,37 @@ <groupId>commons-collections</groupId> </exclusion> <exclusion> - <artifactId>libthrift</artifactId> <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> </exclusion> <exclusion> - <artifactId>commons-io</artifactId> <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </exclusion> <exclusion> - <artifactId>commons-codec</artifactId> <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> </exclusion> <exclusion> - <artifactId>dom4j</artifactId> <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> </exclusion> </exclusions> - <groupId>org.janusgraph</groupId> - <scope>compile</scope> - <version>${janusgraph.version}</version> </dependency> <dependency> + <groupId>org.janusgraph</groupId> <artifactId>janusgraph-cql</artifactId> + <version>${janusgraph.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <artifactId>json</artifactId> <groupId>org.json</groupId> + <artifactId>json</artifactId> </exclusion> <exclusion> <artifactId>commons-collections</artifactId> @@ -794,136 +498,136 @@ <groupId>org.codehaus.groovy</groupId> </exclusion> <exclusion> - <artifactId>netty-all</artifactId> <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> </exclusion> </exclusions> - <groupId>org.janusgraph</groupId> - <scope>compile</scope> - <version>${janusgraph.version}</version> </dependency> <dependency> - <artifactId>commons-lang3</artifactId> <groupId>org.apache.commons</groupId> - <scope>compile</scope> + <artifactId>commons-lang3</artifactId> <version>${lang3.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>json-simple</artifactId> <groupId>com.googlecode.json-simple</groupId> - <scope>compile</scope> + <artifactId>json-simple</artifactId> <version>${json-simple.version}</version> + <scope>compile</scope> </dependency> <!-- functional java --> <dependency> - <artifactId>functionaljava</artifactId> <groupId>org.functionaljava</groupId> - <scope>compile</scope> + <artifactId>functionaljava</artifactId> <version>${functionaljava.version}</version> + <scope>compile</scope> </dependency> <!-- Aspects --> <dependency> - <artifactId>jcabi-aspects</artifactId> <groupId>com.jcabi</groupId> - <scope>compile</scope> + <artifactId>jcabi-aspects</artifactId> <version>${jcabi.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>aspectjrt</artifactId> <groupId>org.aspectj</groupId> - <scope>compile</scope> + <artifactId>aspectjrt</artifactId> <version>${aspectjrt.version}</version> + <scope>compile</scope> </dependency> <!-- CAMBRIA CLIENT for U-EB --> <dependency> + <groupId>com.att.nsa</groupId> <artifactId>cambriaClient</artifactId> + <version>1.2.1-oss</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>saClientLibrary</artifactId> <groupId>com.att.nsa</groupId> + <artifactId>saClientLibrary</artifactId> </exclusion> </exclusions> - <groupId>com.att.nsa</groupId> - <scope>compile</scope> - <version>1.2.1-oss</version> </dependency> <dependency> - <artifactId>json</artifactId> <groupId>org.json</groupId> - <scope>compile</scope> + <artifactId>json</artifactId> <version>20131018</version> + <scope>compile</scope> </dependency> <!-- CASSANDRA --> <dependency> - <artifactId>cassandra-driver-core</artifactId> <groupId>com.datastax.cassandra</groupId> - <scope>compile</scope> + <artifactId>cassandra-driver-core</artifactId> <version>${cassandra.driver.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>cassandra-driver-mapping</artifactId> <groupId>com.datastax.cassandra</groupId> - <scope>compile</scope> + <artifactId>cassandra-driver-mapping</artifactId> <version>${cassandra.driver.version}</version> + <scope>compile</scope> </dependency> <!-- CASSANDRA END --> <!-- Inserted for ECOMP Portal Integration --> <dependency> + <groupId>org.owasp.esapi</groupId> <artifactId>esapi</artifactId> + <version>${org.owasp.esapi.version}</version> <exclusions> <exclusion> - <artifactId>xercesImpl</artifactId> <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> </exclusion> <exclusion> - <artifactId>log4j</artifactId> <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </exclusion> <exclusion> - <artifactId>commons-fileupload</artifactId> <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> </exclusion> <exclusion> - <artifactId>xmlgraphics-commons</artifactId> <groupId>org.apache.xmlgraphics</groupId> + <artifactId>xmlgraphics-commons</artifactId> </exclusion> <exclusion> - <artifactId>xml-apis-ext</artifactId> <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> </exclusion> <exclusion> - <artifactId>xml-apis</artifactId> <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> </exclusion> </exclusions> - <groupId>org.owasp.esapi</groupId> - <version>${org.owasp.esapi.version}</version> </dependency> <dependency> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> + <version>${ecomp.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>cambriaClient</artifactId> <groupId>com.att.nsa</groupId> + <artifactId>cambriaClient</artifactId> </exclusion> <exclusion> <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> </exclusion> <exclusion> - <artifactId>aaf-cadi-aaf</artifactId> <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> </exclusion> <exclusion> <artifactId>aaf-cadi-core</artifactId> @@ -938,71 +642,71 @@ <groupId>log4j</groupId> </exclusion> </exclusions> - <groupId>org.onap.portal.sdk</groupId> - <scope>compile</scope> - <version>${ecomp.version}</version> </dependency> <!--Jetty Proxy--> <dependency> - <artifactId>jetty-http</artifactId> <groupId>org.eclipse.jetty</groupId> - <scope>compile</scope> + <artifactId>jetty-http</artifactId> <version>${jetty.version}</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> <exclusion> - <artifactId>jetty-continuation</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> </exclusion> </exclusions> - <groupId>org.eclipse.jetty</groupId> - <scope>compile</scope> - <version>${jetty.version}</version> </dependency> <!-- System metrics --> <dependency> + <groupId>org.fusesource</groupId> <artifactId>sigar</artifactId> + <version>${sigar.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>log4j</artifactId> <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </exclusion> </exclusions> - <groupId>org.fusesource</groupId> - <scope>compile</scope> - <version>${sigar.version}</version> </dependency> <dependency> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> + <version>1.1.3</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>dme2</artifactId> <groupId>com.att.aft</groupId> + <artifactId>dme2</artifactId> </exclusion> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> <exclusion> <artifactId>log4j</artifactId> @@ -1013,280 +717,591 @@ <groupId>log4j</groupId> </exclusion> </exclusions> - <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> - <scope>compile</scope> - <version>1.1.3</version> </dependency> <dependency> + <groupId>com.att.aft</groupId> <artifactId>dme2</artifactId> + <version>3.1.200-oss</version> <exclusions> <exclusion> - <artifactId>jms</artifactId> <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> </exclusion> </exclusions> - <groupId>com.att.aft</groupId> - <version>3.1.200-oss</version> </dependency> <!-- CADI --> <dependency> + <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> + <version>${cadi.version}</version> <exclusions> <exclusion> - <artifactId>cassandra-driver-core</artifactId> <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-core</artifactId> </exclusion> <exclusion> - <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> <artifactId>log4j</artifactId> <groupId>log4j</groupId> </exclusion> </exclusions> - <groupId>org.onap.aaf.authz</groupId> - <version>${cadi.version}</version> </dependency> <!-- TEST --> <dependency> - <artifactId>assertj-core</artifactId> <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-bundle</artifactId> + <version>${jersey-bom.version}</version> + <type>pom</type> + <scope>test</scope> <exclusions> <exclusion> - <artifactId>jetty-server</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> </exclusion> <exclusion> - <artifactId>jetty-continuation</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> </exclusion> </exclusions> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <scope>test</scope> - <type>pom</type> - <version>${jersey-bom.version}</version> </dependency> <dependency> - <artifactId>jersey-client</artifactId> <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> <version>${jersey-bom.version}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> <exclusions> <exclusion> - <artifactId>jetty-servlet</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </exclusion> </exclusions> - <groupId>org.eclipse.jetty</groupId> - <scope>test</scope> - <version>${jetty.version}</version> </dependency> <dependency> - <artifactId>hamcrest</artifactId> <groupId>org.hamcrest</groupId> - <scope>test</scope> + <artifactId>hamcrest</artifactId> <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>hamcrest-library</artifactId> <groupId>org.hamcrest</groupId> - <scope>test</scope> + <artifactId>hamcrest-library</artifactId> <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>junit-jupiter-api</artifactId> <groupId>org.junit.jupiter</groupId> - <scope>test</scope> + <artifactId>junit-jupiter-api</artifactId> <version>${junitJupiter.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>junit-jupiter</artifactId> <groupId>org.junit.jupiter</groupId> - <scope>test</scope> + <artifactId>junit-jupiter</artifactId> <version>${junitJupiter.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>junit-platform-commons</artifactId> <groupId>org.junit.platform</groupId> - <scope>test</scope> + <artifactId>junit-platform-commons</artifactId> <version>${junit.platform.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>junit-platform-engine</artifactId> <groupId>org.junit.platform</groupId> - <scope>test</scope> + <artifactId>junit-platform-engine</artifactId> <version>${junit.platform.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>mockito-junit-jupiter</artifactId> <groupId>org.mockito</groupId> - <scope>test</scope> + <artifactId>mockito-junit-jupiter</artifactId> <version>${mockitoJupiter.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>spring-test</artifactId> <groupId>org.springframework</groupId> - <scope>test</scope> + <artifactId>spring-test</artifactId> <version>${spring.version}</version> + <scope>test</scope> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> + <version>${spring.version}</version> <exclusions> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <version>${spring.version}</version> </dependency> <dependency> - <artifactId>cucumber-java</artifactId> <groupId>io.cucumber</groupId> - <scope>test</scope> + <artifactId>cucumber-java</artifactId> <version>${cucumber.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>cucumber-junit</artifactId> <groupId>io.cucumber</groupId> - <scope>test</scope> + <artifactId>cucumber-junit</artifactId> <version>${cucumber.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>jmockit</artifactId> <groupId>org.jmockit</groupId> - <scope>test</scope> + <artifactId>jmockit</artifactId> <version>${jmockit.version}</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>bean-matchers</artifactId> <groupId>com.google.code.bean-matchers</groupId> - <scope>test</scope> + <artifactId>bean-matchers</artifactId> <version>0.11</version> + <scope>test</scope> </dependency> <dependency> - <artifactId>groovy</artifactId> <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> <version>${groovy.version}</version> </dependency> <dependency> - <artifactId>netty-handler</artifactId> <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> </dependency> <dependency> + <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>org.onap.sdc.common</groupId> - <version>${project.version}</version> </dependency> <dependency> - <artifactId>commons-collections4</artifactId> <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> <version>${commons.collections.version}</version> </dependency> <dependency> + <groupId>org.onap.sdc.sdc-be-common</groupId> <artifactId>security-util-lib</artifactId> + <version>${security.util.lib.version}</version> <exclusions> <exclusion> - <artifactId>spring-boot-starter-logging</artifactId> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-logging</artifactId> </exclusion> </exclusions> - <groupId>org.onap.sdc.sdc-be-common</groupId> - <version>${security.util.lib.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-tosca-lib</artifactId> + <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.openecomp.sdc.core</groupId> - <version>${project.version}</version> </dependency> <dependency> + <groupId>org.onap.vnfsdk.validation</groupId> <artifactId>validation-pmdictionary</artifactId> + <version>${onap.vnfsdk.validation.pmdictionary.version}</version> <exclusions> <exclusion> - <artifactId>log4j-slf4j-impl</artifactId> <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> </exclusion> </exclusions> - <groupId>org.onap.vnfsdk.validation</groupId> - <version>${onap.vnfsdk.validation.pmdictionary.version}</version> </dependency> <dependency> + <groupId>com.googlecode.jmapper-framework</groupId> <artifactId>jmapper-core</artifactId> + <version>${jMapper.version}</version> <exclusions> <exclusion> - <artifactId>xstream</artifactId> <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> </exclusion> </exclusions> - <groupId>com.googlecode.jmapper-framework</groupId> - <version>${jMapper.version}</version> </dependency> </dependencies> - <modelVersion>4.0.0</modelVersion> + <build> + <finalName>catalog-be</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1C</forkCount> + <reuseForks>false</reuseForks> + </configuration> + </plugin> + <plugin> + <!-- Download Swagger UI webjar. --> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + <executions> + <execution> + <phase>prepare-package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.webjars</groupId> + <artifactId>swagger-ui</artifactId> + <version>${swagger-ui.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/swagger-ui</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <!-- Replace the OpenAPI specification example URL with the local one. --> + <groupId>com.google.code.maven-replacer-plugin</groupId> + <artifactId>replacer</artifactId> + <version>${replacer.plugin.version}</version> + <executions> + <execution> + <phase>prepare-package</phase> + <goals> + <goal>replace</goal> + </goals> + </execution> + </executions> + <configuration> + <file> + ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}/index.html + </file> + <replacements> + <replacement> + <token>https://petstore.swagger.io/v2/swagger.json</token> + <value>/sdc/openapi.json</value> + </replacement> + </replacements> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar, + WEB-INF/classes/elasticsearch.yml, + WEB-INF/classes/portal.properties + </packagingExcludes> + <archive> + <manifestEntries> + <SDC-Version>${project.version}</SDC-Version> + </manifestEntries> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + </archive> + <attachClasses>true</attachClasses> + <webResources combine.children="append"> + <resource> + <directory> + ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version} + </directory> + <includes> + <include>**/*.*</include> + </includes> + <targetPath>swagger-ui</targetPath> + </resource> + </webResources> + </configuration> + </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/artifacts/pnfSoftwareInformation/** + </exclude> + </excludes> + </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> + <plugin> + <groupId>com.jcabi</groupId> + <artifactId>jcabi-maven-plugin</artifactId> + <version>${jcabi.maven.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjtools</artifactId> + <version>${aspectj.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>${aspectj.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <goals> + <goal>ajc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>normatives</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>normatives</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assembly/normatives.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean.sdc.backend.folder</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory> + sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + </directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>normatives.tar.gz</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-maven-plugin</artifactId> + <version>${swagger-core-mvn-plugin.version}</version> + <executions> + <execution> + <id>sdce-2-sdce-5</id> + <phase>compile</phase> + <goals> + <goal>resolve</goal> + </goals> + <configuration> + <contextId>sdce-2-sdce-5</contextId> + <outputPath>${project.build.directory}/generated/swagger</outputPath> + <outputFileName>swagger-sdce-2-sdce-5</outputFileName> + <outputFormat>JSON</outputFormat> + <configurationFilePath> + ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml + </configurationFilePath> + <skip>${swagger.skip}</skip> + </configuration> + </execution> + <execution> + <id>sdce-4</id> + <phase>compile</phase> + <goals> + <goal>resolve</goal> + </goals> + <configuration> + <contextId>sdce-4</contextId> + <outputPath>${project.build.directory}/generated/swagger</outputPath> + <outputFileName>swagger-sdce-4</outputFileName> + <outputFormat>JSON</outputFormat> + <configurationFilePath> + ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml + </configurationFilePath> + <skip>${swagger.skip}</skip> + </configuration> + </execution> + <execution> + <id>sdce-6</id> + <phase>compile</phase> + <goals> + <goal>resolve</goal> + </goals> + <configuration> + <contextId>sdce-6</contextId> + <outputPath>${project.build.directory}/generated/swagger</outputPath> + <outputFileName>swagger-sdce-6</outputFileName> + <outputFormat>JSON</outputFormat> + <configurationFilePath> + ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml + </configurationFilePath> + <skip>${swagger.skip}</skip> + </configuration> + </execution> + <execution> + <id>sdce-7</id> + <phase>compile</phase> + <goals> + <goal>resolve</goal> + </goals> + <configuration> + <contextId>sdce-7</contextId> + <outputPath>${project.build.directory}/generated/swagger</outputPath> + <outputFileName>swagger-sdce-7</outputFileName> + <outputFormat>JSON</outputFormat> + <configurationFilePath> + ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml + </configurationFilePath> + <skip>${swagger.skip}</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> - <packaging>war</packaging> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings + only. It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>com.googlecode.maven-download-plugin</groupId> + <artifactId>download-maven-plugin</artifactId> + <versionRange>[1.2.1,)</versionRange> + <goals> + <goal>wget</goal> + </goals> + </pluginExecutionFilter> + </pluginExecution> - <parent> - <artifactId>sdc-main</artifactId> - <groupId>org.openecomp.sdc</groupId> - <version>1.10.0-SNAPSHOT</version> - </parent> + <pluginExecution> + <pluginExecutionFilter> + <groupId>com.jcabi</groupId> + <artifactId>jcabi-maven-plugin</artifactId> + <versionRange>[0.0,)</versionRange> + <goals> + <goal>ajc</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute/> + </action> + </pluginExecution> + + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <!-- Swagger Plugins End --> + </build> <profiles> <profile> + <id>docker</id> <activation> <activeByDefault>false</activeByDefault> </activation> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> + <id>copy-normatives</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> <configuration> <outputDirectory> sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default @@ -1300,13 +1315,13 @@ </resource> </resources> </configuration> + </execution> + <execution> + <id>copy-sdc-be-py</id> + <phase>verify</phase> <goals> <goal>copy-resources</goal> </goals> - <id>copy-normatives</id> - <phase>package</phase> - </execution> - <execution> <configuration> <outputDirectory> sdc-backend-init/ @@ -1323,35 +1338,29 @@ </resource> </resources> </configuration> - <goals> - <goal>copy-resources</goal> - </goals> - <id>copy-sdc-be-py</id> - <phase>verify</phase> </execution> </executions> - <groupId>org.apache.maven.plugins</groupId> </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 backend image --> <image> + <name>onap/sdc-backend</name> <alias>sdc-backend</alias> <build> - <assembly> - <descriptor>backend/backend-files.xml</descriptor> - <name>onap-sdc-backend</name> - </assembly> <cleanup>try</cleanup> <dockerFileDir>backend</dockerFileDir> <tags> @@ -1363,11 +1372,15 @@ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp} </tag> </tags> + <assembly> + <descriptor>backend/backend-files.xml</descriptor> + <name>onap-sdc-backend</name> + </assembly> </build> - <name>onap/sdc-backend</name> </image> <!-- Build backend-init image --> <image> + <name>onap/sdc-backend-init</name> <alias>sdc-backend-init</alias> <build> <cleanup>try</cleanup> @@ -1383,57 +1396,44 @@ </tag> </tags> </build> - <name>onap/sdc-backend-init</name> </image> </images> - <registry>nexus3.onap.org:10001</registry> - <verbose>${verbose}</verbose> </configuration> <executions> <execution> - <configuration> - <image>onap/sdc-backend,onap/sdc-backend-init</image> - <removeAll>true</removeAll> - </configuration> + <id>clean-images</id> + <phase>pre-clean</phase> <goals> <goal>remove</goal> </goals> - <id>clean-images</id> - <phase>pre-clean</phase> + <configuration> + <removeAll>true</removeAll> + <image>onap/sdc-backend,onap/sdc-backend-init</image> + </configuration> </execution> <execution> + <id>generate-images</id> + <phase>install</phase> <goals> <goal>build</goal> </goals> - <id>generate-images</id> - <phase>install</phase> </execution> <execution> - <configuration> - <image>onap/sdc-backend,onap/sdc-backend-init</image> - </configuration> + <id>push-images</id> + <phase>deploy</phase> <goals> <goal>push</goal> </goals> - <id>push-images</id> - <phase>deploy</phase> + <configuration> + <image>onap/sdc-backend,onap/sdc-backend-init</image> + </configuration> </execution> </executions> - <groupId>io.fabric8</groupId> </plugin> </plugins> </build> - <id>docker</id> </profile> </profiles> - - <properties> - <java-hamcrest.version>2.0.0.0</java-hamcrest.version> - <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version> - <replacer.plugin.version>1.5.3</replacer.plugin.version> - <swagger-ui.version>3.25.0</swagger-ui.version> - <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version> - </properties> </project> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 170c39d426..85b93c5228 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -2,463 +2,311 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <artifactId>catalog-fe</artifactId> - <build> - - <finalName>${project.artifactId}-${project.version}</finalName> - - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <artifactId>lifecycle-mapping</artifactId> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - - <pluginExecution> - <action> - <execute/> - </action> - <pluginExecutionFilter> - <artifactId>jcabi-maven-plugin</artifactId> - <goals> - <goal>ajc</goal> - </goals> - <groupId>com.jcabi</groupId> - <versionRange>[0.0,)</versionRange> - </pluginExecutionFilter> - </pluginExecution> - - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - <groupId>org.eclipse.m2e</groupId> - <version>1.0.0</version> - </plugin> - - <!-- jacbi (log injection) --> - - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - - <webResources> - <resource> - <directory>src/main/resources</directory> - </resource> - </webResources> - </configuration> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - - <plugin> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <war>${project.build.directory}/${project.build.finalName}.war</war> - <webApp> - <contextPath>/</contextPath> - <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern> - </webApp> - </configuration> - <groupId>org.eclipse.jetty</groupId> - <version>${jetty.version}</version> - </plugin> - - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - - <plugin> - <artifactId>jcabi-maven-plugin</artifactId> - <dependencies> - <dependency> - <artifactId>aspectjtools</artifactId> - <groupId>org.aspectj</groupId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <artifactId>aspectjweaver</artifactId> - <groupId>org.aspectj</groupId> - <version>${aspectj.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <goals> - <goal>ajc</goal> - </goals> - </execution> - </executions> - <groupId>com.jcabi</groupId> - <version>${jcabi.maven.plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <configuration> - <filesets> - <!-- FE WAR's --> - <fileset> - <directory>${project.parent.basedir}/catalog-fe/sdc-frontend/ - </directory> - <followSymlinks>false</followSymlinks> - <includes> - <include>*.war</include> - </includes> - </fileset> - </filesets> - </configuration> - <goals> - <goal>clean</goal> - </goals> - <id>clean.catalog.fe.folder</id> - <phase>clean</phase> - </execution> - </executions> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - <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> + <packaging>war</packaging> - </plugins> + <parent> + <groupId>org.openecomp.sdc</groupId> + <artifactId>sdc-main</artifactId> + <version>1.10.0-SNAPSHOT</version> + </parent> - </build> <dependencies> <dependency> - <artifactId>lombok</artifactId> <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> <version>${lombok.version}</version> </dependency> <dependency> - <artifactId>functionaljava</artifactId> <groupId>org.functionaljava</groupId> - <scope>compile</scope> + <artifactId>functionaljava</artifactId> <version>${functionaljava.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>onap-configuration-management-api</artifactId> <groupId>org.onap.sdc.common</groupId> + <artifactId>onap-configuration-management-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <artifactId>common-app-api</artifactId> <groupId>org.openecomp.sdc</groupId> + <artifactId>common-app-api</artifactId> <version>${project.version}</version> </dependency> <!-- File changes listener --> <dependency> - <artifactId>logback-classic</artifactId> <groupId>ch.qos.logback</groupId> - <scope>compile</scope> + <artifactId>logback-classic</artifactId> <version>${logback.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>groovy</artifactId> <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> <scope>compile</scope> </dependency> <dependency> - <artifactId>janino</artifactId> <groupId>org.codehaus.janino</groupId> - <scope>compile</scope> + <artifactId>janino</artifactId> <version>${janino.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>snakeyaml</artifactId> <groupId>org.yaml</groupId> - <scope>compile</scope> + <artifactId>snakeyaml</artifactId> <version>${snakeyaml.version}</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> <artifactId>commons-jci-core</artifactId> + <version>${commons-jci-core.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>commons-io</artifactId> <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </exclusion> </exclusions> - <groupId>org.apache.commons</groupId> - <scope>compile</scope> - <version>${commons-jci-core.version}</version> </dependency> <dependency> - <artifactId>gson</artifactId> <groupId>com.google.code.gson</groupId> - <scope>compile</scope> + <artifactId>gson</artifactId> <version>${gson.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jersey-container-servlet</artifactId> <groupId>org.glassfish.jersey.containers</groupId> - <scope>compile</scope> + <artifactId>jersey-container-servlet</artifactId> <version>${jersey-bom.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jersey-media-multipart</artifactId> <groupId>org.glassfish.jersey.media</groupId> - <scope>compile</scope> + <artifactId>jersey-media-multipart</artifactId> <version>${jersey-bom.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jersey-media-moxy</artifactId> <groupId>org.glassfish.jersey.media</groupId> - <scope>compile</scope> + <artifactId>jersey-media-moxy</artifactId> <version>${jersey-bom.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jersey-media-json-jackson</artifactId> <groupId>org.glassfish.jersey.media</groupId> - <scope>compile</scope> + <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey-bom.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jersey-hk2</artifactId> <groupId>org.glassfish.jersey.inject</groupId> + <artifactId>jersey-hk2</artifactId> <version>${jersey-bom.version}</version> </dependency> <dependency> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> - <scope>compile</scope> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> + <scope>compile</scope> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>com.fasterxml.jackson.core</groupId> - <version>${jackson.version}</version> </dependency> <dependency> - <artifactId>jackson-annotations</artifactId> <groupId>com.fasterxml.jackson.core</groupId> - <scope>compile</scope> + <artifactId>jackson-annotations</artifactId> <version>${jackson-annotations.version}</version> + <scope>compile</scope> </dependency> <!-- http client --> <dependency> - <artifactId>httpclient</artifactId> <groupId>org.apache.httpcomponents</groupId> - <scope>compile</scope> + <artifactId>httpclient</artifactId> <version>${httpclient.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>httpcore</artifactId> <groupId>org.apache.httpcomponents</groupId> - <scope>compile</scope> + <artifactId>httpcore</artifactId> <version>${httpcore.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>httpmime</artifactId> <groupId>org.apache.httpcomponents</groupId> - <scope>compile</scope> + <artifactId>httpmime</artifactId> <version>${httpclient.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> - <scope>compile</scope> + <artifactId>commons-logging</artifactId> <version>${commons-logging}</version> + <scope>compile</scope> </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> <!-- http client END --> <dependency> - <artifactId>javax.servlet-api</artifactId> <groupId>javax.servlet</groupId> - <scope>provided</scope> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <!-- JSON and YAML Parsing --> <dependency> - <artifactId>jackson-dataformat-yaml</artifactId> <groupId>com.fasterxml.jackson.dataformat</groupId> - <scope>compile</scope> + <artifactId>jackson-dataformat-yaml</artifactId> <version>${jackson.version}</version> + <scope>compile</scope> </dependency> <!-- Jetty Proxy --> <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>guava</artifactId> <groupId>com.google.guava</groupId> - <scope>compile</scope> + <artifactId>guava</artifactId> <version>${guava.version}</version> + <scope>compile</scope> </dependency> <!-- Aspects --> <dependency> - <artifactId>jcabi-aspects</artifactId> <groupId>com.jcabi</groupId> - <scope>compile</scope> + <artifactId>jcabi-aspects</artifactId> <version>${jcabi.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>aspectjrt</artifactId> <groupId>org.aspectj</groupId> - <scope>compile</scope> + <artifactId>aspectjrt</artifactId> <version>${aspectjrt.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>commons-lang3</artifactId> <groupId>org.apache.commons</groupId> - <scope>compile</scope> + <artifactId>commons-lang3</artifactId> <version>${lang3.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>jaxb-api</artifactId> <groupId>javax.xml.bind</groupId> - <scope>compile</scope> + <artifactId>jaxb-api</artifactId> <version>${jaxb-api.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>hibernate-validator</artifactId> <groupId>org.hibernate.validator</groupId> + <artifactId>hibernate-validator</artifactId> <version>${hibernate.validator.version}</version> </dependency> <!-- Inserted for ECOMP Portal Integration --> <dependency> + <groupId>org.owasp.esapi</groupId> <artifactId>esapi</artifactId> + <version>${org.owasp.esapi.version}</version> <exclusions> <exclusion> - <artifactId>log4j</artifactId> <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </exclusion> <exclusion> - <artifactId>commons-io</artifactId> <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </exclusion> <exclusion> - <artifactId>commons-fileupload</artifactId> <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> </exclusion> <exclusion> - <artifactId>xmlgraphics-commons</artifactId> <groupId>org.apache.xmlgraphics</groupId> + <artifactId>xmlgraphics-commons</artifactId> </exclusion> <exclusion> - <artifactId>xml-apis-ext</artifactId> <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> </exclusion> <exclusion> - <artifactId>xml-apis</artifactId> <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> </exclusion> </exclusions> - <groupId>org.owasp.esapi</groupId> - <version>${org.owasp.esapi.version}</version> </dependency> <dependency> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> + <version>${ecomp.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>cambriaClient</artifactId> <groupId>com.att.nsa</groupId> + <artifactId>cambriaClient</artifactId> </exclusion> <exclusion> <artifactId>slf4j-log4j12</artifactId> @@ -469,178 +317,330 @@ <groupId>log4j</groupId> </exclusion> </exclusions> - <groupId>org.onap.portal.sdk</groupId> - <scope>compile</scope> - <version>${ecomp.version}</version> </dependency> <!-- System metrics --> <dependency> + <groupId>org.fusesource</groupId> <artifactId>sigar</artifactId> + <version>${sigar.version}</version> + <scope>compile</scope> <exclusions> <exclusion> - <artifactId>log4j</artifactId> <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </exclusion> </exclusions> - <groupId>org.fusesource</groupId> - <scope>compile</scope> - <version>${sigar.version}</version> </dependency> <!-- TEST --> <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-bundle</artifactId> + <version>${jersey-bom.version}</version> + <type>pom</type> + <scope>test</scope> <exclusions> <exclusion> - <artifactId>jetty-server</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> </exclusion> <exclusion> - <artifactId>jetty-continuation</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> </exclusion> </exclusions> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <scope>test</scope> - <type>pom</type> - <version>${jersey-bom.version}</version> </dependency> <dependency> - <artifactId>bean-matchers</artifactId> <groupId>com.google.code.bean-matchers</groupId> - <scope>test</scope> + <artifactId>bean-matchers</artifactId> <version>${bean-matchers.version}</version> + <scope>test</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> <exclusions> <exclusion> - <artifactId>jetty-server</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> </exclusion> <exclusion> - <artifactId>jetty-security</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> </exclusion> </exclusions> - <groupId>org.eclipse.jetty</groupId> - <scope>test</scope> - <version>${jetty.version}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> <exclusions> <exclusion> - <artifactId>jetty-servlet</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </exclusion> </exclusions> - <groupId>org.eclipse.jetty</groupId> - <scope>test</scope> - <version>${jetty.version}</version> </dependency> <dependency> - <artifactId>jetty-http</artifactId> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <artifactId>javax.ws.rs-api</artifactId> <groupId>javax.ws.rs</groupId> - <scope>compile</scope> + <artifactId>javax.ws.rs-api</artifactId> <version>${ws.rs.version}</version> + <scope>compile</scope> </dependency> <dependency> - <artifactId>validation-api</artifactId> <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> <version>${javax.validation.version}</version> </dependency> </dependencies> - <modelVersion>4.0.0</modelVersion> + <build> - <packaging>war</packaging> + <finalName>${project.artifactId}-${project.version}</finalName> - <parent> - <artifactId>sdc-main</artifactId> - <groupId>org.openecomp.sdc</groupId> - <version>1.10.0-SNAPSHOT</version> - </parent> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + + <webResources> + <resource> + <directory>src/main/resources</directory> + </resource> + </webResources> + </configuration> + </plugin> + + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty.version}</version> + <configuration> + <webApp> + <contextPath>/</contextPath> + <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern> + </webApp> + <war>${project.build.directory}/${project.build.finalName}.war</war> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <!-- jcabi (log injection) --> + <groupId>com.jcabi</groupId> + <artifactId>jcabi-maven-plugin</artifactId> + <version>${jcabi.maven.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjtools</artifactId> + <version>${aspectj.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>${aspectj.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <goals> + <goal>ajc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean.catalog.fe.folder</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <!-- FE WAR's --> + <fileset> + <directory>${project.parent.basedir}/catalog-fe/sdc-frontend/</directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>*.war</include> + </includes> + </fileset> + </filesets> + </configuration> + </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> + </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> + + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings + only. It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + + <pluginExecution> + <pluginExecutionFilter> + <groupId>com.jcabi</groupId> + <artifactId>jcabi-maven-plugin</artifactId> + <versionRange>[0.0,)</versionRange> + <goals> + <goal>ajc</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute/> + </action> + </pluginExecution> + + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> + <id>catalog</id> <activation> <activeByDefault>false</activeByDefault> </activation> + <build> <finalName>${project.artifactId}-${project.version}</finalName> </build> - - <id>catalog</id> </profile> <profile> + <id>docker</id> <activation> <activeByDefault>false</activeByDefault> </activation> + <properties> + <docker.username>docker</docker.username> + <docker.password>docker</docker.password> + </properties> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> + <id>copy-resources-fe</id> + <phase>verify</phase> + <goals> + <goal>copy-resources</goal> + </goals> <configuration> <outputDirectory>${basedir}/sdc-frontend</outputDirectory> <resources> <resource> - <directory>${project.parent.basedir}/catalog-fe/target - </directory> + <directory>${project.parent.basedir}/catalog-fe/target</directory> <includes> <include>catalog-fe-${project.version}.war</include> </includes> </resource> <resource> - <directory> - ${project.parent.basedir}/openecomp-ui/target - </directory> + <directory>${project.parent.basedir}/openecomp-ui/target</directory> <includes> - <include>onboarding-fe-${project.version}.war - </include> + <include>onboarding-fe-${project.version}.war</include> </includes> </resource> </resources> </configuration> - <goals> - <goal>copy-resources</goal> - </goals> - <id>copy-resources-fe</id> - <phase>verify</phase> </execution> </executions> - <groupId>org.apache.maven.plugins</groupId> </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}</password> <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build frontend image --> <image> + <name>onap/sdc-frontend</name> <alias>sdc-frontend</alias> <build> <cleanup>try</cleanup> - <dockerFileDir>${project.basedir}/sdc-frontend - </dockerFileDir> + <dockerFileDir>${project.basedir}/sdc-frontend</dockerFileDir> <tags> <tag>latest</tag> <tag> @@ -651,53 +651,45 @@ </tag> </tags> </build> - <name>onap/sdc-frontend</name> </image> </images> - <registry>nexus3.onap.org:10001</registry> - <verbose>${verbose}</verbose> </configuration> <executions> <execution> - <configuration> - <image>onap/sdc-frontend</image> - <removeAll>true</removeAll> - </configuration> + <id>clean-images</id> + <phase>pre-clean</phase> <goals> <goal>remove</goal> </goals> - <id>clean-images</id> - <phase>pre-clean</phase> + <configuration> + <removeAll>true</removeAll> + <image>onap/sdc-frontend</image> + </configuration> </execution> <execution> + <id>generate-images</id> + <phase>install</phase> <goals> <goal>build</goal> </goals> - <id>generate-images</id> - <phase>install</phase> </execution> <execution> - <configuration> - <image>onap/sdc-frontend</image> - </configuration> + <id>push-images</id> + <phase>deploy</phase> <goals> <goal>push</goal> </goals> - <id>push-images</id> - <phase>deploy</phase> + <configuration> + <image>onap/sdc-frontend</image> + </configuration> </execution> </executions> - <groupId>io.fabric8</groupId> </plugin> </plugins> </build> - <id>docker</id> - <properties> - <docker.password>docker</docker.password> - <docker.username>docker</docker.username> - </properties> </profile> </profiles> + </project> diff --git a/onboarding/pom.xml b/onboarding/pom.xml index b820980699..ab5b4a2110 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -14,332 +14,332 @@ ~ limitations under the License. --> -<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>sdc-onboarding</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.openecomp.sdc</groupId> + <artifactId>sdc-main</artifactId> + <version>1.10.0-SNAPSHOT</version> + </parent> + + <modules> + <module>../common</module> + <module>../openecomp-be</module> + <module>../openecomp-ui</module> + </modules> + + <properties> + + <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- Maven plugin versions --> + <mvn.assembly.version>2.1</mvn.assembly.version> + <mvn.clean.version>2.5</mvn.clean.version> + <mvn.resource.version>3.1.0</mvn.resource.version> + <mvn.deploy.version>2.4</mvn.deploy.version> + <mvn.install.version>2.4</mvn.install.version> + <mvn.jar.version>2.4</mvn.jar.version> + <mvn.war.version>2.1.1</mvn.war.version> + + <!-- Onboarding 3rd party versions --> + <aspectjrt.version>${aspectj.version}</aspectjrt.version> + <bsh.version>2.0b6</bsh.version> + <cglib.nodep.version>3.2.4</cglib.nodep.version> + <classmate.version>1.3.3</classmate.version> + <commons.codec.version>${commons-codec}</commons.codec.version> + <commons.digester.version>2.1</commons.digester.version> + <commons.lang3.version>${lang3.version}</commons.lang3.version> + <datastax.cassandra.version>3.8.0</datastax.cassandra.version> + <groovy.minimal.version>1.5.8</groovy.minimal.version> + <http.client.version>${httpclient.version}</http.client.version> + <http.core.version>4.4.1</http.core.version> + <httpasyncclient.version>4.1.2</httpasyncclient.version> + <com.sun.xml.version>2.3.3</com.sun.xml.version> + <javax.el.version>2.2.6</javax.el.version> + <javax.el-api.version>3.0.1-b06</javax.el-api.version> + <javax.inject.version>1</javax.inject.version> + <jackson.annotations.version>${jackson.version}</jackson.annotations.version> + <jackson.dataformat.version>${jackson.version}</jackson.dataformat.version> + <jcommander.version>1.58</jcommander.version> + <jersey.core.version>1.19.1</jersey.core.version> + <jersey.multipart.version>1.18.1</jersey.multipart.version> + <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version> + <slf4j.version>${slf4j-api.version}</slf4j.version> + <spring.framework.version>${spring.version}</spring.framework.version> + <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version> + <woodstox.version>4.4.1</woodstox.version> + <zusammen.version>1.0.2</zusammen.version> + <zusammen-state-store.version>1.0.2</zusammen-state-store.version> + <zusammen-collaboration-store.version>1.0.2</zusammen-collaboration-store.version> + <zusammen-index-store.version>1.0.0</zusammen-index-store.version> + <zusammen-common-utilities.version>1.0.3</zusammen-common-utilities.version> + <build.tools.version>${project.version}</build.tools.version> + <javax.servlet.version>${servlet-api.version}</javax.servlet.version> + </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>${mvn.jar.version}</version> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>${mvn.clean.version}</version> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <additionalClasspathElements> - <additionalClasspathElement>${project.basedir}/src/test/resources - </additionalClasspathElement> - </additionalClasspathElements> - <printSummary>false</printSummary> - <systemPropertyVariables> - <config.location>${project.basedir}/configuration</config.location> - <logback.configurationFile>src/test/resources/logback-test.xml - </logback.configurationFile> - </systemPropertyVariables> - </configuration> - <groupId>org.apache.maven.plugins</groupId> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>${mvn.install.version}</version> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>${mvn.resource.version}</version> - </plugin> - </plugins> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <excludes> - <exclude>**/*</exclude> - </excludes> - </testResource> - </testResources> - </build> <dependencyManagement> <dependencies> <dependency> - <artifactId>lombok</artifactId> <groupId>org.projectlombok</groupId> - <scope>provided</scope> + <artifactId>lombok</artifactId> <version>${lombok.version}</version> + <scope>provided</scope> </dependency> <dependency> - <artifactId>spring-expression</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> <version>${spring.framework.version}</version> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> + <version>${spring.framework.version}</version> <exclusions> <exclusion> - <artifactId>spring-expression</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> </exclusion> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <version>${spring.framework.version}</version> </dependency> <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> + <version>${spring.framework.version}</version> <exclusions> <exclusion> - <artifactId>spring-expression</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> </exclusion> <exclusion> - <artifactId>spring-core</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> </exclusion> <exclusion> - <artifactId>spring-web</artifactId> <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> </exclusion> </exclusions> - <groupId>org.springframework</groupId> - <version>${spring.framework.version}</version> </dependency> <dependency> - <artifactId>commons-text</artifactId> <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> <version>${apache-commons-text.version}</version> </dependency> <dependency> - <artifactId>jcommander</artifactId> <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> <version>${jcommander.version}</version> </dependency> <dependency> - <artifactId>httpasyncclient</artifactId> <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> <version>${httpasyncclient.version}</version> </dependency> <dependency> - <artifactId>jaxb-impl</artifactId> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> <version>${com.sun.xml.version}</version> </dependency> <dependency> - <artifactId>bsh</artifactId> <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> <version>${bsh.version}</version> </dependency> <dependency> - <artifactId>commons-digester</artifactId> <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> <version>${commons.digester.version}</version> </dependency> <dependency> - <artifactId>classmate</artifactId> <groupId>com.fasterxml</groupId> + <artifactId>classmate</artifactId> <version>${classmate.version}</version> </dependency> <dependency> - <artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> - <artifactId>groovy-all-minimal</artifactId> <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all-minimal</artifactId> <version>${groovy.minimal.version}</version> </dependency> <dependency> - <artifactId>janino</artifactId> <groupId>org.codehaus.janino</groupId> - <scope>provided</scope> + <artifactId>janino</artifactId> <version>${janino.version}</version> + <scope>provided</scope> </dependency> <dependency> - <artifactId>jackson-annotations</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <version>${jackson.annotations.version}</version> </dependency> <dependency> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> </dependency> <dependency> - <artifactId>aspectjrt</artifactId> <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> <version>${aspectjrt.version}</version> </dependency> <dependency> - <artifactId>javax.servlet-api</artifactId> <groupId>javax.servlet</groupId> - <scope>provided</scope> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <dependency> - <artifactId>commons-beanutils</artifactId> <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> <version>${commons-beanutils}</version> </dependency> <dependency> - <artifactId>annotations</artifactId> <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> <version>3.0.1u2</version> </dependency> <dependency> - <artifactId>cglib-nodep</artifactId> <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> <version>${cglib.nodep.version}</version> </dependency> <dependency> - <artifactId>logback-classic</artifactId> <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> <version>${logback.version}</version> </dependency> <dependency> - <artifactId>logback-core</artifactId> <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> <version>${logback.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>com.fasterxml.jackson.core</groupId> - <version>${jackson.version}</version> </dependency> <dependency> - <artifactId>jackson-dataformat-yaml</artifactId> <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> <version>${jackson.version}</version> </dependency> <dependency> - <artifactId>commons-codec</artifactId> <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> <version>${commons.codec.version}</version> </dependency> <dependency> - <artifactId>cassandra-driver-core</artifactId> <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-core</artifactId> <version>${datastax.cassandra.version}</version> </dependency> <dependency> - <artifactId>cassandra-driver-mapping</artifactId> <groupId>com.datastax.cassandra</groupId> + <artifactId>cassandra-driver-mapping</artifactId> <version>${datastax.cassandra.version}</version> </dependency> <dependency> - <artifactId>javax.ws.rs-api</artifactId> <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> <version>${ws.rs.version}</version> </dependency> <dependency> - <artifactId>gson</artifactId> <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> <version>${gson.version}</version> </dependency> <dependency> - <artifactId>commons-io</artifactId> <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> </dependency> <dependency> - <artifactId>commons-lang3</artifactId> <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> <version>${commons.lang3.version}</version> </dependency> <dependency> - <artifactId>swagger-annotations</artifactId> <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-annotations</artifactId> <version>${swagger.version}</version> </dependency> <dependency> - <artifactId>wiremock</artifactId> <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock</artifactId> <version>${wire-mock.version}</version> </dependency> </dependencies> </dependencyManagement> - <modelVersion>4.0.0</modelVersion> - - <modules> - <module>../common</module> - <module>../openecomp-be</module> - <module>../openecomp-ui</module> - </modules> - - <packaging>pom</packaging> - - <parent> - <artifactId>sdc-main</artifactId> - <groupId>org.openecomp.sdc</groupId> - <version>1.10.0-SNAPSHOT</version> - </parent> - - <properties> - - <aspectjrt.version>${aspectj.version}</aspectjrt.version> - <bsh.version>2.0b6</bsh.version> - - <!-- Maven plugin versions --> - <build.tools.version>${project.version}</build.tools.version> - <cglib.nodep.version>3.2.4</cglib.nodep.version> - <classmate.version>1.3.3</classmate.version> - <com.sun.xml.version>2.3.3</com.sun.xml.version> - <commons.codec.version>${commons-codec}</commons.codec.version> - <commons.digester.version>2.1</commons.digester.version> - <commons.lang3.version>${lang3.version}</commons.lang3.version> - - <!-- Onboarding 3rd party versions --> - <datastax.cassandra.version>3.8.0</datastax.cassandra.version> - <groovy.minimal.version>1.5.8</groovy.minimal.version> - <http.client.version>${httpclient.version}</http.client.version> - <http.core.version>4.4.1</http.core.version> - <httpasyncclient.version>4.1.2</httpasyncclient.version> - <jackson.annotations.version>${jackson.version}</jackson.annotations.version> - <jackson.dataformat.version>${jackson.version}</jackson.dataformat.version> - <javax.el-api.version>3.0.1-b06</javax.el-api.version> - <javax.el.version>2.2.6</javax.el.version> - <javax.inject.version>1</javax.inject.version> - <javax.servlet.version>${servlet-api.version}</javax.servlet.version> - <jcommander.version>1.58</jcommander.version> - <jersey.core.version>1.19.1</jersey.core.version> - <jersey.multipart.version>1.18.1</jersey.multipart.version> - <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> - <mvn.assembly.version>2.1</mvn.assembly.version> - <mvn.clean.version>2.5</mvn.clean.version> - <mvn.deploy.version>2.4</mvn.deploy.version> - <mvn.install.version>2.4</mvn.install.version> - <mvn.jar.version>2.4</mvn.jar.version> - <mvn.resource.version>3.1.0</mvn.resource.version> - <mvn.war.version>2.1.1</mvn.war.version> - <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <slf4j.version>${slf4j-api.version}</slf4j.version> - <spring.framework.version>${spring.version}</spring.framework.version> - <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version> - <woodstox.version>4.4.1</woodstox.version> - <zusammen-collaboration-store.version>1.0.2</zusammen-collaboration-store.version> - <zusammen-common-utilities.version>1.0.3</zusammen-common-utilities.version> - <zusammen-index-store.version>1.0.0</zusammen-index-store.version> - <zusammen-state-store.version>1.0.2</zusammen-state-store.version> - <zusammen.version>1.0.2</zusammen.version> - </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${mvn.jar.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${mvn.clean.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <printSummary>false</printSummary> + <additionalClasspathElements> + <additionalClasspathElement>${project.basedir}/src/test/resources + </additionalClasspathElement> + </additionalClasspathElements> + <systemPropertyVariables> + <logback.configurationFile>src/test/resources/logback-test.xml + </logback.configurationFile> + <config.location>${project.basedir}/configuration</config.location> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${mvn.install.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${mvn.resource.version}</version> + </plugin> + </plugins> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <excludes> + <exclude>**/*</exclude> + </excludes> + </testResource> + </testResources> + </build> </project> diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index 0ee74c03fe..39c663269e 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -1,71 +1,71 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>backend</artifactId> + <groupId>org.openecomp.sdc</groupId> + <version>1.10.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>openecomp-sdc-security-util</artifactId> + + <dependencies> <dependency> - <artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> <version>1.7.25</version> </dependency> <dependency> - <artifactId>commons-crypto</artifactId> <groupId>org.apache.commons</groupId> + <artifactId>commons-crypto</artifactId> <version>1.0.0</version> </dependency> <dependency> - <artifactId>commons-lang3</artifactId> <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> <version>${commons.lang3.version}</version> </dependency> <dependency> - <artifactId>functionaljava</artifactId> <groupId>org.functionaljava</groupId> + <artifactId>functionaljava</artifactId> <version>${functionaljava.version}</version> </dependency> <dependency> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> <exclusions> <exclusion> - <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </exclusion> </exclusions> - <groupId>com.fasterxml.jackson.core</groupId> - <version>${jackson.version}</version> </dependency> <dependency> - <artifactId>commons-codec</artifactId> <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> <version>${commons-codec}</version> </dependency> <dependency> - <artifactId>javax.servlet-api</artifactId> <groupId>javax.servlet</groupId> - <version>${servlet-api.version}</version> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet.version}</version> </dependency> </dependencies> - <modelVersion>4.0.0</modelVersion> - - - <parent> - <artifactId>backend</artifactId> - <groupId>org.openecomp.sdc</groupId> - <version>1.10.0-SNAPSHOT</version> - </parent> - </project> @@ -19,111 +19,405 @@ limitations under the License. Modifications copyright (c) 2018-2019 Nokia ================================================================================ --> -<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> + <version>1.10.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>sdc</name> + + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>3.2.0</version> + <relativePath/> + </parent> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + + <tosca.datatype.version>${project.version}</tosca.datatype.version> + <!-- 3rd parties versions --> + <bean-matcher.version>0.11</bean-matcher.version> + <lang3.version>3.10</lang3.version> + <guava.version>30.1-jre</guava.version> + <janusgraph.version>0.3.3</janusgraph.version> + <spring.version>5.3.9</spring.version> + <jersey-bom.version>2.34</jersey-bom.version> + <netty.version>4.1.68.Final</netty.version> + <servlet-api.version>4.0.1</servlet-api.version> + <wire-mock.version>2.26.3</wire-mock.version> + <ecomp.version>3.4.0</ecomp.version> + <cassandra.unit.version>4.3.1.0</cassandra.unit.version> + <cadi.version>2.1.8</cadi.version> + <lombok.version>1.18.20</lombok.version> + <commons-beanutils>1.9.4</commons-beanutils> + <commons.io.version>2.8.0</commons.io.version> + <commons-configuration>2.7</commons-configuration> + <apache-poi.version>4.1.0</apache-poi.version> + <onap.logging.version>1.6.1</onap.logging.version> + <apache-commons-text.version>1.9</apache-commons-text.version> + <jaxb-api.version>2.3.1</jaxb-api.version> + <io.vavr.version>0.10.3</io.vavr.version> + <groovy.version>3.0.7</groovy.version> + <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version> + <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version> + <hibernate.validator.version>6.1.6.Final</hibernate.validator.version> + + <commons.collections.version>4.1</commons.collections.version> + <ws.rs.version>2.1.1</ws.rs.version> + <javax.validation.version>2.0.1.Final</javax.validation.version> + <javax.servlet.version>${servlet-api.version}</javax.servlet.version> + + <jetty.version>9.4.41.v20210516</jetty.version> + <cxf.version>3.4.4</cxf.version> + + <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version> + <org.dom4j.version>2.1.3</org.dom4j.version> + + <!-- JSON and YAML Parsing --> + <jackson.version>2.12.4</jackson.version> + <jackson-annotations.version>${jackson.version}</jackson-annotations.version> + + <clearspring.version>2.1.1</clearspring.version> + <skipYamlJsonValidator>false</skipYamlJsonValidator> + + <!-- Yaml for properties --> + <snakeyaml.version>1.29</snakeyaml.version> + <functionaljava.version>4.9</functionaljava.version> + <httpclient.version>4.5.13</httpclient.version> + <httpcore.version>4.4.1</httpcore.version> + <json-simple.version>1.1</json-simple.version> + + <!-- PM Dictionary validation --> + <onap.vnfsdk.validation.pmdictionary.version>1.2.15 + </onap.vnfsdk.validation.pmdictionary.version> + + <!-- Logging start --> + <!-- logback --> + <logback.version>1.2.3</logback.version> + <slf4j-api.version>1.7.25</slf4j-api.version> + <commons-codec>1.15</commons-codec> + <commons-logging>1.2</commons-logging> + <janino.version>3.0.6</janino.version> + <log4j.version>2.13.1</log4j.version> + + <!-- aspects --> + <jcabi.version>0.20.1</jcabi.version> + <aspectj.version>1.9.7</aspectj.version> + <aspectjrt.version>${aspectj.version}</aspectjrt.version> + <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version> + + <!-- Logging end --> + <!-- System Metrics --> + <sigar.version>1.6.4</sigar.version> + + <regex.version>3.0.3</regex.version> + + <!--GSON--> + <gson.version>2.3.1</gson.version> + + <!--listen to file changes--> + <commons-jci-core.version>1.1</commons-jci-core.version> + + <!--TESTING--> + <mockito.version>3.7.7</mockito.version> + <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version> + <jmockit.version>1.35</jmockit.version> + <junit.platform.version>1.7.1</junit.platform.version> + <junitJupiter.version>5.7.2</junitJupiter.version> + <assertj.version>3.16.0</assertj.version> + <testng.version>7.4.0</testng.version> + <cucumber.version>6.8.1</cucumber.version> + <bean-matchers.version>0.11</bean-matchers.version> + <hamcrest.version>2.2</hamcrest.version> + <hamcrest-all.version>1.3</hamcrest-all.version> + <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> + <maven-jar-plugin.version>2.4</maven-jar-plugin.version> + <jMapper.version>1.6.0.1</jMapper.version> + + <!-- sonar --> + <sonar.projectVersion>${project.version}</sonar.projectVersion> + <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable> + <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports + </sonar.surefire.reportsPath> + <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info + </sonar.javascript.lcov.reportPaths> + <sonar.coverage.jacoco.xmlReportPaths> + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + </sonar.coverage.jacoco.xmlReportPaths> + <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding> + <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir> + <sonar.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions> + <!--cassandra --> + <cassandra.driver.version>3.8.0</cassandra.driver.version> + <!-- maven central (Nexus) --> + <nexus.id.release>nexus</nexus.id.release> + <nexus.id.snapshot>nexus</nexus.id.snapshot> + + <!--nexus--> + <npm.registry>https://nexus3.onap.org/repository/npm.public/npm/-/</npm.registry> + <nexus.proxy>https://nexus.onap.org</nexus.proxy> + <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath> + <staging.profile.id>176c31dfe190a</staging.profile.id> + <!--togglz version--> + <togglz.version>2.6.1.Final</togglz.version> + + <joda.time.version>2.9.9</joda.time.version> + + <!--sdc-security-utils--> + <security.util.lib.version>1.6.0</security.util.lib.version> + <!--jacoco--> + <jacoco.version>0.8.7</jacoco.version> + + <java.driver.core.version>4.5.1</java.driver.core.version> + + <!-- Surefire parameters --> + <surefire.forkCount>1C</surefire.forkCount> + <surefire.reuseForks>true</surefire.reuseForks> + <surefire.skip.tests>false</surefire.skip.tests> + + <docker.api.version>1.35</docker.api.version> + <bouncycastle.version>1.69</bouncycastle.version> + + <verbose>false</verbose> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-bean-validation</artifactId> + <version>${jersey-bom.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.hk2.external</groupId> + <artifactId>asm-all-repackaged</artifactId> + <version>2.4.0</version> + </dependency> + + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj.version}</version> + </dependency> + + <dependency> + <groupId>org.jmockit</groupId> + <artifactId>jmockit</artifactId> + <version>${jmockit.version}</version> + </dependency> + + <dependency> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock-standalone</artifactId> + <version>${wire-mock.version}</version> + </dependency> + + <dependency> + <groupId>io.cucumber</groupId> + <artifactId>cucumber-java</artifactId> + <version>${cucumber.version}</version> + </dependency> + + <dependency> + <groupId>io.cucumber</groupId> + <artifactId>cucumber-junit</artifactId> + <version>${cucumber.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${lang3.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>${groovy.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty.version}</version> + </dependency> + <dependency> + <groupId>io.swagger.core.v3</groupId> + <artifactId>swagger-maven-plugin</artifactId> + <version>${swagger-core-mvn-plugin.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <!-- must be on the classpath --> + <groupId>org.jacoco</groupId> + <artifactId>org.jacoco.agent</artifactId> + <classifier>runtime</classifier> + <version>${jacoco.version}</version> + <scope>test</scope> + </dependency> + <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junitJupiter.version}</version> + <scope>test</scope> + </dependency> + <!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API --> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junitJupiter.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>3.0.1</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </reporting> <build> <pluginManagement> <plugins> <plugin> - <artifactId>jacoco-maven-plugin</artifactId> <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> <version>${jacoco.version}</version> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <version>3.1.0</version> <configuration> <tarLongFileMode>posix</tarLongFileMode> </configuration> - <groupId>org.apache.maven.plugins</groupId> - <version>3.1.0</version> </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.6.0</version> </plugin> <plugin> - <artifactId>sonar-maven-plugin</artifactId> <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> <version>3.7.0.1746</version> </plugin> <plugin> - <artifactId>maven-clean-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> <version>3.1.0</version> </plugin> <plugin> - <artifactId>write-text-files-maven-plugin</artifactId> <groupId>ru.yaal.maven</groupId> + <artifactId>write-text-files-maven-plugin</artifactId> <version>1.1</version> </plugin> <plugin> - <artifactId>gmaven-plugin</artifactId> <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> <version>1.5</version> </plugin> <plugin> - <artifactId>build-helper-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> <version>3.2.0</version> </plugin> <plugin> - <artifactId>maven-deploy-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> <version>2.8.2</version> </plugin> <plugin> - <artifactId>maven-shade-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <version>3.1.1</version> </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> <version>3.2.0</version> </plugin> <plugin> - <artifactId>docker-maven-plugin</artifactId> <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> <version>0.31.0</version> </plugin> <plugin> - <artifactId>maven-war-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> <version>3.2.2</version> </plugin> <plugin> - <artifactId>frontend-maven-plugin</artifactId> <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> <version>1.12.0</version> </plugin> <plugin> - <artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> <version>${maven-surefire-plugin.version}</version> </plugin> <plugin> - <artifactId>maven-failsafe-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> <version>${maven-surefire-plugin.version}</version> </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> <version>3.8.1</version> </plugin> <plugin> - <artifactId>yaml-json-validator-maven-plugin</artifactId> <groupId>com.github.sylvainlaurent.maven</groupId> + <artifactId>yaml-json-validator-maven-plugin</artifactId> <version>1.0.2</version> </plugin> <plugin> - <artifactId>git-commit-id-plugin</artifactId> <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> <version>4.0.0</version> </plugin> </plugins> @@ -132,77 +426,83 @@ Modifications copyright (c) 2018-2019 Nokia <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> <configuration> - <skip>${checkstyle.skip}</skip> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> <suppressionsFileExpression>checkstyle.suppressions.file </suppressionsFileExpression> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + <skip>${checkstyle.skip}</skip> </configuration> - <version>2.17</version> </plugin> <!-- plugin for parsing the project version --> <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> + <id>parse-version</id> + <phase>pre-clean</phase> <goals> <goal>parse-version</goal> </goals> - <id>parse-version</id> - <phase>pre-clean</phase> </execution> </executions> - <groupId>org.codehaus.mojo</groupId> </plugin> <!-- Java Code Coverage --> <plugin> + <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> + <id>default-instrument</id> <goals> <goal>instrument</goal> </goals> - <id>default-instrument</id> </execution> <execution> + <id>default-restore-instrumented-classes</id> <goals> <goal>restore-instrumented-classes</goal> </goals> - <id>default-restore-instrumented-classes</id> </execution> <execution> - <configuration> - <dataFile>${project.build.directory}/jacoco.exec</dataFile> - </configuration> + <id>default-report</id> <goals> <goal>report</goal> </goals> - <id>default-report</id> + <configuration> + <dataFile>${project.build.directory}/jacoco.exec</dataFile> + </configuration> </execution> </executions> - <groupId>org.jacoco</groupId> - <inherited>false</inherited> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> + <version>3.7.1</version> <dependencies> <dependency> - <artifactId>wagon-webdav-jackrabbit</artifactId> <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> <version>3.0.0</version> </dependency> </dependencies> - <groupId>org.apache.maven.plugins</groupId> - <version>3.7.1</version> </plugin> <!-- Set the deployment repositories properties. --> <plugin> + <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> <executions> <execution> + <inherited>false</inherited> + <phase>integration-test</phase> + <goals> + <goal>execute</goal> + </goals> <configuration> <source> pom.properties['deploy.url'] = @@ -214,57 +514,57 @@ Modifications copyright (c) 2018-2019 Nokia project.distributionManagement.repository.id; </source> </configuration> - <goals> - <goal>execute</goal> - </goals> - <inherited>false</inherited> - <phase>integration-test</phase> </execution> </executions> - <groupId>org.codehaus.gmaven</groupId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <forceJavacCompilerUse>true</forceJavacCompilerUse> <source>11</source> <target>11</target> + <forceJavacCompilerUse>true</forceJavacCompilerUse> </configuration> - <groupId>org.apache.maven.plugins</groupId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit-platform</artifactId> + <version>${maven-surefire-plugin.version}</version> + </dependency> + </dependencies> <configuration> - <forkCount>${surefire.forkCount}</forkCount> - <parallel>methods</parallel> <printSummary>false</printSummary> - <reuseForks>${surefire.reuseForks}</reuseForks> - <skip>${surefire.skip.tests}</skip> <systemPropertyVariables> <jacoco-agent.destfile>${project.build.directory}/jacoco.exec </jacoco-agent.destfile> </systemPropertyVariables> + <forkCount>${surefire.forkCount}</forkCount> + <reuseForks>${surefire.reuseForks}</reuseForks> + <parallel>methods</parallel> + <skip>${surefire.skip.tests}</skip> </configuration> - <dependencies> - <dependency> - <artifactId>surefire-junit-platform</artifactId> - <groupId>org.apache.maven.surefire</groupId> - <version>${maven-surefire-plugin.version}</version> - </dependency> - </dependencies> - <groupId>org.apache.maven.plugins</groupId> </plugin> <plugin> + <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>revision</goal> + </goals> + </execution> + </executions> <configuration> - <failOnNoGitDirectory>true</failOnNoGitDirectory> <generateGitPropertiesFile>true</generateGitPropertiesFile> <generateGitPropertiesFilename> ${project.build.outputDirectory}/META-INF/git.properties </generateGitPropertiesFilename> - <gitDescribe> - <skip>true</skip> - </gitDescribe> + <failOnNoGitDirectory>true</failOnNoGitDirectory> + <verbose>false</verbose> <includeOnlyProperties> <includeOnlyProperty>git.build.version</includeOnlyProperty> <includeOnlyProperty>git.build.time</includeOnlyProperty> @@ -275,165 +575,24 @@ Modifications copyright (c) 2018-2019 Nokia <includeOnlyProperty>git.commit.message.short</includeOnlyProperty> <includeOnlyProperty>git.commit.message.full</includeOnlyProperty> </includeOnlyProperties> + <gitDescribe> + <skip>true</skip> + </gitDescribe> <useNativeGit>false</useNativeGit> - <verbose>false</verbose> </configuration> - <executions> - <execution> - <goals> - <goal>revision</goal> - </goals> - </execution> - </executions> - <groupId>pl.project13.maven</groupId> </plugin> </plugins> </build> - <dependencies> - <dependency> - <!-- must be on the classpath --> - <artifactId>org.jacoco.agent</artifactId> - <classifier>runtime</classifier> - <groupId>org.jacoco</groupId> - <scope>test</scope> - <version>${jacoco.version}</version> - </dependency> - <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API --> - <dependency> - <artifactId>junit-jupiter-engine</artifactId> - <groupId>org.junit.jupiter</groupId> - <scope>test</scope> - <version>${junitJupiter.version}</version> - </dependency> - <!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API --> - <dependency> - <artifactId>junit-vintage-engine</artifactId> - <groupId>org.junit.vintage</groupId> - <scope>test</scope> - <version>${junitJupiter.version}</version> - </dependency> - - <dependency> - <artifactId>mockito-core</artifactId> - <groupId>org.mockito</groupId> - <scope>test</scope> - <version>${mockito.version}</version> - </dependency> - </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - <version>${guava.version}</version> - </dependency> - - <dependency> - <artifactId>jersey-bean-validation</artifactId> - <groupId>org.glassfish.jersey.ext</groupId> - <version>${jersey-bom.version}</version> - </dependency> - - <dependency> - <artifactId>asm-all-repackaged</artifactId> - <groupId>org.glassfish.hk2.external</groupId> - <version>2.4.0</version> - </dependency> - - <dependency> - <artifactId>assertj-core</artifactId> - <groupId>org.assertj</groupId> - <version>${assertj.version}</version> - </dependency> - - <dependency> - <artifactId>jmockit</artifactId> - <groupId>org.jmockit</groupId> - <version>${jmockit.version}</version> - </dependency> - - <dependency> - <artifactId>wiremock-standalone</artifactId> - <groupId>com.github.tomakehurst</groupId> - <version>${wire-mock.version}</version> - </dependency> - - <dependency> - <artifactId>cucumber-java</artifactId> - <groupId>io.cucumber</groupId> - <version>${cucumber.version}</version> - </dependency> - - <dependency> - <artifactId>cucumber-junit</artifactId> - <groupId>io.cucumber</groupId> - <version>${cucumber.version}</version> - </dependency> - - <dependency> - <artifactId>commons-lang3</artifactId> - <groupId>org.apache.commons</groupId> - <version>${lang3.version}</version> - </dependency> - <dependency> - <artifactId>groovy</artifactId> - <groupId>org.codehaus.groovy</groupId> - <version>${groovy.version}</version> - </dependency> - <dependency> - <artifactId>netty-all</artifactId> - <groupId>io.netty</groupId> - <version>${netty.version}</version> - </dependency> - <dependency> - <artifactId>netty-handler</artifactId> - <groupId>io.netty</groupId> - <version>${netty.version}</version> - </dependency> - <dependency> - <artifactId>swagger-maven-plugin</artifactId> - <groupId>io.swagger.core.v3</groupId> - <version>${swagger-core-mvn-plugin.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <distributionManagement> - <repository> - <id>ecomp-releases</id> - <name>Release Repository</name> - <url>${nexus.proxy}/content/repositories/releases/</url> - </repository> - <site> - <id>ecomp-site</id> - <url>dav:${nexus.proxy}${sitePath}</url> - </site> - <snapshotRepository> - <id>ecomp-snapshots</id> - <name>Snapshot Repository</name> - <url>${nexus.proxy}/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> - <groupId>org.openecomp.sdc</groupId> - - <modelVersion>4.0.0</modelVersion> - - <name>sdc</name> - - <packaging>pom</packaging> - - <parent> - <artifactId>oparent</artifactId> - <groupId>org.onap.oparent</groupId> - <relativePath/> - <version>3.2.0</version> - </parent> <profiles> <profile> + <id>all</id> <activation> <activeByDefault>true</activeByDefault> </activation> - <id>all</id> + <properties> + <checkstyle.skip>true</checkstyle.skip> + </properties> <modules> <module>onboarding</module> <module>common-app-logging</module> @@ -450,12 +609,13 @@ Modifications copyright (c) 2018-2019 Nokia <module>utils/webseal-simulator</module> <module>integration-tests</module> </modules> - <properties> - <checkstyle.skip>true</checkstyle.skip> - </properties> </profile> <profile> <id>all-for-integration-tests-only</id> + <properties> + <checkstyle.skip>true</checkstyle.skip> + <surefire.skip.tests>true</surefire.skip.tests> + </properties> <modules> <module>onboarding</module> <module>common-app-logging</module> @@ -472,19 +632,18 @@ Modifications copyright (c) 2018-2019 Nokia <module>utils/webseal-simulator</module> <module>integration-tests</module> </modules> - <properties> - <checkstyle.skip>true</checkstyle.skip> - <surefire.skip.tests>true</surefire.skip.tests> - </properties> </profile> <profile> + <id>skip-integration-tests</id> <activation> <property> <name>skipITs</name> <value>true</value> </property> </activation> - <id>skip-integration-tests</id> + <properties> + <checkstyle.skip>true</checkstyle.skip> + </properties> <modules> <module>onboarding</module> <module>common-app-logging</module> @@ -500,18 +659,19 @@ Modifications copyright (c) 2018-2019 Nokia <module>sdc-os-chef</module> <module>utils/webseal-simulator</module> </modules> - <properties> - <checkstyle.skip>true</checkstyle.skip> - </properties> </profile> <profile> + <id>skip-tests</id> <activation> <property> <name>skipTests</name> <value>true</value> </property> </activation> - <id>skip-tests</id> + <properties> + <checkstyle.skip>true</checkstyle.skip> + <maven.test.skip>true</maven.test.skip> + </properties> <modules> <module>onboarding</module> <module>common-app-logging</module> @@ -527,16 +687,20 @@ Modifications copyright (c) 2018-2019 Nokia <module>sdc-os-chef</module> <module>utils/webseal-simulator</module> </modules> - <properties> - <checkstyle.skip>true</checkstyle.skip> - <maven.test.skip>true</maven.test.skip> - </properties> </profile> <profile> + <id>fast-build</id> <activation> <activeByDefault>false</activeByDefault> </activation> - <id>fast-build</id> + <properties> + <maven.test.skip>true</maven.test.skip> + <skipYamlJsonValidator>true</skipYamlJsonValidator> + <checkstyle.skip>true</checkstyle.skip> + <jacoco.skip>true</jacoco.skip> + <maven.antrun.skip>true</maven.antrun.skip> + <swagger.skip>true</swagger.skip> + </properties> <modules> <module>onboarding</module> <module>common-app-logging</module> @@ -552,237 +716,57 @@ Modifications copyright (c) 2018-2019 Nokia <module>sdc-os-chef</module> <module>utils/webseal-simulator</module> </modules> - <properties> - <checkstyle.skip>true</checkstyle.skip> - <jacoco.skip>true</jacoco.skip> - <maven.antrun.skip>true</maven.antrun.skip> - <maven.test.skip>true</maven.test.skip> - <skipYamlJsonValidator>true</skipYamlJsonValidator> - <swagger.skip>true</swagger.skip> - </properties> </profile> <profile> + <id>start-sdc</id> <activation> <activeByDefault>false</activeByDefault> </activation> - <id>start-sdc</id> - <modules> - <module>integration-tests</module> - </modules> <properties> - <checkstyle.skip>true</checkstyle.skip> - <docker.keepRunning>true</docker.keepRunning> - <jacoco.skip>true</jacoco.skip> <maven.test.skip>true</maven.test.skip> <skipYamlJsonValidator>true</skipYamlJsonValidator> + <checkstyle.skip>true</checkstyle.skip> + <jacoco.skip>true</jacoco.skip> + <docker.keepRunning>true</docker.keepRunning> </properties> + <modules> + <module>integration-tests</module> + </modules> </profile> <profile> + <id>stop-sdc</id> <activation> <activeByDefault>false</activeByDefault> </activation> - <id>stop-sdc</id> - <modules> - <module>integration-tests</module> - </modules> <properties> + <maven.test.skip>true</maven.test.skip> + <skipYamlJsonValidator>true</skipYamlJsonValidator> <checkstyle.skip>true</checkstyle.skip> - <docker.skip.run>true</docker.skip.run> <jacoco.skip>true</jacoco.skip> - <maven.test.skip>true</maven.test.skip> - <skipYamlJsonValidator>true</skipYamlJsonValidator> + <docker.skip.run>true</docker.skip.run> </properties> + <modules> + <module>integration-tests</module> + </modules> </profile> <profile> + <id>run-integration-tests</id> <activation> <activeByDefault>false</activeByDefault> </activation> - <id>run-integration-tests</id> - <modules> - <module>integration-tests</module> - </modules> <properties> + <skipYamlJsonValidator>true</skipYamlJsonValidator> <checkstyle.skip>true</checkstyle.skip> <docker.skip>true</docker.skip> - <skipYamlJsonValidator>true</skipYamlJsonValidator> </properties> + <modules> + <module>integration-tests</module> + </modules> </profile> - </profiles> - <properties> - <apache-commons-text.version>1.9</apache-commons-text.version> - <apache-poi.version>4.1.0</apache-poi.version> - - <aspectj.version>1.9.7</aspectj.version> - <!-- 3rd parties versions --> - <aspectjrt.version>${aspectj.version}</aspectjrt.version> - <assertj.version>3.16.0</assertj.version> - <bean-matcher.version>0.11</bean-matcher.version> - <bean-matchers.version>0.11</bean-matchers.version> - <bouncycastle.version>1.69</bouncycastle.version> - <cadi.version>2.1.8</cadi.version> - <cassandra.driver.version>3.8.0</cassandra.driver.version> - <cassandra.unit.version>4.3.1.0</cassandra.unit.version> - <clearspring.version>2.1.1</clearspring.version> - <commons-beanutils>1.9.4</commons-beanutils> - <commons-codec>1.15</commons-codec> - <commons-configuration>2.7</commons-configuration> - <commons-jci-core.version>1.1</commons-jci-core.version> - <commons-logging>1.2</commons-logging> - <commons.collections.version>4.1</commons.collections.version> - <commons.io.version>2.8.0</commons.io.version> - <cucumber.version>6.8.1</cucumber.version> - <cxf.version>3.4.4</cxf.version> - <docker.api.version>1.35</docker.api.version> - <ecomp.version>3.4.0</ecomp.version> - <functionaljava.version>4.9</functionaljava.version> - <groovy.version>3.0.7</groovy.version> - <gson.version>2.3.1</gson.version> - <guava.version>30.1-jre</guava.version> - <hamcrest-all.version>1.3</hamcrest-all.version> - - <hamcrest.version>2.2</hamcrest.version> - <hibernate.validator.version>6.1.6.Final</hibernate.validator.version> - <httpclient.version>4.5.13</httpclient.version> - <httpcore.version>4.4.1</httpcore.version> - - <io.vavr.version>0.10.3</io.vavr.version> - <jMapper.version>1.6.0.1</jMapper.version> - - <jackson-annotations.version>${jackson.version}</jackson-annotations.version> - <jackson.version>2.12.4</jackson.version> - - <!-- JSON and YAML Parsing --> - <jacoco.version>0.8.7</jacoco.version> - <janino.version>3.0.6</janino.version> - - <janusgraph.version>0.3.3</janusgraph.version> - <java.driver.core.version>4.5.1</java.driver.core.version> - - <!-- Yaml for properties --> - <javax.servlet.version>4.0.1</javax.servlet.version> - <javax.validation.version>2.0.1.Final</javax.validation.version> - <jaxb-api.version>2.3.1</jaxb-api.version> - <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version> - <jcabi.version>0.20.1</jcabi.version> - - <!-- PM Dictionary validation --> - <jersey-bom.version>2.34</jersey-bom.version> - - <!-- Logging start --> - <!-- logback --> - <jetty.version>9.4.41.v20210516</jetty.version> - <jmockit.version>1.35</jmockit.version> - <joda.time.version>2.9.9</joda.time.version> - <json-simple.version>1.1</json-simple.version> - <junit.platform.version>1.7.1</junit.platform.version> - <junitJupiter.version>5.7.2</junitJupiter.version> - - <!-- aspects --> - <lang3.version>3.10</lang3.version> - <log4j.version>2.13.1</log4j.version> - <logback.version>1.2.3</logback.version> - <lombok.version>1.18.20</lombok.version> - - <!-- Logging end --> - <!-- System Metrics --> - <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version> - - <maven-jar-plugin.version>2.4</maven-jar-plugin.version> - - <!--GSON--> - <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> - - <!--listen to file changes--> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - - <!--TESTING--> - <mockito.version>3.7.7</mockito.version> - <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version> - <netty.version>4.1.66.Final</netty.version> - <nexus.id.release>nexus</nexus.id.release> - <nexus.id.snapshot>nexus</nexus.id.snapshot> - <nexus.proxy>https://nexus.onap.org</nexus.proxy> - <npm.registry>https://nexus3.onap.org/repository/npm.public/npm/-/</npm.registry> - <onap.logging.version>1.6.1</onap.logging.version> - <onap.vnfsdk.validation.pmdictionary.version>1.2.15 - </onap.vnfsdk.validation.pmdictionary.version> - <org.dom4j.version>2.1.3</org.dom4j.version> - <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <regex.version>3.0.3</regex.version> - <security.util.lib.version>1.6.0</security.util.lib.version> - - <!-- sonar --> - <servlet-api.version>4.0.1</servlet-api.version> - <sigar.version>1.6.4</sigar.version> - <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath> - <skipYamlJsonValidator>false</skipYamlJsonValidator> - <slf4j-api.version>1.7.25</slf4j-api.version> - <snakeyaml.version>1.29</snakeyaml.version> - <sonar.coverage.exclusions>pom.xml,src/test</sonar.coverage.exclusions> - <sonar.coverage.jacoco.xmlReportPaths> - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> - <!--cassandra --> - <sonar.javascript.lcov.reportPaths>${project.build.directory}/code-coverage/lcov.info - </sonar.javascript.lcov.reportPaths> - <!-- maven central (Nexus) --> - <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable> - <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir> - - <!--nexus--> - <sonar.projectVersion>${project.version}</sonar.projectVersion> - <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding> - <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports - </sonar.surefire.reportsPath> - <spring.version>5.3.9</spring.version> - <!--togglz version--> - <staging.profile.id>176c31dfe190a</staging.profile.id> - - <surefire.forkCount>1C</surefire.forkCount> - - <!--sdc-security-utils--> - <surefire.reuseForks>true</surefire.reuseForks> - <!--jacoco--> - <surefire.skip.tests>false</surefire.skip.tests> - - <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version> - - <!-- Surefire parameters --> - <testng.version>7.4.0</testng.version> - <togglz.version>2.6.1.Final</togglz.version> - <tosca.datatype.version>${project.version}</tosca.datatype.version> - - <verbose>false</verbose> - <wire-mock.version>2.26.3</wire-mock.version> - - <ws.rs.version>2.1.1</ws.rs.version> - </properties> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <artifactId>umlgraph</artifactId> - <groupId>org.umlgraph</groupId> - <version>5.6</version> - </docletArtifact> - <failOnError>false</failOnError> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - <groupId>org.apache.maven.plugins</groupId> - <version>3.0.1</version> - </plugin> - </plugins> - </reporting> - <repositories> <!-- LF repositories --> <repository> @@ -803,5 +787,21 @@ Modifications copyright (c) 2018-2019 Nokia <!-- LF repositories END--> </repositories> - <version>1.10.0-SNAPSHOT</version> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/releases/</url> + </repository> + <site> + <id>ecomp-site</id> + <url>dav:${nexus.proxy}${sitePath}</url> + </site> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>Snapshot Repository</name> + <url>${nexus.proxy}/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> + </project> 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> |