From dc7a552c80013fdf7701705890c70674271fd7da Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 2 Jan 2024 13:02:39 +0100 Subject: Update spring boot to 2.2 - update spring dependency to 2.2.13 - remove profile based switch between spring versions 1.5.22 and 2.1.12 - migrate testng based tests in aai-els-onap-logging to junit 4 - rely more on boms for dependencyManagement by removing separate declarations (of spring and jackson) - resolve some build warnings by adding dependency + plugin versions - resolve some build warnings by removing duplicate declarations of dependencies - resolve build warning about ambiguous reference to JsonObject.addProperty() Issue-ID: AAI-3711 Change-Id: I7559e90ffb65199ee46bc5b7cdf5d9e73b7d87bc Signed-off-by: Fiete Ostkamp --- aai-schema-ingest/src/test/resources/edgerequests.json | 18 +++++++++--------- aai-schema-ingest/src/test/resources/mockrequests.json | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'aai-schema-ingest/src/test') diff --git a/aai-schema-ingest/src/test/resources/edgerequests.json b/aai-schema-ingest/src/test/resources/edgerequests.json index 0878686f..28f5da79 100644 --- a/aai-schema-ingest/src/test/resources/edgerequests.json +++ b/aai-schema-ingest/src/test/resources/edgerequests.json @@ -4,47 +4,47 @@ { "aai-uri": "/versions", "response-file": "payload/versions.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v8", "response-file": "edgeRules/test_v8.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v9", "response-file": "edgeRules/test_v9.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v10", "response-file": "edgeRules/test_v10.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v11", "response-file": "edgeRules/test_v11.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v12", "response-file": "edgeRules/test_v12.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v13", "response-file": "edgeRules/test_v13.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v14", "response-file": "edgeRules/test_v14.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/edgerules?version=v15", "response-file": "edgeRules/test_v15.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" } ] } diff --git a/aai-schema-ingest/src/test/resources/mockrequests.json b/aai-schema-ingest/src/test/resources/mockrequests.json index 7d669007..db7c6e66 100644 --- a/aai-schema-ingest/src/test/resources/mockrequests.json +++ b/aai-schema-ingest/src/test/resources/mockrequests.json @@ -4,47 +4,47 @@ { "aai-uri": "/versions", "response-file": "payload/versions.json", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v8", "response-file": "oxm/test_combined_network_business_v8.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v9", "response-file": "oxm/test_combined_network_business_v9.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v10", "response-file": "oxm/test_combined_network_business_v10.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v11", "response-file": "oxm/test_combined_network_business_v11.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v12", "response-file": "oxm/test_combined_network_business_v12.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v13", "response-file": "oxm/test_combined_v13.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v14", "response-file": "oxm/test_combined_network_business_v14.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" }, { "aai-uri": "/nodes?version=v15", "response-file": "oxm/test_combined_network_business_v15.xml", - "content": "application/json;charset=UTF-8" + "content": "application/json" } ] -- cgit 1.2.3-korg