diff options
| author |   jimmy <jf2512@att.com> | 2020-02-18 16:16:23 -0500 |
|---|---|---|
| committer | jimmy <jf2512@att.com> | 2020-02-18 16:16:25 -0500 |
| commit | 781bf18a72a17044d2c0f66ea25bf0e72f8006eb (patch) | |
| tree | 2bc9384263cd2a2aadf9fa0e3cc58964bbdc3639 | |
| parent | 9f2b50994a16d6ff41690ea29d08fefbc3ef8576 (diff) | |
Change to aai-parent and sonar xml
Issue-ID: AAI-2793
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: If5aba01a065f437c1913876bae203e074a25556d
| -rw-r--r-- | pom.xml | 47 | ||||
| -rw-r--r-- | version.properties | 2 |
2 files changed, 5 insertions, 44 deletions
@@ -23,14 +23,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-parent</artifactId> + <version>1.6.6-SNAPSHOT</version> </parent> <groupId>org.onap.aai</groupId> <artifactId>rest-client</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> <name>aai-rest-client</name> <properties> @@ -44,26 +44,22 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>2.27</version> </dependency> <dependency> <groupId>org.onap.aai.logging-service</groupId> <artifactId>common-logging</artifactId> - <version>1.5.0</version> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> @@ -77,14 +73,12 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-javaagent</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4-rule-agent</artifactId> - <version>1.6.2</version> <scope>test</scope> </dependency> @@ -150,39 +144,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <dataFile>${jacoco.report.directory}/jacoco-ut.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> </plugins> </build> diff --git a/version.properties b/version.properties index a0756ad..fe64195 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=6 -patch=0 +patch=4 base_version=${major}.${minor}.${patch} |