From fb6d819a5175e154c56810e47282d7e7fd7ef9d8 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sat, 21 Sep 2024 21:11:50 +0200 Subject: [PATCH] Migrate JAXB to jakarta - change javax.* JAXB packages to jakarta.* - bump snapshot version to 1.15.0-SNAPSHOT Issue-ID: AAI-4005 Change-Id: I2a208f717206a2ee8c2acaec8abb0a04fc620123 Signed-off-by: Fiete Ostkamp --- aai-aaf-auth/pom.xml | 2 +- .../java/org/onap/aai/aaf/auth/AAIAuthCore.java | 4 +-- aai-annotations/pom.xml | 2 +- aai-auth/pom.xml | 2 +- aai-common-docker/aai-common-images/pom.xml | 4 +-- aai-common-docker/aai-haproxy-image/pom.xml | 4 +-- aai-common-docker/pom.xml | 2 +- aai-core/pom.xml | 16 +++++------- .../aai/introspection/sideeffect/SideEffect.java | 2 +- .../parsers/relationship/RelationshipToURI.java | 4 +-- .../main/java/org/onap/aai/rest/db/HttpEntry.java | 2 +- .../onap/aai/serialization/db/EdgeSerializer.java | 4 +-- .../aai/serialization/queryformats/Aggregate.java | 2 +- .../onap/aai/serialization/queryformats/Count.java | 2 +- .../aai/serialization/queryformats/Formatter.java | 2 +- .../queryformats/LifecycleFormat.java | 2 +- .../aai/kafka/AAIKafkaEventIntegrationTest.java | 4 +-- .../serialization/queryformats/PathedURLTest.java | 4 +-- aai-els-onap-logging/pom.xml | 8 +++--- aai-failover/pom.xml | 2 +- .../org/onap/aai/failover/FailoverMonitor.java | 3 +-- aai-parent/pom.xml | 29 +++++++++------------- aai-rest/pom.xml | 2 +- aai-schema-abstraction/pom.xml | 2 +- .../aai/schemaif/json/JsonSchemaProviderTest.java | 6 ++--- aai-schema-ingest/pom.xml | 2 +- .../org/onap/aai/nodes/NodeIngestorLocalTest.java | 4 +-- .../java/org/onap/aai/nodes/NodeIngestorTest.java | 4 +-- aai-utils/pom.xml | 11 +++++--- pom.xml | 10 ++------ version.properties | 4 +-- 31 files changed, 70 insertions(+), 81 deletions(-) diff --git a/aai-aaf-auth/pom.xml b/aai-aaf-auth/pom.xml index 8be62915..113ca78f 100644 --- a/aai-aaf-auth/pom.xml +++ b/aai-aaf-auth/pom.xml @@ -6,7 +6,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-aaf-auth diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/auth/AAIAuthCore.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/auth/AAIAuthCore.java index 72e2295e..a951417b 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/auth/AAIAuthCore.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/auth/AAIAuthCore.java @@ -30,7 +30,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; @@ -154,7 +154,7 @@ public final class AAIAuthCore { try { LOGGER.debug("Reading from " + globalAuthFileName); - String authFile = new String(Files.readAllBytes(Paths.get(globalAuthFileName))); + String authFile = new String(Files.readAllBytes(Path.of(globalAuthFileName))); JsonObject authObject = JsonParser.parseString(authFile).getAsJsonObject(); if (authObject.has("roles")) { diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 0a7044fc..666da2c1 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-annotations diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index f3e22bcc..4eb17c3d 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-auth diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml index 267fb3d2..89715bf1 100644 --- a/aai-common-docker/aai-common-images/pom.xml +++ b/aai-common-docker/aai-common-images/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT aai-common-images - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT pom aai-aai-common-images Contains dockerfiles for aai-common images (alpine and ubuntu based). diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml index 8b98e471..6916f0c1 100644 --- a/aai-common-docker/aai-haproxy-image/pom.xml +++ b/aai-common-docker/aai-haproxy-image/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT aai-haproxy-image - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT pom aai-aai-haproxy-image Contains dockerfiles for aai-haproxy image. diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml index c6c629bb..97710d2b 100644 --- a/aai-common-docker/pom.xml +++ b/aai-common-docker/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-core/pom.xml b/aai-core/pom.xml index e53d233c..b66e1374 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -26,7 +26,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-core @@ -213,16 +213,12 @@ limitations under the License. json-simple - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl - - - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime org.eclipse.persistence @@ -410,7 +406,7 @@ limitations under the License. org.projectlombok lombok - 1.18.30 + 1.18.34 provided diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java index bec46520..ce802c7a 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java @@ -136,7 +136,7 @@ public abstract class SideEffect { } private Optional resolveRelativePath(Optional populatedUri) throws UnsupportedEncodingException { - if (!populatedUri.isPresent()) { + if (populatedUri.isEmpty()) { return Optional.empty(); } else { return Optional.of(populatedUri.get().replaceFirst("\\./", this.serializer.getURIForVertex(self) + "/")); diff --git a/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java index 95b1517d..af9d8aa1 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java @@ -112,12 +112,12 @@ public class RelationshipToURI { try { if (loader.getVersion().compareTo(schemaVersions.getRelatedLinkVersion()) >= 0) { result = processRelatedLink(relatedLink); - if (!result.isPresent()) { + if (result.isEmpty()) { result = processRelationshipData(); } } else { result = processRelationshipData(); - if (!result.isPresent()) { + if (result.isEmpty()) { result = processRelatedLink(relatedLink); } } diff --git a/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java index 94dc63aa..c4f84396 100644 --- a/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java +++ b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java @@ -384,7 +384,7 @@ public class HttpEntry { if (obj != null) { status = Status.OK; MarshallerProperties properties; - if (!request.getMarshallerProperties().isPresent()) { + if (request.getMarshallerProperties().isEmpty()) { properties = new MarshallerProperties.Builder( org.onap.aai.restcore.MediaType.getEnum(outputMediaType)).build(); } else { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeSerializer.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeSerializer.java index 0d491c9d..ce3891ee 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeSerializer.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeSerializer.java @@ -112,7 +112,7 @@ public class EdgeSerializer { if (message.isPresent() && !isBestEffort) { throw new EdgeMultiplicityException(message.get()); } - if (!message.isPresent()) { + if (message.isEmpty()) { if (rule.getDirection().equals(Direction.OUT)) { e = aVertex.addEdge(rule.getLabel(), bVertex); } else if (rule.getDirection().equals(Direction.IN)) { @@ -185,7 +185,7 @@ public class EdgeSerializer { if (message.isPresent() && !isBestEffort) { throw new EdgeMultiplicityException(message.get()); } - if (!message.isPresent()) { + if (message.isEmpty()) { if (rule.getDirection().equals(Direction.OUT)) { e = aVertex.addEdge(rule.getLabel(), bVertex); } else if (rule.getDirection().equals(Direction.IN)) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java index 71f7bc78..54fc4eb0 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java @@ -177,7 +177,7 @@ public class Aggregate extends MultiFormatMapper { } return Optional.empty(); - }).filter(Optional::isPresent).map(Optional::get).forEach(json -> { + }).flatMap(Optional::stream).forEach(json -> { if (isParallel) { synchronized (body) { body.add(json); diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java index 216d021d..c736eab8 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java @@ -44,7 +44,7 @@ public class Count implements FormatMapper { final JsonObject countResult = new JsonObject(); - list.stream().map(this::getCount).filter(Optional::isPresent).map(Optional::get) + list.stream().map(this::getCount).flatMap(Optional::stream) .collect(Collectors.toConcurrentMap(Pair::getValue0, Pair::getValue1, Long::sum)) .forEach(countResult::addProperty); diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java index da5d5425..10f1edc4 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java @@ -102,7 +102,7 @@ public class Formatter { } return Optional.empty(); - }).filter(Optional::isPresent).map(Optional::get).forEach(json -> { + }).flatMap(Optional::stream).forEach(json -> { if (isParallel) { synchronized (body) { body.add(json); diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/LifecycleFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/LifecycleFormat.java index 74742c98..fbe74e28 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/LifecycleFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/LifecycleFormat.java @@ -267,7 +267,7 @@ public class LifecycleFormat extends HistoryFormat { } return Optional.empty(); - }).filter(Optional::isPresent).map(Optional::get).forEach(json -> { + }).flatMap(Optional::stream).forEach(json -> { if (isParallel) { synchronized (body) { body.add(json); diff --git a/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java b/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java index 56a6a857..ce636a51 100644 --- a/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java +++ b/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import java.io.IOException; import java.net.URI; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -129,7 +129,7 @@ public class AAIKafkaEventIntegrationTest extends AAISetup { traversalUriHttpEntry.setHttpEntryProperties(new SchemaVersion("v14")); String pserverUri = "/aai/v14/cloud-infrastructure/pservers/pserver/pserver1"; - String entity = new String(Files.readAllBytes(Paths.get("src/test/resources/payloads/templates/pserver.json"))).replace("${hostname}", "pserver1"); + String entity = new String(Files.readAllBytes(Path.of("src/test/resources/payloads/templates/pserver.json"))).replace("${hostname}", "pserver1"); DBRequest dbRequest = createDBRequest(pserverUri, entity); List dbRequests = new ArrayList<>(); dbRequests.add(dbRequest); diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java index 6ed42539..cd2c3af3 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java @@ -127,7 +127,7 @@ public class PathedURLTest extends AAISetup { when(urlBuilder.pathed(pserver)).thenReturn("/aai/v14/cloud-infrastructure/pservers/pserver/hostname-1"); Optional jsonObjectOptional = pathedURL.getJsonFromVertex(pserver); - if (!jsonObjectOptional.isPresent()) { + if (jsonObjectOptional.isEmpty()) { fail("Expecting an json object returned from pathed url but returned none"); } @@ -150,7 +150,7 @@ public class PathedURLTest extends AAISetup { when(urlBuilder.pathed(pserver)).thenReturn("/aai/v14/cloud-infrastructure/pservers/pserver/hostname-1"); Optional jsonObjectOptional = pathedURL.getJsonFromVertex(pserver); - if (!jsonObjectOptional.isPresent()) { + if (jsonObjectOptional.isEmpty()) { fail("Expecting an json object returned from pathed url but returned none"); } diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index bf4c00f3..f9eb7858 100644 --- a/aai-els-onap-logging/pom.xml +++ b/aai-els-onap-logging/pom.xml @@ -4,7 +4,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-els-onap-logging @@ -65,8 +65,8 @@ compile - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided @@ -129,7 +129,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.34 provided diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml index 14c01b33..cc6ad1f1 100644 --- a/aai-failover/pom.xml +++ b/aai-failover/pom.xml @@ -5,7 +5,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml 4.0.0 diff --git a/aai-failover/src/main/java/org/onap/aai/failover/FailoverMonitor.java b/aai-failover/src/main/java/org/onap/aai/failover/FailoverMonitor.java index 731abe7c..111ac6b2 100644 --- a/aai-failover/src/main/java/org/onap/aai/failover/FailoverMonitor.java +++ b/aai-failover/src/main/java/org/onap/aai/failover/FailoverMonitor.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Properties; import org.springframework.beans.factory.annotation.Value; @@ -42,7 +41,7 @@ public class FailoverMonitor { public boolean shouldRun() throws IOException { - Path failoverPath = Paths.get(failoverPropertiesPath); + Path failoverPath = Path.of(failoverPropertiesPath); if (Files.exists(failoverPath)) { Properties properties = new Properties(); diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index d9b0c6ad..45033490 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.aai.aai-common aai-common - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT aai-parent aai-parent @@ -38,6 +38,7 @@ limitations under the License. + 11 ${aai.common.version} 1.8.0 @@ -119,7 +120,7 @@ limitations under the License. 0.00 - 0.8.5 + 0.8.12 3.2 jacoco ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml @@ -273,9 +274,9 @@ limitations under the License. provided - javax.annotation - javax.annotation-api - ${javax.annotation.version} + jakarta.annotation + jakarta.annotation-api + 1.3.5 @@ -386,9 +387,9 @@ limitations under the License. - javax.xml.bind - jaxb-api - ${jaxb.version} + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 @@ -436,15 +437,9 @@ limitations under the License. - com.sun.xml.bind - jaxb-impl - ${old.jaxb.version} - - - - com.sun.xml.bind - jaxb-core - ${old.jaxb.version} + org.glassfish.jaxb + jaxb-runtime + 2.3.9 diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index a514b11c..d650ef0a 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-rest diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index cbf128ee..fa33d3e7 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -28,7 +28,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java index 9011dfa2..a4c7546d 100644 --- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java +++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java @@ -33,7 +33,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.List; import java.util.Set; import java.util.zip.ZipEntry; @@ -74,7 +74,7 @@ public class JsonSchemaProviderTest { ByteArrayOutputStream fos = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(fos); zos.putNextEntry(new ZipEntry("schemaServiceResponse.json")); - byte[] fileData = Files.readAllBytes(Paths.get("src/test/resources/json/schemaServiceResponse.json")); + byte[] fileData = Files.readAllBytes(Path.of("src/test/resources/json/schemaServiceResponse.json")); zos.write(fileData, 0, fileData.length); zos.closeEntry(); zos.close(); @@ -591,7 +591,7 @@ public class JsonSchemaProviderTest { } static String readFile(String path) throws IOException { - byte[] encoded = Files.readAllBytes(Paths.get(path)); + byte[] encoded = Files.readAllBytes(Path.of(path)); return new String(encoded); } } diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 700db49b..c4296227 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -26,7 +26,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-schema-ingest diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java index 6e00eb73..f26e603a 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import javax.xml.bind.SchemaOutputResolver; import javax.xml.transform.OutputKeys; @@ -152,7 +152,7 @@ public class NodeIngestorLocalTest { ctx13.generateSchema(outputResolver13); ByteArrayOutputStream buffer = new ByteArrayOutputStream(); printDocument(nodeIngestor.getSchema(new SchemaVersion("v13")), buffer); - String content = new String(Files.readAllBytes(Paths.get("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); + String content = new String(Files.readAllBytes(Path.of("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); content = content.replaceAll("\\s+", ""); String expected = buffer.toString().replaceAll("\\s+", ""); diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java index fff22116..053004bd 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import javax.xml.bind.SchemaOutputResolver; import javax.xml.transform.OutputKeys; @@ -145,7 +145,7 @@ public class NodeIngestorTest { ctx13.generateSchema(outputResolver13); ByteArrayOutputStream buffer = new ByteArrayOutputStream(); printDocument(nodeIngestor.getSchema(new SchemaVersion("v13")), buffer); - String content = new String(Files.readAllBytes(Paths.get("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); + String content = new String(Files.readAllBytes(Path.of("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); content = content.replaceAll("\\s+", ""); String expected = buffer.toString().replaceAll("\\s+", ""); diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index a9d4aebe..d20ab95a 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT ../aai-parent/pom.xml aai-utils @@ -63,8 +63,8 @@ eclipselink - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api @@ -76,6 +76,11 @@ org.springframework spring-core + + org.glassfish.jaxb + jaxb-runtime + runtime + com.fasterxml.jackson.core jackson-core diff --git a/pom.xml b/pom.xml index 567cde1a..af1b7910 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.aai-common aai-common - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT pom aai-aai-common Contains all of the common code for resources and traversal repos @@ -110,8 +110,7 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 11 @@ -237,11 +236,6 @@ AJSC repository https://mvnrepository.com/artifact/com.att.ajsc - - restlet - maven reslet - https://maven.restlet.com/ - ecomp-releases ECOMP Release Repository diff --git a/version.properties b/version.properties index e8f490ec..039d36d6 100644 --- 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} -- 2.16.6