diff options
| author |   Forsyth, James (jf2512) <jf2512@att.com> | 2020-02-14 14:48:25 -0500 |
|---|---|---|
| committer | Forsyth, James (jf2512) <jf2512@att.com> | 2020-02-14 15:10:34 -0500 |
| commit | 50315fe106b88e0cd556b8b6fab1dbdd4c9856a4 (patch) | |
| tree | 5212d2f50111c332a0f458b84f8b178cd7bb9914 | |
| parent | c7bb47fc56a86f14728474e882c6abcf09c19e7f (diff) | |
Use aai-parent for sonar config
Issue-ID: AAI-2793
Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
Change-Id: Ie07f3395814284599ea3b60c81d02a1c90a6603b
| -rw-r--r-- | aai-resources/pom.xml | 81 | ||||
| -rw-r--r-- | pom.xml | 9 | ||||
| -rw-r--r-- | version.properties | 2 |
3 files changed, 4 insertions, 88 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 8b2d23e..42fd235 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -28,26 +28,12 @@ <parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> - <version>1.6.4-SNAPSHOT</version> + <version>1.6.5-SNAPSHOT</version> </parent> <properties> <java.version>1.8</java.version> <start-class>org.onap.aai.ResourcesApp</start-class> - - <!-- Start of the jacoco plugin properties --> - <sonar.language>java</sonar.language> - <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> - <!-- End of the jacoco plugin properties --> - - <!-- - inherit from parent - <docker.fabric.version>0.28.0</docker.fabric.version> - --> <!-- Default docker registry that maven fabric plugin will try to pull from --> <docker.registry>docker.io</docker.registry> <!-- Specifying the docker push registry where the image should be pushed --> @@ -870,9 +856,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> <configuration> - <argLine>-noverify ${argLine}</argLine> <runOrder>alphabetical</runOrder> </configuration> </plugin> @@ -881,69 +865,6 @@ <artifactId>license-maven-plugin</artifactId> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.3</version> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <configuration> - <dumpOnExit>true</dumpOnExit> - <excludes> - <exclude>**/**/models/**/*.class</exclude> - </excludes> - </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> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory> - </configuration> - </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile> - <rules> - <!-- implementation is needed only for Maven 2 --> - <rule implementation="org.jacoco.maven.RuleConfiguration"> - <element>BUNDLE</element> - <limits> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>LINE</counter> - <value>COVEREDRATIO</value> - <minimum>${jacoco.line.coverage.limit}</minimum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> </plugin> @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.6.4</version> + <version>1.6.5</version> </parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> - <version>1.6.4-SNAPSHOT</version> + <version>1.6.5-SNAPSHOT</version> <name>aai-resources</name> <packaging>pom</packaging> <modules> @@ -86,11 +86,6 @@ use mvn spotless:check to validate source files --> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.3</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> </plugin> diff --git a/version.properties b/version.properties index fc0709c..716f7d4 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=6 -patch_version=4 +patch_version=5 base_version=${major_version}.${minor_version}.${patch_version} |