Set up for release
Issue-ID: AAI-2580
Change-Id: Ia8cb1f5476fd02c255cec9f96890f3283fc99b68
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
diff --git a/pom.xml b/pom.xml
index 68ad3b6..c01e9a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,26 +24,41 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-parent</artifactId>
- <version>1.6.10</version>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>2.1.0</version>
<relativePath />
</parent>
<groupId>org.onap.aai.model-loader</groupId>
<artifactId>model-loader</artifactId>
<name>aai-model-loader</name>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.6.1-SNAPSHOT</version>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <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>
- <aai.common.version>1.6.10</aai.common.version>
<start-class>org.onap.aai.modelloader.service.ModelLoaderApplication</start-class>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<docker.location>${basedir}/target</docker.location>
+ <spring-boot.version>2.1.12.RELEASE</spring-boot.version>
+ <apache.commons-text.version>1.8</apache.commons-text.version>
+ <commons-compress.version>1.19</commons-compress.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
- <babel.version>1.3.1</babel.version>
+ <babel.version>1.6.2</babel.version>
<aai.rest.client.version>1.2.1</aai.rest.client.version>
<sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
+ <logback.version>1.2.3</logback.version>
<!-- docker related properties -->
<docker.fabric.version>0.28.0</docker.fabric.version>
<aai.docker.version>1.0.0</aai.docker.version>
@@ -53,8 +68,6 @@
<aai.base.image.version>1.6.0</aai.base.image.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>
- <!-- Code coverage enforcement -->
- <jacoco.line.coverage.limit>0.80</jacoco.line.coverage.limit>
</properties>
<distributionManagement>
@@ -217,6 +230,7 @@
<dependency>
<groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
+ <version>${aai.rest.client.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -235,14 +249,17 @@
<dependency>
<groupId>org.onap.aai.logging-service</groupId>
<artifactId>common-logging</artifactId>
+ <version>1.5.0</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>org.onap.sdc.sdc-distribution-client</groupId>
@@ -252,6 +269,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
+ <version>20131018</version><!--$NO-MVN-MAN-VER$ -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -265,14 +283,17 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
+ <version>${apache.commons-text.version}</version>
</dependency>
<!-- Test dependencies -->
@@ -340,6 +361,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
<configuration>
<executable>true</executable>
</configuration>
@@ -378,6 +400,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -396,34 +421,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <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>
</project>