Code Review / aai / aai-service.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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 c218414..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>
@@ -14,7 +14,17 @@
                <dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 
-               <skipTests>true</skipTests>
+               <skipTests>false</skipTests>
+        <!-- sonar properties -->
+               <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 -->
@@ -332,16 +342,107 @@
        <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>
     <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>
+                       <version>2.7</version>
+                       <executions>
+                           <execution>
+                               <id>copy-docker-file</id>
+                               <phase>package</phase>
+                               <goals>
+                                   <goal>copy-resources</goal>
+                               </goals>
+                               <configuration>
+                                   <outputDirectory>${dockerLocation}</outputDirectory>
+                                   <overwrite>true</overwrite>
+                                   <resources>
+                                       <resource>
+                                           <directory>${basedir}/src/main/resources/docker</directory>
+                                           <filtering>true</filtering>
+                                           <includes>
+                                               <include>**/*</include>
+                                           </includes>
+                                       </resource>
+                                   </resources>
+                               </configuration>
+                           </execution>
+                           <execution>
+                               <id>copy-commonlibs-file</id>
+                               <phase>package</phase>
+                               <goals>
+                                   <goal>copy-resources</goal>
+                               </goals>
+                               <configuration>
+                                   <outputDirectory>${dockerLocation}/commonLibs</outputDirectory>
+                                   <overwrite>true</overwrite>
+                                   <resources>
+                                       <resource>
+                                           <directory>${basedir}/target/commonLibs</directory>
+                                           <filtering>false</filtering>
+            
+                                           <includes>
+                                               <include>*.jar</include>
+      
+                                           </includes>
+                                       </resource>
+                                   </resources>
+                               </configuration>
+                           </execution>
+                       </executions>
+                   </plugin>
+                   <plugin>
+                       <groupId>com.spotify</groupId>
+                       <artifactId>docker-maven-plugin</artifactId>
+                       <version>0.4.11</version>
+                       <configuration>
+                               <verbose>true</verbose>
+                                               
+                               <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
+                           <dockerDirectory>${dockerLocation}</dockerDirectory>
+                           <serverId>docker-hub</serverId>                   
+                           <imageTags>
+                               <imageTag>latest</imageTag>
+                           </imageTags>
+                           <forceTags>true</forceTags>
+                       </configuration>
+                   </plugin>
                <plugin>
                        <groupId>org.jvnet.jaxb2.maven2</groupId>
                                <artifactId>maven-jaxb2-plugin</artifactId>
@@ -439,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>
@@ -464,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>
@@ -478,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>
@@ -496,13 +598,12 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
-                               <version>2.12.4</version>
+                               <version>2.19.1</version>
                                <configuration>
                                        <skipTests>${skipTests}</skipTests>
                                        <reuseForks>false</reuseForks>
                                        <threadCount>1</threadCount> 
-                                       <argLine>-javaagent:${project.build.directory}/agents/powermock-javaagent.jar
-                                       -noverify</argLine>
+                                       <argLine>-noverify ${argLine}</argLine>
                                        <systemPropertyVariables>
                                                <AJSC_HOME>.</AJSC_HOME>
                                                <BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>
@@ -556,77 +657,5 @@
                                </plugins>
                        </build>
                </profile>
-               <profile>
-                 <id>docker</id>
-                 <build>
-                       <defaultGoal>docker:build</defaultGoal>
-                       <plugins>
-                        <plugin>
-                       <groupId>org.apache.maven.plugins</groupId>
-                       <artifactId>maven-resources-plugin</artifactId>
-                       <version>2.7</version>
-                       <executions>
-                           <execution>
-                               <id>copy-docker-file</id>
-                               <phase>package</phase>
-                               <goals>
-                                   <goal>copy-resources</goal>
-                               </goals>
-                               <configuration>
-                                   <outputDirectory>${dockerLocation}</outputDirectory>
-                                   <overwrite>true</overwrite>
-                                   <resources>
-                                       <resource>
-                                           <directory>${basedir}/src/main/resources/docker</directory>
-                                           <filtering>true</filtering>
-                                           <includes>
-                                               <include>**/*</include>
-                                           </includes>
-                                       </resource>
-                                   </resources>
-                               </configuration>
-                           </execution>
-                           <execution>
-                               <id>copy-commonlibs-file</id>
-                               <phase>package</phase>
-                               <goals>
-                                   <goal>copy-resources</goal>
-                               </goals>
-                               <configuration>
-                                   <outputDirectory>${dockerLocation}/commonLibs</outputDirectory>
-                                   <overwrite>true</overwrite>
-                                   <resources>
-                                       <resource>
-                                           <directory>${basedir}/target/commonLibs</directory>
-                                           <filtering>false</filtering>
-                                           <includes>
-                                               <include>*.jar</include>
-                                           </includes>
-                                       </resource>
-                                   </resources>
-                               </configuration>
-                           </execution>
-                       </executions>
-                   </plugin>
-                   <plugin>
-                       <groupId>com.spotify</groupId>
-                       <artifactId>docker-maven-plugin</artifactId>
-                       <version>0.4.11</version>
-                       <configuration>
-                               <verbose>true</verbose>
-                                               
-                               <imageName>${docker.push.registry}/ecomp/${project.artifactId}</imageName>
-                           <dockerDirectory>${dockerLocation}</dockerDirectory>
-                           <serverId>docker-hub</serverId>                   
-                           <imageTags>
-                               <imageTag>${docker_imageversion}</imageTag>
-                               <imageTag>latest</imageTag>
-                           </imageTags>
-                           <forceTags>true</forceTags>
-                       </configuration>
-                   </plugin>
-                        </plugins>
-                </build>
-               </profile>
        </profiles>
 </project>