From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Thu, 2 Jan 2025 10:25:51 +0000 (+0100)
Subject: Upgrade slf4j in aai-common
X-Git-Tag: 1.15.4~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F139798%2F1;p=aai%2Faai-common.git

Upgrade slf4j in aai-common

- upgrade slf4j (1.7.25->1.7.36)
- add all slf4j dependencies to dependencyManagement

Issue-ID: AAI-4092
Change-Id: I57f970253ccd200646048c41463769bafe07911e
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 26e5bc9a..9ffae3c4 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -365,12 +365,6 @@ limitations under the License.
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
 		</dependency>
-		<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>${log4j.version}</version>
-				<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 865a8a7c..f56e132a 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -93,8 +93,7 @@ limitations under the License.
     <httpclient.version>4.5.13</httpclient.version>
     <io.swagger.version>1.5.24</io.swagger.version>
     <logback.version>1.2.13</logback.version>
-    <slf4j.version>1.7.25</slf4j.version>
-    <log4j.version>2.17.1</log4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
     <mockito.all.version>3.4.0</mockito.all.version>
     <mockito.core.version>3.4.0</mockito.core.version>
     <opencsv.version>3.1</opencsv.version>
@@ -210,6 +209,18 @@ limitations under the License.
         <version>${slf4j.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>java-hamcrest</artifactId>
@@ -429,13 +440,6 @@ limitations under the License.
         <version>${opencsv.version}</version>
       </dependency>
 
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <version>${log4j.version}</version>
-          <type>pom</type>
-      </dependency>
-
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 23404b20..43c3c64a 100644
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -33,10 +33,6 @@ limitations under the License.
 	<name>aai-schema-ingest</name>
 	<packaging>jar</packaging>
 
-	<properties>
-		<httpclient.version>4.5.13</httpclient.version>
-		<springframework.version>4.3.24.RELEASE</springframework.version>
-	</properties>
 	<build>
 		<plugins>
 			<plugin>
@@ -117,6 +113,14 @@ limitations under the License.
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 		</dependency>
+		    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
diff --git a/pom.xml b/pom.xml
index 0786290d..f8697d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,11 +225,6 @@
 
     <!-- Start of ONAP Specific Repositories -->
     <repositories>
-        <repository>
-            <id>Log4j</id>
-            <name>Log4J repository</name>
-            <url>https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j</url>
-        </repository>
         <repository>
             <id>AJSC</id>
             <name>AJSC repository</name>