Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update Release Note
[sdc.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index bcd20a1..ebfee80 100644 (file)
--- 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,30 +25,41 @@ Modifications copyright (c) 2018 Nokia
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.4.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>
         <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>
 
@@ -56,11 +67,11 @@ Modifications copyright (c) 2018 Nokia
         <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 -->
@@ -101,13 +112,14 @@ 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.1.0</junit-jupiter.version>
-        <junit-vintage.version>5.1.0</junit-vintage.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>
 
@@ -122,6 +134,7 @@ 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>
@@ -139,12 +152,20 @@ Modifications copyright (c) 2018 Nokia
 
         <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>
@@ -207,16 +228,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>
@@ -315,39 +362,12 @@ Modifications copyright (c) 2018 Nokia
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.junit.platform</groupId>
-                            <artifactId>junit-platform-surefire-provider</artifactId>
-                            <version>${junit-platform.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>
                 </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>
@@ -362,19 +382,14 @@ Modifications copyright (c) 2018 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>
@@ -394,11 +409,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>
@@ -406,6 +428,9 @@ Modifications copyright (c) 2018 Nokia
                         <goals>
                             <goal>report</goal>
                         </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -461,6 +486,9 @@ 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>
SDC Parent Project Catalog FE and BE