summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-12-10 18:55:03 +0200
committerTal Gitelman <tg851x@intl.att.com>2017-12-10 19:33:38 +0200
commit51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 (patch)
tree3ac236a864d74d19b0f5c9020891a7a7e5c31b44 /pom.xml
parentb5cc2e0695f195716d6ccdc65e73807a6632ec70 (diff)
Final commit to master merge from
Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml118
1 files changed, 70 insertions, 48 deletions
diff --git a/pom.xml b/pom.xml
index 582261bf7a..bd7bb2a457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,9 @@
<name>sdc</name>
<properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
<!-- ==================== -->
<!-- Generic properties -->
<!-- ==================== -->
@@ -34,6 +37,8 @@
<!-- 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 -->
@@ -79,29 +84,21 @@
<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.32</sdc-tosca-parser.version>
+ <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.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>
@@ -109,6 +106,22 @@
<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>
<sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
@@ -117,6 +130,22 @@
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <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>
+ </dependencies>
+ </dependencyManagement>
+
<reporting>
<plugins>
<plugin>
@@ -214,56 +243,28 @@
</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>
@@ -365,6 +366,27 @@
</profile>
<profile>
+ <id>catalog-be</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>security-utils</module>
+ <module>common-app-api</module>
+ <module>common-be</module>
+ <module>catalog-dao</module>
+ <module>catalog-model</module>
+ <module>catalog-be</module>
+ </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.14</sdc-tosca-parser.version>
+ </properties>
+ </profile>
+ <profile>
<id>onboarding</id>
<activation>
<activeByDefault>false</activeByDefault>