Code Review
/
aai
/
model-loader.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Publish 1.13.5 maven release
[aai/model-loader.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
abf60e2
..
8f2beeb
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-33,7
+33,7
@@
<groupId>org.onap.aai.model-loader</groupId>
<artifactId>model-loader</artifactId>
<name>aai-model-loader</name>
<groupId>org.onap.aai.model-loader</groupId>
<artifactId>model-loader</artifactId>
<name>aai-model-loader</name>
- <version>1.1
2.0
-SNAPSHOT</version>
+ <version>1.1
3.5
-SNAPSHOT</version>
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
@@
-44,6
+44,13
@@
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
</dependencies>
</dependencyManagement>
@@
-51,13
+58,15
@@
<start-class>org.onap.aai.modelloader.service.ModelLoaderApplication</start-class>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<docker.location>${basedir}/target</docker.location>
<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.3.12.RELEASE</spring-boot.version>
+ <spring-boot.version>2.4.13</spring-boot.version>
+ <spring-cloud.version>2020.0.2</spring-cloud.version>
<apache.commons-text.version>1.10.0</apache.commons-text.version>
<commons-compress.version>1.22</commons-compress.version>
<apache.commons-text.version>1.10.0</apache.commons-text.version>
<commons-compress.version>1.22</commons-compress.version>
+ <gson.version>2.10.1</gson.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<babel.version>1.9.5</babel.version>
<aai.rest.client.version>1.2.1</aai.rest.client.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<babel.version>1.9.5</babel.version>
<aai.rest.client.version>1.2.1</aai.rest.client.version>
- <sdc-distribution-client.version>2.
0.0
</sdc-distribution-client.version>
+ <sdc-distribution-client.version>2.
1.1
</sdc-distribution-client.version>
<logback.version>1.2.11</logback.version>
<!-- docker related properties -->
<docker.fabric.version>0.39.0</docker.fabric.version>
<logback.version>1.2.11</logback.version>
<!-- docker related properties -->
<docker.fabric.version>0.39.0</docker.fabric.version>
@@
-65,7
+74,7
@@
<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/</aai.build.directory>
<aai.docker.namespace>onap</aai.docker.namespace>
<aai.base.image>alpine</aai.base.image>
<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/</aai.build.directory>
<aai.docker.namespace>onap</aai.docker.namespace>
<aai.base.image>alpine</aai.base.image>
- <aai.base.image.version>1.
8.1
</aai.base.image.version>
+ <aai.base.image.version>1.
13.2
</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>
<!-- 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>
@@
-214,6
+223,7
@@
</build>
</profile>
</profiles>
</build>
</profile>
</profiles>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@
-259,6
+269,7
@@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <version>${gson.version}</version>
</dependency>
<!-- Test dependencies -->
</dependency>
<!-- Test dependencies -->
@@
-266,7
+277,7
@@
<dependency>
<groupId>com.mikesamuel</groupId>
<artifactId>json-sanitizer</artifactId>
<dependency>
<groupId>com.mikesamuel</groupId>
<artifactId>json-sanitizer</artifactId>
- <version>1.2.
0
</version>
+ <version>1.2.
3
</version>
</dependency>
<!-- Common logging framework -->
</dependency>
<!-- Common logging framework -->
@@
-278,12
+289,14
@@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version><!--$NO-MVN-MAN-VER$ -->
+ <version>${logback.version}</version>
+ <!--$NO-MVN-MAN-VER$ -->
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version><!--$NO-MVN-MAN-VER$ -->
+ <version>${logback.version}</version>
+ <!--$NO-MVN-MAN-VER$ -->
</dependency>
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
</dependency>
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
@@
-293,7
+306,8
@@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20131018</version><!--$NO-MVN-MAN-VER$ -->
+ <version>20131018</version>
+ <!--$NO-MVN-MAN-VER$ -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@
-319,19
+333,32
@@
<artifactId>commons-text</artifactId>
<version>${apache.commons-text.version}</version>
</dependency>
<artifactId>commons-text</artifactId>
<version>${apache.commons-text.version}</version>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-sleuth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-sleuth-zipkin</artifactId>
</dependency>
</dependency>
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest-all.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest-all.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>