+<!--
+============LICENSE_START=======================================================
+SDC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ *
+ http://www.apache.org/licenses/LICENSE-2.0
+ *
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+Modifications copyright (c) 2018 Nokia
+================================================================================
+-->
<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.2.0-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdc</name>
<properties>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
-
- <!-- ==================== -->
- <!-- Generic properties -->
- <!-- ==================== -->
- <build.type>-SNAPSHOT</build.type>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sprint.number>74</sprint.number>
<!-- 3rd parties versions -->
+ <bean-matcher.version>0.11</bean-matcher.version>
+ <lang3.version>3.3.2</lang3.version>
<lang3.version>3.3.2</lang3.version>
<guava.version>18.0</guava.version>
<titan.version>1.0.0</titan.version>
<sdc.titan.version>1.2.0</sdc.titan.version>
- <spring-boot.version>1.1.6.RELEASE</spring-boot.version>
- <spring.version>4.3.13.RELEASE</spring.version>
+ <spring.version>4.3.18.RELEASE</spring.version>
<spring.security.version>3.2.3.RELEASE</spring.security.version>
<spring.ldap.version>2.0.1.RELEASE</spring.ldap.version>
- <jersey-bom.version>2.26</jersey-bom.version>
- <servlet-api.version>2.5</servlet-api.version>
- <wire-mock.version>2.11.0</wire-mock.version>
-
- <artifact-generator-api.version>${project.version}</artifact-generator-api.version>
- <artifact-generator-core.version>${project.version}</artifact-generator-core.version>
- <ecomp.version>1.1.0</ecomp.version>
- <dox-common-lib.version>${project.version}</dox-common-lib.version>
+ <jersey-bom.version>2.27</jersey-bom.version>
+ <servlet-api.version>3.1.0</servlet-api.version>
+ <wire-mock.version>2.18.0</wire-mock.version>
+ <ecomp.version>2.4.0</ecomp.version>
+ <cassandra.unit.version>3.5.0.1</cassandra.unit.version>
<!-- Elastic Search mapper (reference the elastic search version actually). -->
<elastic-search.version>2.4.0</elastic-search.version>
<catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
<catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
- <jetty.version>9.2.10.v20150310</jetty.version>
+ <jetty.version>9.4.11.v20180605</jetty.version>
<!-- JSON and YAML Parsing -->
- <jackson.version>2.9.4</jackson.version>
- <jackson.yaml.version>2.9.4</jackson.yaml.version>
- <jackson.annotations.version>2.9.4</jackson.annotations.version>
+ <jackson.version>2.8.10</jackson.version>
+ <jackson-annotations.version>2.8.0</jackson-annotations.version>
<!-- Yaml for properties -->
<snakeyaml.version>1.14</snakeyaml.version>
- <functionaljava.version>4.4</functionaljava.version>
- <httpclient.version>4.4.1</httpclient.version>
+ <functionaljava.version>4.7</functionaljava.version>
+ <httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.1</httpcore.version>
<json-simple.version>1.1</json-simple.version>
<!-- Logging start -->
<!-- logback -->
<logback.version>1.2.3</logback.version>
- <slf4j-api.version>1.7.10</slf4j-api.version>
+ <slf4j-api.version>1.7.25</slf4j-api.version>
<commons-codec>1.10</commons-codec>
<commons-logging>1.2</commons-logging>
- <groovy.version>2.4.13</groovy.version>
<janino.version>3.0.6</janino.version>
<!-- aspects -->
<jcabi.version>0.20.1</jcabi.version>
<aspectjrt.version>1.8.4</aspectjrt.version>
<aspectj.version>1.7.4</aspectj.version>
- <jcabi.plugin.version>0.13.2</jcabi.plugin.version>
+ <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
<!-- Logging end -->
<!-- System Metrics -->
<commons-jci-core.version>1.1</commons-jci-core.version>
<!--TESTING-->
- <mockito.version>2.12.0</mockito.version>
- <jmockit.version>1.33</jmockit.version>
+ <mockito.version>2.18.3</mockito.version>
+ <jmockit.version>1.33</jmockit.version>
<junit.version>4.12</junit.version>
- <assertj.version>3.8.0</assertj.version>
+ <assertj.version>3.10.0</assertj.version>
<testng.version>6.9.10</testng.version>
<extentreports.version>3.0.3</extentreports.version>
- <cucumber.version>2.3.1</cucumber.version>
+ <cucumber.version>2.4.0</cucumber.version>
+ <bean-matchers.version>0.11</bean-matchers.version>
<!-- parser-->
- <sdc-tosca-parser.version>1.2.3-SNAPSHOT</sdc-tosca-parser.version>
+ <sdc-tosca-parser.version>1.3.5</sdc-tosca-parser.version>
- <!--JaCoCO -->
- <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+ <!-- sonar -->
<sonar.language>java</sonar.language>
- <!-- Sonar properties -->
<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
<sonar.branch>${project.version}</sonar.branch>
<nexus.id.snapshot>nexus</nexus.id.snapshot>
<!--nexus-->
+ <npm.registry>https://registry.npmjs.org/</npm.registry>
+ <!-- https://nexus.onap.org/content/repositories/npm/ -->
<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>
<!--maven-->
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <!--io.fabric8-->
- <fabric8.version>0.23.0</fabric8.version>
<!--docker tags-->
<docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
- <!--<docker.latest.tag>${project.version}-latest</docker.latest.tag>-->
+
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
+
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
+ <artifactId>wiremock-standalone</artifactId>
<version>${wire-mock.version}</version>
</dependency>
<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>2.4.13</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.0.45.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.0.45.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.1</version>
<configuration>
<failOnError>false</failOnError>
<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
<artifactId>umlgraph</artifactId>
<version>5.6</version>
</docletArtifact>
- <additionalparam>-views</additionalparam>
<useStandardDocletOptions>true</useStandardDocletOptions>
</configuration>
</plugin>
<build>
<pluginManagement>
<plugins>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
- </dependency>
- </dependencies>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.1</version>
</plugin>
-
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.4.1.1168</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>ru.yaal.maven</groupId>
+ <artifactId>write-text-files-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.26.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.8</version>
+ </plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <version>1.0.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>${nexus.proxy}</nexusUrl>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
- <configuration>
- <systemPropertyVariables>
- <logback.configurationFile>src/test/resources/logback-test.xml</logback.configurationFile>
- </systemPropertyVariables>
- </configuration>
- </plugin>
<!-- plugin for parsing the project version -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>parse-version</id>
+ <phase>pre-clean</phase>
<goals>
<goal>parse-version</goal>
</goals>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.9</version>
<executions>
<execution>
<id>default-prepare-agent</id>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
+ <version>3.0.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<inherited>false</inherited>
<configuration>
<source>
pom.properties['deploy.url'] =
- pom.version.contains('-SNAPSHOT') ?
- project.distributionManagement.snapshotRepository.url :
- project.distributionManagement.repository.url;
+ pom.version.contains('-SNAPSHOT') ?
+ project.distributionManagement.snapshotRepository.url :
+ project.distributionManagement.repository.url;
pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
- project.distributionManagement.snapshotRepository.id :
- project.distributionManagement.repository.id;
+ project.distributionManagement.snapshotRepository.id :
+ project.distributionManagement.repository.id;
</source>
</configuration>
</execution>
</executions>
</plugin>
-
- <!-- license plugin -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.10</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
- <processStartTag>============LICENSE_START=======================================================</processStartTag>
- <processEndTag>============LICENSE_END=========================================================</processEndTag>
- <sectionDelimiter>================================================================================</sectionDelimiter>
- <licenseName>apache_v2</licenseName>
- <inceptionYear>2017</inceptionYear>
- <organizationName>AT&T Intellectual Property. All rights
- reserved.
- </organizationName>
- <projectName>SDC</projectName>
- <canUpdateCopyright>true</canUpdateCopyright>
- <canUpdateDescription>true</canUpdateDescription>
- <canUpdateLicense>true</canUpdateLicense>
- <emptyLineAfterHeader>true</emptyLineAfterHeader>
- <verbose>false</verbose>
- <includes>
- <include>**/*.java</include>
- <include>**/*.ts</include>
- </includes>
- <excludes>
- <exclude>**/*.d.ts</exclude>
- </excludes>
- <roots>
- <root>src</root>
- <root>app</root>
- <root>server-mock</root>
- <root>typings</root>
- </roots>
- <extraExtensions>
- <ts>java</ts>
- </extraExtensions>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <printSummary>false</printSummary>
</configuration>
- <executions>
- <execution>
- <id>first</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <!--phase>process-sources</phase -->
- </execution>
- </executions>
</plugin>
</plugins>
</build>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>build-tools</module>
+ <module>onboarding</module>
<module>security-utils</module>
<module>common-app-api</module>
- <module>onboarding</module>
- <module>services/activity-spec</module>
<module>common-be</module>
<module>catalog-dao</module>
<module>catalog-model</module>
<properties>
<ecomp.version>1.2.7</ecomp.version>
- <artifact-generator-api.version>1802.0.1.167</artifact-generator-api.version>
- <artifact-generator-core.version>1802.0.1.167</artifact-generator-core.version>
- <dox-common-lib.version>1802.0.1.167</dox-common-lib.version>
<sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
</properties>
</profile>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
- <module>build-tools</module>
<module>onboarding</module>
</modules>
</profile>
Code Review / sdc.git / blobdiff