Update aai-common to 1.17.1-SNAPSHOT

- spring-boot (3.1.12 -> 3.2.12)
- netty-all (4.1.110 -> 4.1.130)

Issue-ID: AAI-4222
Change-Id: I44f8478fcefbcd0316ce26e983ea9598edf63475
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index c3e4b29..7d85f0d 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -80,7 +80,6 @@
         <!-- <gremlin.version>3.5.8</gremlin.version> -->
         <janusgraph.version>1.0.1</janusgraph.version>
 
-        <javax.servlet.version>4.0.1</javax.servlet.version>
         <testcontainers.version>1.20.4</testcontainers.version>
         <mockito.core.version>4.4.0</mockito.core.version>
         <!-- Setting some default value to not complain by editor but it will be overridden by gmaven plugin -->
@@ -323,11 +322,6 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-jersey2</artifactId>
-            <version>1.8.13</version>
-        </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
@@ -857,6 +851,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <runOrder>alphabetical</runOrder>
+                    <systemPropertyVariables>
+                        <AJSC_HOME>.</AJSC_HOME>
+                        <BUNDLECONFIG_DIR>src/main/resources</BUNDLECONFIG_DIR>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/aai-resources/src/main/java/org/onap/aai/web/MicrometerConfiguration.java b/aai-resources/src/main/java/org/onap/aai/web/MicrometerConfiguration.java
index a701a20..74a83f3 100644 (file)
--- a/aai-resources/src/main/java/org/onap/aai/web/MicrometerConfiguration.java
+++ b/aai-resources/src/main/java/org/onap/aai/web/MicrometerConfiguration.java
@@ -22,8 +22,8 @@ package org.onap.aai.web;
 
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
-import io.micrometer.jersey2.server.JerseyTags;
-import io.micrometer.jersey2.server.JerseyTagsProvider;
+import io.micrometer.core.instrument.binder.jersey.server.JerseyTags;
+import io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider;
 
 import org.glassfish.jersey.server.ContainerResponse;
 import org.glassfish.jersey.server.monitoring.RequestEvent;

diff --git a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties
index cd19734..40865ce 100644 (file)
--- a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties
+++ b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties
@@ -95,6 +95,8 @@ aai.crud.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,
 
 #default timeout limit added for crud if not overridden (in ms)
 aai.crud.timeoutlimit=100000
+aai.lock.rv.enabled=false
+aai.lock.uri.enabled=false
 
 #limit set for bulk consumer APIS
 aai.bulkconsumer.payloadlimit=30
@@ -166,3 +168,6 @@ aai.graph.checker.task.delay=5
 
 # Period, in seconds, between two consecutive executions of the scheduled task, if enabled
 aai.graph.checker.task.period=10
+
+aai.notification.depth.all.enabled=false
+aai.notification.both.sides.enabled=false

diff --git a/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
index 3ddb5ae..f033d0b 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/resources/ResourcesControllerTest.java
@@ -70,8 +70,8 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
 
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @Import(WebClientConfiguration.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class ResourcesControllerTest {
 
     private static final Logger logger = LoggerFactory.getLogger(ResourcesController.class.getName());

diff --git a/pom.xml b/pom.xml
index e9e27a9..6db1322 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.17.0</version>
+        <version>1.17.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
@@ -49,7 +49,7 @@
         <staging.path>/content/repositories/staging/</staging.path>
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
-        <aai.common.version>1.17.0</aai.common.version>
+        <aai.common.version>1.17.1-SNAPSHOT</aai.common.version>
         <aai.schema.service.version>1.14.0-SNAPSHOT</aai.schema.service.version>
         <sonar.scanner.version>3.11.0.3922</sonar.scanner.version>
     </properties>