From a559cb58bcf4a55ce58b9fc3b3480db371827edd Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 14 Nov 2024 14:15:35 +0100 Subject: Remove eelf-core from aai-common - the dependency is not maintained anymore Issue-ID: AAI-4059 Change-Id: I5f089236e680630bb14bcfd9b29f3b1cd4545574 Signed-off-by: Fiete Ostkamp --- 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 | 7 +------ .../onap/aai/serialization/queryformats/TreeFormat.java | 13 +++++++------ aai-els-onap-logging/pom.xml | 2 +- aai-failover/pom.xml | 2 +- aai-parent/pom.xml | 10 ++-------- aai-rest/pom.xml | 6 +----- aai-schema-abstraction/pom.xml | 17 +---------------- aai-schema-ingest/pom.xml | 6 +----- aai-utils/pom.xml | 17 +---------------- pom.xml | 2 +- version.properties | 2 +- 16 files changed, 25 insertions(+), 73 deletions(-) diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 17d034c4..20549156 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml aai-annotations diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index 13eaeeae..deae9a0a 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.15.2-SNAPSHOT + 1.15.3-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 c1beb781..ebfc7938 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT aai-common-images - 1.15.2-SNAPSHOT + 1.15.3-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 e8048ba2..b0ad4d06 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT aai-haproxy-image - 1.15.2-SNAPSHOT + 1.15.3-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 b7cf7fbd..f34eab43 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 41772b96..45f4fe75 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml aai-core @@ -141,11 +141,6 @@ limitations under the License. - - com.att.eelf - eelf-core - 2.0.0-oss - junit junit diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java index 0da0ec55..0cebca70 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java @@ -20,13 +20,13 @@ package org.onap.aai.serialization.queryformats; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import lombok.extern.slf4j.Slf4j; + import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; @@ -50,8 +50,9 @@ import org.onap.aai.serialization.queryformats.params.Depth; import org.onap.aai.serialization.queryformats.params.NodesOnly; import org.onap.aai.serialization.queryformats.utils.UrlBuilder; +@Slf4j public class TreeFormat extends MultiFormatMapper { - private static final EELFLogger TREE_FORMAT_LOGGER = EELFManager.getInstance().getLogger(TreeFormat.class); + protected final DBSerializer serializer; protected final Loader loader; protected final UrlBuilder urlBuilder; @@ -145,14 +146,14 @@ public class TreeFormat extends MultiFormatMapper { for (Object o : queryResults) { try { return this.formatObjectToJsonArray(o, properties).orElseGet(() -> { - TREE_FORMAT_LOGGER.warn("Empty Optional returned by 'formatObjectToJsonArray'"); + log.warn("Empty Optional returned by 'formatObjectToJsonArray'"); return body; }); } catch (AAIFormatVertexException e) { - TREE_FORMAT_LOGGER + log .warn("Failed to format vertex, returning a partial list " + LogFormatTools.getStackTop(e)); } catch (AAIFormatQueryResultFormatNotSupported e) { - TREE_FORMAT_LOGGER.warn("Failed to format result type of the query " + LogFormatTools.getStackTop(e)); + log.warn("Failed to format result type of the query " + LogFormatTools.getStackTop(e)); } } return body; diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index 65e340cf..a8ea55ac 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml aai-els-onap-logging diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml index 98526e8e..67c3d399 100644 --- a/aai-failover/pom.xml +++ b/aai-failover/pom.xml @@ -5,7 +5,7 @@ org.onap.aai.aai-common aai-parent - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml 4.0.0 diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index 9ffc0379..49c2a768 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT aai-parent aai-parent @@ -92,7 +92,7 @@ limitations under the License. 4.12 4.5.13 1.5.24 - 1.2.13 + 1.2.12 1.7.25 2.17.1 3.4.0 @@ -193,12 +193,6 @@ limitations under the License. ${commons.lang3.version} - - com.att.eelf - eelf-core - ${eelf.core.version} - - ch.qos.logback logback-core diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index 0c981a50..1f94d3a3 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml aai-rest @@ -45,10 +45,6 @@ org.apache.commons commons-lang3 - - com.att.eelf - eelf-core - org.springframework.boot spring-boot-starter-web diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index 8384809c..28413c4b 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml @@ -54,21 +54,6 @@ org.onap.aai.logging-service common-logging - - com.att.eelf - eelf-core - 1.0.1-oss - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - - org.onap.aai.logging-service logging-api diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index bc722c1f..3ee4f2eb 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.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml aai-schema-ingest @@ -148,10 +148,6 @@ limitations under the License. mockito-core test - - com.att.eelf - eelf-core - com.google.code.gson gson diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index 2ce63f68..3d7b9818 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT ../aai-parent/pom.xml aai-utils @@ -38,21 +38,6 @@ - - com.att.eelf - eelf-core - 1.0.1-oss - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - - org.apache.httpcomponents httpclient diff --git a/pom.xml b/pom.xml index 26f1f4f9..b3c0535e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.aai-common aai-common - 1.15.2-SNAPSHOT + 1.15.3-SNAPSHOT pom aai-aai-common Contains all of the common code for resources and traversal repos diff --git a/version.properties b/version.properties index df314753..08fc17cd 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=15 -patch_version=2 +patch_version=3 base_version=${major_version}.${minor_version}.${patch_version} -- cgit 1.2.3-korg