Migrate JAXB to jakarta

- change javax.* JAXB packages to jakarta.*
- bump snapshot version to 1.15.0-SNAPSHOT

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

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 83c6c92..0679e26 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
-        <version>1.14.7-SNAPSHOT</version>
+        <version>1.15.0-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>11</java.version>
@@ -73,7 +73,7 @@
         <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
         <schema.version.edge.label.start>v12</schema.version.edge.label.start>
         <schema.version.api.default>v29</schema.version.api.default>
-        <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29</schema.version.list>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v23,v29</schema.version.list>
         <schema.uri.base.path>/aai</schema.uri.base.path>
         <!-- <schema.translator.list>config</schema.translator.list> -->
         <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
@@ -186,7 +186,7 @@
             <properties>
                 <schema.source.name>onap</schema.source.name>
                 <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v23,v29</schema.version.list>
                 <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file>
             </properties>
         </profile>
@@ -330,16 +330,12 @@
             <version>2.1</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
 
         <dependency>
@@ -738,7 +734,7 @@
         <dependency>
                        <groupId>org.projectlombok</groupId>
                        <artifactId>lombok</artifactId>
-                       <version>1.18.30</version>
+                       <version>1.18.34</version>
                        <scope>provided</scope>
                </dependency>
         <dependency>

diff --git a/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java b/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java
index 31dd953..0c219a7 100644 (file)
--- a/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java
+++ b/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java
@@ -23,7 +23,7 @@ package org.onap.aai.service;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
@@ -54,7 +54,7 @@ public class AuthorizationService {
 
         String basicAuthFile = getBasicAuthFilePath();
 
-        try (Stream<String> stream = Files.lines(Paths.get(basicAuthFile))) {
+        try (Stream<String> stream = Files.lines(Path.of(basicAuthFile))) {
             stream.filter(line -> !line.startsWith("#")).forEach(str -> {
                 byte[] bytes = null;
 

diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties
index 6487dee..f4eccca 100644 (file)
--- a/aai-resources/src/main/resources/application.properties
+++ b/aai-resources/src/main/resources/application.properties
@@ -81,7 +81,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
 
 schema.uri.base.path=/aai
 # Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29
+schema.version.list=v10,v11,v12,v13,v14,v15,v23,v29
 # Specifies from which version should the depth parameter to default to zero
 schema.version.depth.start=v10
 # Specifies from which version should the related link be displayed in response payload

diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
index 2177dac..1ba8652 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.MethodOrderer;
@@ -73,7 +73,7 @@ public class ModelDistributionTest {
                 .expectStatus()
                 .isNotFound();
 
-        String modelPayload = new String(Files.readAllBytes(Paths.get(MODEL_FILE)));
+        String modelPayload = new String(Files.readAllBytes(Path.of(MODEL_FILE)));
         webClient.put()
                 .uri(uri)
                 .accept(MediaType.APPLICATION_XML)
@@ -126,7 +126,7 @@ public class ModelDistributionTest {
                 .expectStatus()
                 .isNotFound();
 
-        String modelPayload = new String(Files.readAllBytes(Paths.get(MODEL_FILE)));
+        String modelPayload = new String(Files.readAllBytes(Path.of(MODEL_FILE)));
         webClient.put()
                 .uri(modelUri)
                 .accept(MediaType.APPLICATION_XML)
@@ -148,7 +148,7 @@ public class ModelDistributionTest {
         ModelVersion modelVersion = objectMapper.readValue(modelVersionResponse, ModelVersion.class);
         assertNull(modelVersion.getModelElements());
 
-        String updatePayload = new String(Files.readAllBytes(Paths.get(UPDATE_MODEL_FILE)))
+        String updatePayload = new String(Files.readAllBytes(Path.of(UPDATE_MODEL_FILE)))
                 .replace("resourceVersion", modelVersion.getResourceVersion());
         webClient.put()
                 .uri(modelVersionUri)

diff --git a/pom.xml b/pom.xml
index a333065..f1ac750 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,17 +26,18 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.14.7</version>
+        <version>1.15.0-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.14.7-SNAPSHOT</version>
+    <version>1.15.0-SNAPSHOT</version>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
         <module>aai-resources</module>
     </modules>
     <properties>
+        <maven.compiler.release>11</maven.compiler.release>
         <!--
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
@@ -48,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.14.7</aai.common.version>
+        <aai.common.version>1.15.0-SNAPSHOT</aai.common.version>
         <aai.schema.service.version>1.12.5</aai.schema.service.version>
     </properties>
   <dependencies>

diff --git a/version.properties b/version.properties
index e8f490e..039d36d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=14
-patch_version=7
+minor_version=15
+patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}