X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=10a4f2c85b47a727eea3fd14b6aee8d72d9dfb53;hb=HEAD;hp=a311908655589e628a2f3bc1e14cd44a010e3563;hpb=b5c15a4baafeac466c1565f2237d6f8cdaf9fd72;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index a311908..2574071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>2.1.0</version>
+		<version>3.3.3</version>
 		<relativePath />
 	</parent>
 
 	<groupId>org.onap.aai.model-loader</groupId>
 	<artifactId>model-loader</artifactId>
 	<name>aai-model-loader</name>
-	<version>1.13.5-SNAPSHOT</version>
+	<version>1.14.1-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,12 +58,13 @@
 		<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.4.13</spring-boot.version>
+		<spring-boot.version>2.7.18</spring-boot.version>
+		<spring-cloud.version>2021.0.8</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>
+		<babel.version>1.13.0</babel.version>
 		<sdc-distribution-client.version>2.0.0</sdc-distribution-client.version>
 		<logback.version>1.2.11</logback.version>
 		<!-- docker related properties -->
@@ -214,6 +222,7 @@
 			</build>
 		</profile>
 	</profiles>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -230,9 +239,22 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka-clients</artifactId>
-			<version>3.3.1</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+	</dependency>
+		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.aai</groupId>
@@ -246,19 +268,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-common</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.aai</groupId>
-			<artifactId>rest-client</artifactId>
-			<version>${aai.rest.client.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
+			<version>${gson.version}</version>
 		</dependency>
 
 		<!-- Test dependencies -->
@@ -266,7 +279,7 @@
 		<dependency>
 			<groupId>com.mikesamuel</groupId>
 			<artifactId>json-sanitizer</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.3</version>
 		</dependency>
 
 		<!-- Common logging framework -->
@@ -292,21 +305,6 @@
 			<artifactId>sdc-distribution-client</artifactId>
 			<version>${sdc-distribution-client.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20131018</version>
-			<!--$NO-MVN-MAN-VER$ -->
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jline</groupId>
-			<artifactId>jline</artifactId>
-			<version>2.12.1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
@@ -322,6 +320,18 @@
 			<artifactId>commons-text</artifactId>
 			<version>${apache.commons-text.version}</version>
 		</dependency>
+		<dependency>
+			<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>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+		</dependency>
 
 		<!-- Test dependencies -->
 		<dependency>
@@ -349,6 +359,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin.external.google</groupId>
+					<artifactId>android-json</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
@@ -573,7 +594,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M4</version>
+				<version>3.1.2</version>
 				<configuration>
 					<!-- Sets the VM argument line used when unit tests are run. -->
 					<argLine>${surefireArgLine}</argLine>
@@ -586,7 +607,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.0.0-M4</version>
+				<version>3.1.2</version>
 				<executions>
 					<!-- Ensures that both integration-test and verify goals of the Failsafe
                      Maven plugin are executed. -->