Spring-boot 3.1 update

- update spring-boot (3.0.13 -> 3.1.12)
- upgrade eclipse persistence (3.0.1 -> 4.0.6)
- bump snapshot version to 1.16.1-SNAPSHOT

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

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 9352ebf..fc39002 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>

diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 7b45014..40c9014 100644 (file)
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>

diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml
index 0b2ce37..fa146d3 100644 (file)
--- a/aai-common-docker/aai-common-images/pom.xml
+++ b/aai-common-docker/aai-common-images/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

     </parent>
 
     <artifactId>aai-common-images</artifactId>
     </parent>
 
     <artifactId>aai-common-images</artifactId>

-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.1-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>aai-aai-common-images</name>
     <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description>
     <packaging>pom</packaging>
     <name>aai-aai-common-images</name>
     <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description>

diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml
index cbbccc0..8aa59d2 100644 (file)
--- a/aai-common-docker/aai-haproxy-image/pom.xml
+++ b/aai-common-docker/aai-haproxy-image/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

     </parent>
 
     <artifactId>aai-haproxy-image</artifactId>
     </parent>
 
     <artifactId>aai-haproxy-image</artifactId>

-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.1-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>aai-aai-haproxy-image</name>
     <description>Contains dockerfiles for aai-haproxy image.</description>
     <packaging>pom</packaging>
     <name>aai-aai-haproxy-image</name>
     <description>Contains dockerfiles for aai-haproxy image.</description>

diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml
index ff78a99..706e1f7 100644 (file)
--- a/aai-common-docker/pom.xml
+++ b/aai-common-docker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 2a34d1e..c6d862a 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>

-               <version>1.16.0-SNAPSHOT</version>
+               <version>1.16.1-SNAPSHOT</version>

                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>


@@ -145,6 +145,7 @@ limitations under the License.
                <dependency>
                        <groupId>org.hamcrest</groupId>
                        <artifactId>hamcrest-junit</artifactId>
                <dependency>
                        <groupId>org.hamcrest</groupId>
                        <artifactId>hamcrest-junit</artifactId>

+                       <version>2.0.0.0</version>

                        <scope>test</scope>
                </dependency>
                <dependency>
                        <scope>test</scope>
                </dependency>
                <dependency>

diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml
index b2c8016..0fc47eb 100644 (file)
--- a/aai-els-onap-logging/pom.xml
+++ b/aai-els-onap-logging/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-els-onap-logging</artifactId>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-els-onap-logging</artifactId>


@@ -47,10 +47,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>

-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-        </dependency>

         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>


@@ -108,7 +104,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

-            <version>1.18.36</version>
+            <version>1.18.38</version>

             <scope>provided</scope>
         </dependency>
         <dependency>
             <scope>provided</scope>
         </dependency>
         <dependency>


@@ -134,25 +130,8 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

-            <version>3.12.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <version>5.18.0</version>

             <scope>test</scope>
         </dependency>
             <scope>test</scope>
         </dependency>

-        <!-- TODO: Migrate tests to junit 5 and remove this dependency -->
-               <dependency>
-                       <groupId>org.junit.vintage</groupId>
-                       <artifactId>junit-vintage-engine</artifactId>
-                       <scope>test</scope>
-                       <exclusions>
-                                       <exclusion>
-                                                       <groupId>org.hamcrest</groupId>
-                                                       <artifactId>hamcrest-core</artifactId>
-                                       </exclusion>
-                       </exclusions>
-        </dependency>

     </dependencies>
 </project>
     </dependencies>
 </project>

diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java
index d0b7b37..d1d9ca6 100644 (file)
--- a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java
+++ b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java
@@ -20,8 +20,8 @@
 
 package org.onap.aai.aailog.filter;
 
 
 package org.onap.aai.aailog.filter;
 

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;

 import static org.mockito.Mockito.when;
 
 import java.net.InetAddress;
 import static org.mockito.Mockito.when;
 
 import java.net.InetAddress;


@@ -29,13 +29,15 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 

-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;

 import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;

-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;

 import org.onap.logging.filter.base.Constants;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.slf4j.MDC;
 import org.onap.logging.filter.base.Constants;
 import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.slf4j.MDC;


