<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-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 -->
<!-- ==================== -->
<guava.version>18.0</guava.version>
<titan.version>1.0.0</titan.version>
<spring-boot.version>1.1.6.RELEASE</spring-boot.version>
- <spring.version>4.3.4.RELEASE</spring.version>
+ <spring.version>4.3.13.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.24</jersey-bom.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>1.1.0-SNAPSHOT</artifact-generator-api.version>
- <artifact-generator-core.version>1.1.0-SNAPSHOT</artifact-generator-core.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>1.1.0-SNAPSHOT</dox-common-lib.version>
+ <dox-common-lib.version>${project.version}</dox-common-lib.version>
<!-- Elastic Search mapper (reference the elastic search version actually). -->
- <elastic-search.version>2.1.0</elastic-search.version>
+ <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>
<!-- JSON and YAML Parsing -->
- <jackson.version>2.6.2</jackson.version>
+ <jackson.version>2.8.4</jackson.version>
<jackson.yaml.version>2.8.1</jackson.yaml.version>
- <jackson.annotations.version>2.6.0</jackson.annotations.version>
+ <jackson.annotations.version>2.8.4</jackson.annotations.version>
<!-- Yaml for properties -->
<snakeyaml.version>1.14</snakeyaml.version>
<regex.version>3.0.3</regex.version>
- <codehaus.jackson.core>1.9.2</codehaus.jackson.core>
-
<!--GSON-->
<gson.version>2.3.1</gson.version>
<commons-jci-core.version>1.1</commons-jci-core.version>
<!--TESTING-->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>2.12.0</mockito.version>
<junit.version>4.12</junit.version>
+ <assertj.version>3.8.0</assertj.version>
<testng.version>6.9.10</testng.version>
<extentreports.version>3.0.3</extentreports.version>
-
+ <cucumber.version>2.3.1</cucumber.version>
+
<!-- parser-->
- <sdc-tosca-parser.version>1.1.14-SNAPSHOT</sdc-tosca-parser.version>
-
+ <sdc-tosca-parser.version>1.2.3-SNAPSHOT</sdc-tosca-parser.version>
+
<!--JaCoCO -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
- <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.basedir}/target/it-jacoco.exec</sonar.jacoco.itReportPath>
+ <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.itReportPath>${project.basedir}/../target/it-jacoco.exec</sonar.jacoco.itReportPath>
<sonar.language>java</sonar.language>
- <sonar.version>${project.version}</sonar.version>
+ <!-- Sonar properties -->
+ <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+ <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+ <sonar.branch>${project.version}</sonar.branch>
<!--cassandra -->
<cassandra.driver.version>3.0.0</cassandra.driver.version>
<!-- maven central (Nexus) -->
<nexus.id.release>nexus</nexus.id.release>
<nexus.id.snapshot>nexus</nexus.id.snapshot>
- <!-- Sonar properties -->
- <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
- <sonar.skipDesign>true</sonar.skipDesign>
- <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
- <sonar.sources>.</sonar.sources>
- <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
- <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
- <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
<!--nexus-->
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
<staging.profile.id>176c31dfe190a</staging.profile.id>
<!--maven-->
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</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>
+ <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.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.tomakehurst</groupId>
+ <artifactId>wiremock</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>
+ </dependencies>
+ </dependencyManagement>
+
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.0.0-M1</version>
<configuration>
<failOnError>false</failOnError>
<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
</pluginManagement>
<plugins>
+
+ <!-- Staging Plugin -->
+ <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>
+ <stagingProfileId>${staging.profile.id}</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
</executions>
</plugin>
- <!-- Set the JDK compiler version. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
-
<!-- Java Code Coverage -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.1.201405082137</version>
- <inherited>True</inherited>
+ <version>0.7.9</version>
+ <configuration>
+ <append>true</append>
+ <destFile>${sonar.jacoco.reportPath}</destFile>
+ <dataFile>${sonar.jacoco.reportPath}</dataFile>
+ </configuration>
<executions>
- <!-- Unit-Tests -->
<execution>
- <id>prepare-agent</id>
+ <id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
</execution>
<execution>
- <id>report</id>
+ <id>default-report</id>
<goals>
<goal>report</goal>
</goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
- </configuration>
- </execution>
-
- <!-- Integration Tests (Only report goal) -->
- <execution>
- <id>report-integration</id>
- <goals>
- <goal>report-integration</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.itReportPath}</dataFile>
- <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
- </configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>2.10</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<!-- Set the deployment repositories properties. -->
<plugin>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>build-tools</module>
<module>onboarding</module>
<module>security-utils</module>
<module>common-app-api</module>
<module>asdctool</module>
<module>catalog-ui</module>
<module>catalog-fe</module>
- <module>asdc-tests</module>
<module>test-apis-ci</module>
<module>ui-ci</module>
<module>sdc-os-chef</module>
<module>asdctool</module>
<module>catalog-ui</module>
<module>catalog-fe</module>
- <module>asdc-tests</module>
<module>test-apis-ci</module>
<module>ui-ci</module>
</modules>
<properties>
<ecomp.version>1.2.7</ecomp.version>
- <artifact-generator-api.version>1710.0.0-SNAPSHOT</artifact-generator-api.version>
- <artifact-generator-core.version>1710.0.0-SNAPSHOT</artifact-generator-core.version>
- <dox-common-lib.version>1710.0.0-SNAPSHOT</dox-common-lib.version>
- <sdc-tosca-parser.version>1.1.14</sdc-tosca-parser.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>
-
-
<profile>
<id>onboarding</id>
<module>onboarding</module>
</modules>
</profile>
+
</profiles>
<repositories>
</repositories>
<distributionManagement>
-
<repository>
<id>ecomp-releases</id>
<name>Release Repository</name>
</site>
</distributionManagement>
</project>
-