<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 -->
<!-- ==================== -->
<build.type>-SNAPSHOT</build.type>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sprint.number>73</sprint.number>
+ <sprint.number>74</sprint.number>
<!-- 3rd parties versions -->
<lang3.version>3.3.2</lang3.version>
<jersey-bom.version>2.24</jersey-bom.version>
<servlet-api.version>2.5</servlet-api.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>
- <ecomp.version>1.1.0-SNAPSHOT</ecomp.version>
- <dox-common-lib.version>1.1.0-SNAPSHOT</dox-common-lib.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>
<!-- Elastic Search mapper (reference the elastic search version actually). -->
<elastic-search.version>2.1.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 -->
<commons-logging>1.2</commons-logging>
<groovy.version>2.3.5</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>
-
+
<!-- Logging end -->
<!-- System Metrics -->
<sigar.version>1.6.4</sigar.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>
<testng.version>6.9.10</testng.version>
<extentreports.version>3.0.3</extentreports.version>
+
+ <!-- parser-->
+ <sdc-tosca-parser.version>1.1.56-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.language>java</sonar.language>
- <sonar.version>${project.version}</sonar.version>
-
- <!--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>
+ <sonar.branch>${project.version}</sonar.branch>
+
+ <assertj.version>3.8.0</assertj.version>
+
+ <!--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>
+
+ <assertj.version>3.8.0</assertj.version>
+
+ <!--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>
<!--nexus-->
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
<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>
</execution>
</executions>
</plugin>
-
- <!-- license plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.10</version>
- <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>
- </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>
</profile>
-
-
<profile>
<id>catalog</id>
<activation>
<module>asdc-tests</module>
<module>test-apis-ci</module>
<module>ui-ci</module>
- </modules>
-
- <build>
- <plugins>
- <!-- Create the 'next build number' file -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
-
- <executions>
- <execution>
- <inherited>false</inherited>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>initialize</phase>
- <id>get.next.build.number</id>
- <configuration>
- <workingDirectory>${project.basedir}</workingDirectory>
- <executable>/usr/bin/perl</executable>
- <arguments>
- <argument>scripts/get_next_version.pl</argument>
- <argument>-groupId=${project.groupId}</argument>
- <argument>-artifactId=${project.artifactId}</argument>
- <argument>-baseVersion=${project.version}.${sprint.number}</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
-
- <executions>
- <execution>
- <phase>initialize</phase>
- <inherited>false</inherited>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
- <file>${project.build.directory}/FullReleaseVersion.properties</file>
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </modules>
+
+ <properties>
+ <ecomp.version>1.2.7</ecomp.version>
+ <artifact-generator-api.version>1710.0.0</artifact-generator-api.version>
+ <artifact-generator-core.version>1710.0.0</artifact-generator-core.version>
+ <dox-common-lib.version>1710.0.0</dox-common-lib.version>
+ <sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
+ </properties>
</profile>
<profile>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
+ <module>build-tools</module>
<module>onboarding</module>
</modules>
</profile>
<profile>
- <id>Fortify</id>
+ <id>dev-integ</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.fortify.ps.maven.plugin</groupId>
- <artifactId>sca-maven-plugin</artifactId>
- <version>4.30</version>
- <configuration>
- <source>1.8</source>
- <buildId>${project.artifactId}</buildId>
- <toplevelArtifactId>${project.artifactId}</toplevelArtifactId>
- <fortify.sca.exclude>**/node_modules/*</fortify.sca.exclude>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>WhiteSource</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.whitesource</groupId>
- <artifactId>whitesource-maven-plugin</artifactId>
- <version>3.1.6</version>
- <configuration>
- <orgToken>2809bf29-b00c-48c0-a1f0-ca5c9c22f3df</orgToken>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-console</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
+ </dependencies>
</profile>
-
</profiles>
<repositories>
- <repository>
- <id>virtuos</id>
- <name>Virtuos</name>
- <url>http://nexus.virtuos.uos.de/nexus/content/repositories/public/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>apache-public</id>
- <name>Apache-Public</name>
- <url>https://repository.apache.org/content/groups/public/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>elasticsearch-releases</id>
- <url>https://maven.elasticsearch.org/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>central</id>
- <name>Official Maven repository</name>
- <url>http://repo2.maven.org/maven2/</url>
- </repository>
+ <!-- LF repositories -->
<repository>
<id>ecomp-releases</id>
<name>Release Repository</name>
<url>${nexus.proxy}/content/repositories/snapshots/</url>
</repository>
<repository>
- <id>node</id>
- <name>Node</name>
- <url>https://maven-nodejs-proxy.pvtool.org/</url>
- </repository>
- <repository>
- <id>SonoType</id>
- <name>sonotype</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <id>ecomp-public</id>
+ <name>Public Repository</name>
+ <url>${nexus.proxy}/content/repositories/public/</url>
</repository>
+ <!-- LF repositories END-->
</repositories>
<distributionManagement>
Code Review / sdc.git / blobdiff