X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=016b68fec736b8742a4cfd354f7e3cb411c6ccf5;hb=35b5687d60558bac72c1e53ddd9044584964a3d8;hp=2f1fc84de432c4fdb731e9239fafd91be8962407;hpb=776213b26ad024101a464c169273c05129af226f;p=sdc.git

diff --git a/pom.xml b/pom.xml
index 2f1fc84de4..016b68fec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@ 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
+Modifications copyright (c) 2018-2019 Nokia
 ================================================================================
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -25,35 +25,54 @@ Modifications copyright (c) 2018 Nokia
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc</name>
+
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>2.0.0</version>
+        <relativePath/>
+    </parent>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+        <tosca.datatype.version>${project.version}</tosca.datatype.version>
+
         <!-- 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>
+        <janusgraph.version>0.3.1</janusgraph.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.27</jersey-bom.version>
+        <netty.version>4.1.36.Final</netty.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>
+        <lombok.version>1.18.2</lombok.version>
+        <commons-beanutils>1.9.3</commons-beanutils>
+        <commons-configuration>2.3</commons-configuration>
+        <apache-poi.version>4.1.0</apache-poi.version>
+
+        <commons.collections.version>4.1</commons.collections.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.4.11.v20180605</jetty.version>
+        <jetty.version>9.4.18.v20190429</jetty.version>
 
         <!-- JSON and YAML Parsing -->
-        <jackson.version>2.8.10</jackson.version>
-        <jackson-annotations.version>2.8.0</jackson-annotations.version>
+        <jackson.version>2.9.9</jackson.version>
+        <jackson-annotations.version>2.9.9</jackson-annotations.version>
+        <jackson.mapper.version>1.9.13</jackson.mapper.version>
 
         <!-- Yaml for properties -->
         <snakeyaml.version>1.14</snakeyaml.version>
@@ -93,10 +112,16 @@ Modifications copyright (c) 2018 Nokia
         <jmockit.version>1.33</jmockit.version>
         <junit.version>4.12</junit.version>
         <assertj.version>3.10.0</assertj.version>
-        <testng.version>6.9.10</testng.version>
+        <testng.version>6.14.3</testng.version>
         <extentreports.version>3.0.3</extentreports.version>
         <cucumber.version>2.4.0</cucumber.version>
         <bean-matchers.version>0.11</bean-matchers.version>
+        <hamcrest.version>2.1</hamcrest.version>
+        <hamcrest-all.version>1.3</hamcrest-all.version>
+        <junit-jupiter.version>5.4.0</junit-jupiter.version>
+        <junit-vintage.version>5.4.0</junit-vintage.version>
+        <junit-platform.version>1.1.0</junit-platform.version>
+        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
 
         <!-- parser-->
         <sdc-tosca-parser.version>1.3.5</sdc-tosca-parser.version>
@@ -109,13 +134,13 @@ Modifications copyright (c) 2018 Nokia
 
         <!--cassandra -->
         <cassandra.driver.version>3.0.0</cassandra.driver.version>
+        <libthrift.version>0.12.0</libthrift.version>
         <!-- maven central (Nexus) -->
         <nexus.id.release>nexus</nexus.id.release>
         <nexus.id.snapshot>nexus</nexus.id.snapshot>
 
         <!--nexus-->
-        <npm.registry>https://registry.npmjs.org/</npm.registry>
-        <!-- https://nexus.onap.org/content/repositories/npm/ -->
+        <npm.registry>https://nexus3.onap.org/repository/npm.public/</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>
@@ -124,12 +149,22 @@ Modifications copyright (c) 2018 Nokia
         <!--docker tags-->
         <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
 
+        <joda.time.version>2.9.9</joda.time.version>
+
+        <!--jacoco-->
+        <jacoco.version>0.8.1</jacoco.version>
 
     </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>
@@ -192,16 +227,42 @@ Modifications copyright (c) 2018 Nokia
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.0.45.Final</version>
+                <version>${netty.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-handler</artifactId>
-                <version>4.0.45.Final</version>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.platform</groupId>
+                <artifactId>junit-platform-launcher</artifactId>
+                <version>${junit-platform.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${junit-vintage.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>
+    </dependencies>
+
     <reporting>
         <plugins>
             <plugin>
@@ -299,40 +360,35 @@ Modifications copyright (c) 2018 Nokia
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
+                    <version>${maven-surefire-plugin.version}</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>
+                <plugin>
+                    <groupId>pl.project13.maven</groupId>
+                    <artifactId>git-commit-id-plugin</artifactId>
+                    <version>2.2.6</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
         <plugins>
-
-            <!-- Staging Plugin -->
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.17</version>
                 <configuration>
-                    <nexusUrl>${nexus.proxy}</nexusUrl>
-                    <stagingProfileId>${staging.profile.id}</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
+                    <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
                 </configuration>
             </plugin>
-
             <!-- plugin for parsing the project version -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -352,11 +408,18 @@ Modifications copyright (c) 2018 Nokia
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>default-prepare-agent</id>
+                        <id>default-instrument</id>
                         <goals>
-                            <goal>prepare-agent</goal>
+                            <goal>instrument</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-restore-instrumented-classes</id>
+                        <goals>
+                            <goal>restore-instrumented-classes</goal>
                         </goals>
                     </execution>
                     <execution>
@@ -364,6 +427,9 @@ Modifications copyright (c) 2018 Nokia
                         <goals>
                             <goal>report</goal>
                         </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -419,8 +485,42 @@ Modifications copyright (c) 2018 Nokia
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <printSummary>false</printSummary>
+                    <systemPropertyVariables>
+                        <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+               <groupId>pl.project13.maven</groupId>
+               <artifactId>git-commit-id-plugin</artifactId>
+               <executions>
+                  <execution>
+                     <goals>
+                        <goal>revision</goal>
+                     </goals>
+                  </execution>
+               </executions>
+               <configuration>
+                  <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                  <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
+                  <failOnNoGitDirectory>true</failOnNoGitDirectory>
+                  <verbose>false</verbose>
+                  <includeOnlyProperties>
+                     <includeOnlyProperty>git.build.version</includeOnlyProperty>
+                     <includeOnlyProperty>git.build.time</includeOnlyProperty>
+                     <includeOnlyProperty>git.commit.id</includeOnlyProperty>
+                     <includeOnlyProperty>git.commit.time</includeOnlyProperty>
+                     <includeOnlyProperty>git.commit.user.name</includeOnlyProperty>
+                     <includeOnlyProperty>git.commit.user.email</includeOnlyProperty>
+                     <includeOnlyProperty>git.commit.message.short</includeOnlyProperty>
+                     <includeOnlyProperty>git.commit.message.full</includeOnlyProperty>
+                  </includeOnlyProperties>
+                  <gitDescribe>
+                     <skip>true</skip>
+                  </gitDescribe>
+                  <useNativeGit>false</useNativeGit>
+               </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -469,7 +569,6 @@ Modifications copyright (c) 2018 Nokia
             </modules>
 
             <properties>
-                <ecomp.version>1.2.7</ecomp.version>
                 <sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
             </properties>
         </profile>