<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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<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 -->
<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>
<resource>
<directory>${basedir}/target/commonLibs</directory>
<filtering>false</filtering>
+
<includes>
<include>*.jar</include>
+
</includes>
</resource>
</resources>
<dockerDirectory>${dockerLocation}</dockerDirectory>
<serverId>docker-hub</serverId>
<imageTags>
- <imageTag>${docker_imageversion}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<forceTags>true</forceTags>
<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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
<executions>
<execution>
<id>unpack-schema-dependency</id>
<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>
<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>