diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-09-21 21:11:50 +0200 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-09-21 21:11:50 +0200 |
| commit | fb6d819a5175e154c56810e47282d7e7fd7ef9d8 (patch) | |
| tree | fab85b942faf19d3abf2551a8f726ead4a6e8088 /aai-schema-ingest | |
| parent | fa81fb202babb8ee183a342f37f3bbe952ad2023 (diff) | |
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 <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'aai-schema-ingest')
3 files changed, 5 insertions, 5 deletions
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. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.14.7-SNAPSHOT</version> + <version>1.15.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-schema-ingest</artifactId> 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+", ""); |