diff options
author | Igor Dysko <igor1.dysko@orange.com> | 2020-11-25 09:41:04 +0100 |
---|---|---|
committer | Igor Dysko <igor1.dysko@orange.com> | 2020-12-04 14:27:50 +0100 |
commit | de97feac66e234a0ebea9bf0774aa01136f3c04f (patch) | |
tree | 45f8d6b81a0aeb70e1d6d8642db35b25c6dfcbd3 | |
parent | ed2d0e1fe8d84ae1a02b2fefd28154ccfd3960ed (diff) |
Change of the parent project to aai-parent
Parent project set to aai-parent:1.7.3
Issue-ID: AAI-2630
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: I439324475673dda4653cd14ad484bb759bd3cccb
-rw-r--r-- | pom.xml | 46 |
1 files changed, 11 insertions, 35 deletions
@@ -26,10 +26,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.1.0</version> - <relativePath /> + <groupId>org.onap.aai.aai-common</groupId> + <artifactId>aai-parent</artifactId> + <version>1.7.3</version> </parent> <groupId>org.onap.aai</groupId> @@ -42,11 +41,10 @@ <properties> <!-- Spring boot version --> - <spring.boot.version>2.1.12.RELEASE</spring.boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> + <aai.schema.source.folder>onap/aai_schema</aai.schema.source.folder> <aai.schema.target.folder>${project.build.directory}/aai-schema</aai.schema.target.folder> @@ -55,8 +53,7 @@ <sonar.jacoco.reportMissing.force.zero /> <jacoco.line.coverage.limit>0.90</jacoco.line.coverage.limit> - <jacoco.version>0.8.5</jacoco.version> - <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> + <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> @@ -73,36 +70,23 @@ <aai.base.image.version>1.6.0</aai.base.image.version> <!-- Dependency Versions --> - <common.logging.version>1.2.2</common.logging.version> <sdc.tosca.version>1.5.1</sdc.tosca.version> - <commons.compress.version>1.18</commons.compress.version> + <javax.ws.rs.version>2.1</javax.ws.rs.version> <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version> <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id> <aai-schema.version>1.7.6</aai-schema.version> - <aai.rest.client.version>1.2.1</aai.rest.client.version> + <sdc.distribution.client.version>1.3.0</sdc.distribution.client.version> <xmlunit.version>1.6</xmlunit.version> - <logback.version>1.2.3</logback.version> + <antrun.version>1.8</antrun.version> - <jaxb.version>2.2.11</jaxb.version> + <javax.activation.version>1.1.1</javax.activation.version> <!-- This will be used for the docker images as the default format of maven build has issues --> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <!-- Import dependency management from Spring Boot --> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> + </properties> <profiles> <!-- Docker profile to be used for building docker image and pushing to nexus --> @@ -234,17 +218,14 @@ <dependency> <groupId>org.onap.aai.logging-service</groupId> <artifactId>common-logging</artifactId> - <version>${common.logging.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${logback.version}</version><!--$NO-MVN-MAN-VER$--> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>${logback.version}</version><!--$NO-MVN-MAN-VER$--> </dependency> <dependency> <groupId>commons-codec</groupId> @@ -253,7 +234,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>${commons.compress.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -262,7 +242,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.ws.rs.version}</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -276,7 +256,6 @@ <dependency> <groupId>org.onap.aai</groupId> <artifactId>rest-client</artifactId> - <version>${aai.rest.client.version}</version> </dependency> <!-- Testing --> @@ -300,17 +279,14 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>javax.activation</groupId> |