X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=61a4ec2e54270563b6ff2fea3e2ff0c2ac6ade91;hb=277fb3d9331b8a5c7fbdd8cf72cb623963a1ff4b;hp=226429d7d94373ac182d7fdd90fc5f10264c19af;hpb=d132185f972de61328bef9d511b875c0eefd9b1c;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index 226429d..61a4ec2 100644
--- 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>
-	<version>1.9.4-SNAPSHOT</version>
+	<version>1.13.6-SNAPSHOT</version>
 
 	<dependencyManagement>
 		<dependencies>
@@ -44,6 +44,13 @@
 				<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>
 
@@ -51,21 +58,23 @@
 		<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>
+		<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>
+		<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>
-		<sdc-distribution-client.version>1.4.1</sdc-distribution-client.version>
-		<logback.version>1.2.3</logback.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>
 		<aai.docker.version>1.0.0</aai.docker.version>
 		<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>
 
@@ -230,6 +239,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.kafka</groupId>
+			<artifactId>kafka-clients</artifactId>
+			<version>3.3.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.onap.aai</groupId>
 			<artifactId>babel</artifactId>
@@ -255,6 +269,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
+			<version>${gson.version}</version>
 		</dependency>
 
 		<!-- Test dependencies -->
@@ -262,7 +277,7 @@
 		<dependency>
 			<groupId>com.mikesamuel</groupId>
 			<artifactId>json-sanitizer</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.3</version>
 		</dependency>
 
 		<!-- Common logging framework -->
@@ -274,12 +289,14 @@
 		<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>
-			<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>
@@ -289,7 +306,8 @@
 		<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>
@@ -315,19 +333,32 @@
 			<artifactId>commons-text</artifactId>
 			<version>${apache.commons-text.version}</version>
 		</dependency>
-
-		<!-- Test dependencies -->
 		<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>
+
+		<!-- Test dependencies -->
 		<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>
@@ -344,12 +375,12 @@
 	<pluginRepositories>
 		<pluginRepository>
 			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
+			<url>https://repo1.maven.org/maven2</url>
 		</pluginRepository>
 		<pluginRepository>
 			<id>EvoSuite</id>
 			<name>EvoSuite Repository</name>
-			<url>http://www.evosuite.org/m2</url>
+			<url>https://www.evosuite.org/m2</url>
 		</pluginRepository>
 	</pluginRepositories>
 
@@ -357,7 +388,7 @@
 		<repository>
 			<id>central</id>
 			<name>Maven 2 repository 2</name>
-			<url>http://repo2.maven.org/maven2/</url>
+			<url>https://repo2.maven.org/maven2/</url>
 		</repository>
 		<repository>
 			<id>ecomp-releases</id>