aboutsummaryrefslogtreecommitdiffstats
path: root/aai-resources/src/main
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-09-21 21:41:29 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-09-22 18:16:38 +0200
commit4d1b2cd24f060b1a4849f411a09a04346f22dc06 (patch)
tree00aacc5f811e4d79c2e9688ff2f0b72ad54aebe0 /aai-resources/src/main
parente40453c7a7cc6258fd9aa58e0dbb45bac0fbdbfb (diff)
Migrate JAXB to jakartaHEADmaster
- 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>
Diffstat (limited to 'aai-resources/src/main')
-rw-r--r--aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java4
-rw-r--r--aai-resources/src/main/resources/application.properties2
2 files changed, 3 insertions, 3 deletions
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
--- 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
--- 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