@@ -44,7 +46,8 @@ import jakarta.ws.rs.client.ClientRequestContext;
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.MultivaluedMap;
 
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.MultivaluedMap;
 

-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.WARN)
+@ExtendWith(MockitoExtension.class)

 public class RestControllerClientLoggingInterceptorTest {
 
     @Spy
 public class RestControllerClientLoggingInterceptorTest {
 
     @Spy


@@ -54,7 +57,7 @@ public class RestControllerClientLoggingInterceptorTest {
     @InjectMocks
     private RestControllerClientRequestLoggingInterceptor restControllerClientLoggingInterceptor;
 
     @InjectMocks
     private RestControllerClientRequestLoggingInterceptor restControllerClientLoggingInterceptor;
 

-    @Before
+    @BeforeEach

     public void init() throws URISyntaxException {
         System.setProperty("jakarta.ws.rs.ext.RuntimeDelegate", "com.sun.ws.rs.ext.RuntimeDelegateImpl");
         when(clientRequest.getHeaders()).thenReturn(new MultivaluedHashMap<String, Object>());
     public void init() throws URISyntaxException {
         System.setProperty("jakarta.ws.rs.ext.RuntimeDelegate", "com.sun.ws.rs.ext.RuntimeDelegateImpl");
         when(clientRequest.getHeaders()).thenReturn(new MultivaluedHashMap<String, Object>());


@@ -67,7 +70,7 @@ public class RestControllerClientLoggingInterceptorTest {
         // "GET");
     }
 
         // "GET");
     }
 

-    @After
+    @AfterEach

     public void tearDown() {
         MDC.clear();
     }
     public void tearDown() {
         MDC.clear();
     }

diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java
index dee07a4..49d3c13 100644 (file)
--- a/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java
+++ b/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java
@@ -24,22 +24,18 @@ package org.onap.logging.ref.slf4j;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;

+import static org.junit.jupiter.api.Assertions.assertThrows;

 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 

-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;

 
 /**
  * Tests for {@link ONAPLogConstants}.
  */
 public class ONAPLogConstantsTest {
 
 
 /**
  * Tests for {@link ONAPLogConstants}.
  */
 public class ONAPLogConstantsTest {
 

-    @Rule
-    public ExpectedException exceptionRule = ExpectedException.none();
-

     @Test
     public void testConstructors() throws Exception {
         assertInaccessibleConstructor(ONAPLogConstants.class);
     @Test
     public void testConstructors() throws Exception {
         assertInaccessibleConstructor(ONAPLogConstants.class);


@@ -49,12 +45,13 @@ public class ONAPLogConstantsTest {
     }
 
     @Test
     }
 
     @Test

-    public void testConstructorUnsupported() throws Exception {
-        exceptionRule.expect(InvocationTargetException.class);
-        exceptionRule.expectCause(instanceOf(UnsupportedOperationException.class));
-        Constructor<?> c = ONAPLogConstants.class.getDeclaredConstructors()[0];
-        c.setAccessible(true);
-        c.newInstance();
+    public void testConstructorUnsupported() {
+        Throwable exception = assertThrows(InvocationTargetException.class, () -> {
+            Constructor<?> c = ONAPLogConstants.class.getDeclaredConstructors()[0];
+            c.setAccessible(true);
+            c.newInstance();
+        });
+        assertThat(exception.getCause(), instanceOf(UnsupportedOperationException.class));

     }
 
     @Test
     }
 
     @Test


@@ -110,16 +107,12 @@ public class ONAPLogConstantsTest {
     }
 
     
     }
 
     

-    void assertInaccessibleConstructor(final Class<?> c) throws Exception {
-        exceptionRule.expect(IllegalAccessException.class);
-        // Should fail for hidden constructor.
-        c.getDeclaredConstructors()[0].newInstance();
-
-
-        exceptionRule.expect(InvocationTargetException.class);
-        exceptionRule.expectCause(instanceOf(UnsupportedOperationException.class));
-        final Constructor<?> constructor = c.getDeclaredConstructors()[0];
-        constructor.setAccessible(true);
-        constructor.newInstance();
+    void assertInaccessibleConstructor(final Class<?> c) {
+        Throwable exception = assertThrows(InvocationTargetException.class, () -> {
+            final Constructor<?> constructor = c.getDeclaredConstructors()[0];
+            constructor.setAccessible(true);
+            constructor.newInstance();
+        });
+        assertThat(exception.getCause(), instanceOf(UnsupportedOperationException.class));

     }
 }
     }
 }

diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml
index 9c84a53..629b0db 100644 (file)
--- a/aai-failover/pom.xml
+++ b/aai-failover/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index f6e7bd4..71dfbba 100644 (file)
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>

-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.1-SNAPSHOT</version>

   </parent>
   <artifactId>aai-parent</artifactId>
   <name>aai-parent</name>
   </parent>
   <artifactId>aai-parent</artifactId>
   <name>aai-parent</name>


@@ -53,12 +53,11 @@ limitations under the License.
     <commons.net.version>3.8.0</commons.net.version>
     <commons.text.version>1.13.0</commons.text.version>
     <docker.fabric.version>0.40.2</docker.fabric.version>
     <commons.net.version>3.8.0</commons.net.version>
     <commons.text.version>1.13.0</commons.text.version>
     <docker.fabric.version>0.40.2</docker.fabric.version>

-    <eclipse.persistence.version>3.0.1</eclipse.persistence.version>
+    <eclipse.persistence.version>4.0.6</eclipse.persistence.version>

     <google.guava.version>33.4.0-jre</google.guava.version>
     <gremlin.version>3.7.3</gremlin.version>
     <janusgraph.version>1.1.0</janusgraph.version>
     <gson.version>2.9.1</gson.version>
     <google.guava.version>33.4.0-jre</google.guava.version>
     <gremlin.version>3.7.3</gremlin.version>
     <janusgraph.version>1.1.0</janusgraph.version>
     <gson.version>2.9.1</gson.version>

-    <hamcrest.junit.version>2.0.0.0</hamcrest.junit.version>

     <hamcrest.core.version>2.2</hamcrest.core.version>
     <jaxb.version>2.3.1</jaxb.version>
     <jaxrs.version>2.1.1</jaxrs.version>
     <hamcrest.core.version>2.2</hamcrest.core.version>
     <jaxb.version>2.3.1</jaxb.version>
     <jaxrs.version>2.1.1</jaxrs.version>


@@ -79,7 +78,7 @@ limitations under the License.
         Please don't upgrade to 2.3.0 or above for nexus iq or security scans
         as it could potentially break our code
       -->
         Please don't upgrade to 2.3.0 or above for nexus iq or security scans
         as it could potentially break our code
       -->

-    <spring.boot.version>3.0.13</spring.boot.version>
+    <spring.boot.version>3.1.12</spring.boot.version>

     <json.path.version>2.2.0</json.path.version>
     <json.version>20240303</json.version>
     <junit.version>4.12</junit.version>
     <json.path.version>2.2.0</json.path.version>
     <json.version>20240303</json.version>
     <junit.version>4.12</junit.version>


@@ -90,7 +89,7 @@ limitations under the License.
     <opencsv.version>3.1</opencsv.version>
     <plexus.utils.version>3.1.1</plexus.utils.version>
     <reflections.version>0.9.10</reflections.version>
     <opencsv.version>3.1</opencsv.version>
     <plexus.utils.version>3.1.1</plexus.utils.version>
     <reflections.version>0.9.10</reflections.version>

-    <lombok.version>1.18.36</lombok.version>
+    <lombok.version>1.18.38</lombok.version>

     <testcontainers.version>1.20.4</testcontainers.version>
 
     <jakarta.servlet.version>3.1.0</jakarta.servlet.version>
     <testcontainers.version>1.20.4</testcontainers.version>
 
     <jakarta.servlet.version>3.1.0</jakarta.servlet.version>


@@ -103,7 +102,7 @@ limitations under the License.
     <!-- we let things pass by default, set custom level for each child project -->
     <jacoco.line.coverage.limit>0.00</jacoco.line.coverage.limit>
 
     <!-- we let things pass by default, set custom level for each child project -->
     <jacoco.line.coverage.limit>0.00</jacoco.line.coverage.limit>
 

-    <jacoco.version>0.8.12</jacoco.version>
+    <jacoco.version>0.8.13</jacoco.version>

     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
     <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
     <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>


@@ -211,23 +210,12 @@ limitations under the License.
         <version>${slf4j.version}</version>
       </dependency>
 
         <version>${slf4j.version}</version>
       </dependency>
 

-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>java-hamcrest</artifactId>
-        <version>${hamcrest.junit.version}</version>
-      </dependency>
-

       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
         <version>${hamcrest.core.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
         <version>${hamcrest.core.version}</version>
       </dependency>
 

-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-junit</artifactId>
-        <version>${hamcrest.junit.version}</version>
-      </dependency>

       <dependency>
         <groupId>jakarta.annotation</groupId>
         <artifactId>jakarta.annotation-api</artifactId>
       <dependency>
         <groupId>jakarta.annotation</groupId>
         <artifactId>jakarta.annotation-api</artifactId>


@@ -344,7 +332,7 @@ limitations under the License.
       <dependency>
         <groupId>jakarta.xml.bind</groupId>
         <artifactId>jakarta.xml.bind-api</artifactId>
       <dependency>
         <groupId>jakarta.xml.bind</groupId>
         <artifactId>jakarta.xml.bind-api</artifactId>

-        <version>3.0.1</version>
+        <version>4.0.2</version>

       </dependency>
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>

diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index b865b1c..275155a 100644 (file)
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>

diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 3722b28..1753607 100644 (file)
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>

-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.1-SNAPSHOT</version>

     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
 
     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
 


@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>

-      <version>5.14.2</version>
+      <version>5.18.0</version>

       <scope>test</scope>
     </dependency>
     <dependency>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 20a8441..1c5252f 100644 (file)
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>

-               <version>1.16.0-SNAPSHOT</version>
+               <version>1.16.1-SNAPSHOT</version>

                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-schema-ingest</artifactId>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-schema-ingest</artifactId>


@@ -131,22 +131,23 @@ limitations under the License.
                        <artifactId>spring-boot-test</artifactId>
                        <scope>test</scope>
                </dependency>
                        <artifactId>spring-boot-test</artifactId>
                        <scope>test</scope>
                </dependency>

-  <dependency>
-   <groupId>org.hamcrest</groupId>
-   <artifactId>hamcrest-junit</artifactId>
-   <scope>test</scope>
-   <exclusions>
-    <exclusion>
-     <groupId>junit</groupId>
-     <artifactId>junit</artifactId>
-    </exclusion>
-   </exclusions>
-  </dependency>
-  <dependency>
-   <groupId>org.junit.jupiter</groupId>
-   <artifactId>junit-jupiter</artifactId>
-   <scope>test</scope>
-  </dependency>
+               <dependency>
+                       <groupId>org.hamcrest</groupId>
+                       <artifactId>hamcrest-junit</artifactId>
+                       <version>2.0.0.0</version>
+                       <scope>test</scope>
+                       <exclusions>
+                               <exclusion>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               </exclusion>
+                       </exclusions>
+       </dependency>
+               <dependency>
+                       <groupId>org.junit.jupiter</groupId>
+                       <artifactId>junit-jupiter</artifactId>
+                       <scope>test</scope>
+               </dependency>

                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>

diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
index 5d20b45..b643e73 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
@@ -123,7 +123,7 @@ public class MockRestClient extends RestClient {
         InputStream inputStream = getClass().getClassLoader().getResourceAsStream(filename);
 
         String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
         InputStream inputStream = getClass().getClassLoader().getResourceAsStream(filename);
 
         String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);

-        String message = String.format("Unable to find the %s in src/test/resources", filename);
+        String message = "Unable to find the %s in src/test/resources".formatted(filename);

         assertNotNull(inputStream, message);
 
         JsonObject payload = JsonParser.parseString(result).getAsJsonObject();
         assertNotNull(inputStream, message);
 
         JsonObject payload = JsonParser.parseString(result).getAsJsonObject();

diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index 0de7b7c..23f51af 100644 (file)
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>

-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.16.1-SNAPSHOT</version>

         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>

diff --git a/pom.xml b/pom.xml
index 5ec4e77..2877f07 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>

-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.16.1-SNAPSHOT</version>

     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>

diff --git a/version.properties b/version.properties
index 85d1d0c..02346c5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=16
 
 major_version=1
 minor_version=16

-patch_version=0
+patch_version=1

 
 base_version=${major_version}.${minor_version}.${patch_version}
 
 
 base_version=${major_version}.${minor_version}.${patch_version}