Update Release Note

[sdc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 7d03af8..ebfee80 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,21 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.3-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>1.3.2-SNAPSHOT</tosca.datatype.version>
+        <tosca.datatype.version>${project.version}</tosca.datatype.version>
 
         <!-- 3rd parties versions -->
         <bean-matcher.version>0.11</bean-matcher.version>
@@ -108,6 +116,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <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>
@@ -151,6 +160,12 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <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>
@@ -353,11 +368,6 @@ Modifications copyright (c) 2018-2019 Nokia
                     <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>
@@ -372,19 +382,14 @@ Modifications copyright (c) 2018-2019 Nokia
         </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>
@@ -404,6 +409,7 @@ Modifications copyright (c) 2018-2019 Nokia
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
                         <id>default-instrument</id>