From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Fri, 8 Nov 2024 13:32:54 +0000 (+0100)
Subject: Upgrade spring boot to 2.6
X-Git-Tag: 1.15.2^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1ef9bda6c690656920dff691dbbba873ec7595b3;p=aai%2Ftraversal.git

Upgrade spring boot to 2.6

- upgrade spring-boot (2.5.15 -> 2.6.15)

Issue-ID: AAI-4048
Change-Id: I1e8324ae71f4d9aab06d51bf9d4efce6d42b316a
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 5b3158e2..11d271d4 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.onap.aai.traversal</groupId>
 		<artifactId>traversal</artifactId>
-		<version>1.15.1-SNAPSHOT</version>
+		<version>1.15.2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.onap.aai.traversal</groupId>
 	<artifactId>aai-traversal</artifactId>
@@ -94,11 +94,11 @@
 		<janusgraph.version>1.0.0</janusgraph.version>
 		<gremlin.version>3.7.1</gremlin.version>
 
-		<spring-cloud.version>2020.0.6</spring-cloud.version>
+		<spring-cloud.version>2021.0.9</spring-cloud.version>
 
 		<!-- fix the driver version to match the one defined in janusgraph-cql
-				spring-boot (2.4) is otherwise downgrading it to 4.9.0 -->
-		<!-- see https://github.com/spring-projects/spring-boot/blob/d336a96b7f204a398b8237560c5dfa7095c53460/spring-boot-project/spring-boot-dependencies/build.gradle#L163 -->
+				spring-boot (2.6) is otherwise downgrading it to 4.13.0 -->
+		<!-- see https://github.com/spring-projects/spring-boot/blob/f8c9fee3b0c8ff9ef48cf12fb4a9f8a51630a485/spring-boot-project/spring-boot-dependencies/build.gradle#L170 -->
 		<!-- see https://github.com/JanusGraph/janusgraph/blob/6105d67f412def90ed6e704fa01cbf656602e6c9/pom.xml#L112 -->
 		<cassandra-driver.version>4.17.0</cassandra-driver.version>
 		<datastax.native-protocol.version>1.5.1</datastax.native-protocol.version>
@@ -322,25 +322,6 @@
 			<artifactId>jopt-simple</artifactId>
 			<version>${jopt.simple.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.ws.rs</groupId>
-					<artifactId>jsr311-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-jersey2-jaxrs</artifactId>
-			<version>${io.swagger.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties
index b4f7c598..d3baa15a 100644
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -133,6 +133,7 @@ management.endpoints.enabled-by-default=true
 management.endpoints.web.exposure.include=info, health, prometheus
 management.metrics.web.server.request.autotime.enabled=false
 management.metrics.tags.group_id=aai
+management.info.env.enabled=true
 # management.metrics.tags.app_id=${info.build.artifact}
 #Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584
 scrape.uri.metrics=true
diff --git a/pom.xml b/pom.xml
index c17796a9..4829b0fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.1</version>
+        <version>1.15.2</version>
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
-    <version>1.15.1-SNAPSHOT</version>
+    <version>1.15.2-SNAPSHOT</version>
     <name>aai-traversal</name>
     <packaging>pom</packaging>
     <modules>
@@ -42,7 +42,7 @@
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
         -->
-        <aai.common.version>1.15.1</aai.common.version>
+        <aai.common.version>1.15.2</aai.common.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path>
         <release.path>/content/repositories/releases/</release.path>
diff --git a/version.properties b/version.properties
index bcf6bda9..df314753 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=15
-patch_version=1
+patch_version=2
 
 base_version=${major_version}.${minor_version}.${patch_version}