aai-service: Force maven-dependency-plugin version

[aai/aai-service.git] / ajsc-aai / pom.xml

diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml
index 0bf6c6d..75d6188 100644 (file)
--- a/ajsc-aai/pom.xml
+++ b/ajsc-aai/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openecomp.aai.aai-service</groupId>
     <artifactId>aai-service</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>ajsc-aai</artifactId>
   <name>ajsc</name>
@@ -16,11 +16,15 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 
                <skipTests>false</skipTests>
         <!-- sonar properties -->
-        <sonar.jacoco.reportPath>${basedir}/target/jacoco.exec</sonar.jacoco.reportPath>  
-        <sonar.language>java</sonar.language>  
-       <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>  
-        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+               <sonar.language>java</sonar.language>
+               <docker.image.version>1.0.0</docker.image.version>
+               <timestamp>${maven.build.timestamp}</timestamp>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+       <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+       <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+       <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
+       <sonar.projectVersion>${project.version}</sonar.projectVersion>
   </properties>
   <dependencies>
                <!-- AJSC related dependencies -->
@@ -338,26 +342,42 @@
        <dependency>
                <groupId>org.openecomp.aai.aai-service</groupId>
                <artifactId>aai-schema</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </dependency>
        <dependency>
                <groupId>org.openecomp.aai.aai-service</groupId>
                <artifactId>annotations</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </dependency>
   </dependencies>
   <build>
     <finalName>aai</finalName>
-    <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-            </plugins>
-    </pluginManagement>
     <plugins>  
+                 <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>sonar-maven-plugin</artifactId>
+         <version>3.2</version>
+       </plugin>
+       <plugin>
+         <groupId>org.jacoco</groupId>
+         <artifactId>jacoco-maven-plugin</artifactId>
+         <version>0.7.7.201606060606</version>
+         <configuration>
+               <dumpOnExit>true</dumpOnExit>
+         </configuration>
+         <executions>
+               <execution>
+                 <id>jacoco-initialize-unit-tests</id>
+                 <goals>
+                       <goal>prepare-agent</goal>
+                 </goals>
+                 <configuration>
+                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                       <!-- <append>true</append> -->
+                 </configuration>
+               </execution>
+         </executions>
+       </plugin>
                         <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-resources-plugin</artifactId>
@@ -418,37 +438,11 @@
                            <dockerDirectory>${dockerLocation}</dockerDirectory>
                            <serverId>docker-hub</serverId>                   
                            <imageTags>
-                               <imageTag>${docker_imageversion}</imageTag>
                                <imageTag>latest</imageTag>
                            </imageTags>
                            <forceTags>true</forceTags>
                        </configuration>
                    </plugin>
-               <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.7.201606060606</version>  
-               <configuration>
-                 <dumpOnExit>true</dumpOnExit>
-                 <includes>
-                   <include>org.openecomp.*</include>
-                 </includes>
-               </configuration>
-                <executions>    
-                    <execution>  
-                        <configuration>  
-                            <destFile>${sonar.jacoco.reportPath}</destFile>  
-                        </configuration>  
-                        <id>pre-test</id>
-                        <phase>process-test-classes</phase>  
-                        <goals>  
-                            <goal>prepare-agent</goal>  
-                        </goals>  
-                    </execution>  
-                    <!-- we want to execute jacoco:prepare-agent-integration in test phase,  
-                    but before executing maven failsafe plugin -->  
-                </executions>  
-            </plugin>
                <plugin>
                        <groupId>org.jvnet.jaxb2.maven2</groupId>
                                <artifactId>maven-jaxb2-plugin</artifactId>
@@ -546,7 +540,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>
-                               <version>2.5.1</version>
+                               <version>2.8</version>
                                <executions>
                                        <execution>
                                                <id>copy-agent</id>
@@ -571,6 +565,7 @@
                        <plugin>
                            <groupId>org.apache.maven.plugins</groupId>
                            <artifactId>maven-dependency-plugin</artifactId>
+                            <version>2.8</version>
                            <executions>
                              <execution>
                                <id>unpack-schema-dependency</id>
@@ -585,14 +580,14 @@
                                <artifactItem>
                                  <groupId>org.openecomp.aai.aai-service</groupId>
                                  <artifactId>aai-schema</artifactId>
-                                 <version>1.0.0-SNAPSHOT</version>
+                                 <version>1.1.0-SNAPSHOT</version>
                                  <outputDirectory>bundleconfig-local/etc</outputDirectory>
                                  <includes>oxm/*.xml</includes>
                                </artifactItem>
                                <artifactItem>
                                  <groupId>org.openecomp.aai.aai-service</groupId>
                                  <artifactId>aai-schema</artifactId>
-                                 <version>1.0.0-SNAPSHOT</version>
+                                 <version>1.1.0-SNAPSHOT</version>
                                  <outputDirectory>src/main</outputDirectory>
                                  <includes>aai_schema/*.xsd</includes>
                                </artifactItem>
@@ -608,8 +603,7 @@
                                        <skipTests>${skipTests}</skipTests>
                                        <reuseForks>false</reuseForks>
                                        <threadCount>1</threadCount> 
-                                       <argLine>-javaagent:${project.build.directory}/agents/powermock-javaagent.jar
-                                         -noverify ${argLine}</argLine>
+                                       <argLine>-noverify ${argLine}</argLine>
                                        <systemPropertyVariables>
                                                <AJSC_HOME>.</AJSC_HOME>
                                                <BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>