Fix test coverage

[sdc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 4434df9..04d4a24 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,17 @@ Modifications copyright (c) 2018 Nokia
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+        <tosca.datatype.version>1.3.2-SNAPSHOT</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>
@@ -44,6 +48,9 @@ Modifications copyright (c) 2018 Nokia
         <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.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>
@@ -54,6 +61,7 @@ Modifications copyright (c) 2018 Nokia
         <!-- JSON and YAML Parsing -->
         <jackson.version>2.8.10</jackson.version>
         <jackson-annotations.version>2.8.0</jackson-annotations.version>
+        <jackson.mapper.version>1.9.13</jackson.mapper.version>
 
         <!-- Yaml for properties -->
         <snakeyaml.version>1.14</snakeyaml.version>
@@ -97,6 +105,11 @@ Modifications copyright (c) 2018 Nokia
         <extentreports.version>3.0.3</extentreports.version>
         <cucumber.version>2.4.0</cucumber.version>
         <bean-matchers.version>0.11</bean-matchers.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>
@@ -124,6 +137,10 @@ 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>
 
@@ -199,9 +216,35 @@ Modifications copyright (c) 2018 Nokia
                 <artifactId>netty-handler</artifactId>
                 <version>4.0.45.Final</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,7 +342,7 @@ 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>
@@ -316,6 +359,11 @@ Modifications copyright (c) 2018 Nokia
                     <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>
 
@@ -354,9 +402,15 @@ Modifications copyright (c) 2018 Nokia
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>default-prepare-agent</id>
+                        <id>default-instrument</id>
+                        <goals>
+                            <goal>instrument</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-restore-instrumented-classes</id>
                         <goals>
-                            <goal>prepare-agent</goal>
+                            <goal>restore-instrumented-classes</goal>
                         </goals>
                     </execution>
                     <execution>
@@ -364,6 +418,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 +476,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 +560,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>