This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/agent-framewok-refactoring by
this push:
new bdb538e151 upgraded the sfl4j version
bdb538e151 is described below
commit bdb538e15110aa24daffec812816a021a9ed58dd
Author: lahiruj <[email protected]>
AuthorDate: Mon Feb 17 20:13:53 2025 -0500
upgraded the sfl4j version
---
airavata-services/profile-service/profile-service-commons/pom.xml | 6 ++++++
modules/distribution/pom.xml | 8 ++++++++
.../distribution/src/main/assembly/controller-bin-assembly.xml | 2 +-
.../distribution/src/main/assembly/email-monitor-bin-assembly.xml | 2 +-
modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml | 2 +-
.../distribution/src/main/assembly/participant-bin-assembly.xml | 2 +-
modules/distribution/src/main/assembly/post-wm-bin-assembly.xml | 2 +-
modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml | 2 +-
.../src/main/assembly/realtime-monitor-bin-assembly.xml | 2 +-
modules/registry/registry-tools/registry-tool/pom.xml | 1 -
modules/sharing-registry/sharing-registry-distribution/pom.xml | 6 ++++++
pom.xml | 6 +++---
12 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml
b/airavata-services/profile-service/profile-service-commons/pom.xml
index 6ef8692567..370ad62cd9 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -44,6 +44,12 @@
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
<version>${dozer.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 00df7bc48f..20b544ba76 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -315,6 +315,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index 0083f219bb..d16a2c4ee4 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -160,7 +160,7 @@
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
diff --git
a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index e21c72bfa7..c0519fbb09 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -120,7 +120,7 @@
<include>org.apache.logging.log4j:log4j-api</include>
<include>org.apache.logging.log4j:log4j-core</include>
<include>org.apache.logging.log4j:log4j-1.2-api</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index 97732c6b6c..1e99a1a695 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -132,7 +132,7 @@
<include>org.slf4j:log4j-over-slf4j:jar</include>
<include>org.apache.logging.log4j:log4j-api</include>
<include>org.apache.logging.log4j:log4j-core</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.logging.log4j:log4j-1.2-api</include>
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
diff --git
a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index fc7c456719..a44c481803 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -162,7 +162,7 @@
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.airavata:profile-service-stubs:jar</include>
<include>org.apache.airavata:services-security:jar</include>
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index a122a4e87a..59c0c238ce 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -165,7 +165,7 @@
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index 373b3db9b6..791c84175d 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -161,7 +161,7 @@
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.airavata:profile-service-stubs:jar</include>
<include>org.apache.airavata:services-security:jar</include>
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
diff --git
a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
index 330603bb25..e446f3114a 100644
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -114,7 +114,7 @@
<include>org.apache.logging.log4j:log4j-api</include>
<include>org.apache.logging.log4j:log4j-core</include>
<include>org.apache.logging.log4j:log4j-1.2-api</include>
-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
diff --git a/modules/registry/registry-tools/registry-tool/pom.xml
b/modules/registry/registry-tools/registry-tool/pom.xml
index effe7e44e0..08e923de1d 100644
--- a/modules/registry/registry-tools/registry-tool/pom.xml
+++ b/modules/registry/registry-tools/registry-tool/pom.xml
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml
b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index 9aab4e8fad..c588815286 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -43,6 +43,12 @@
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
<version>${dozer.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
diff --git a/pom.xml b/pom.xml
index 6487b69ecf..c9440ed83c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.13.1.1</derby.version>
<org.slf4j.version>2.0.16</org.slf4j.version>
- <log4j2.slf4j.impl>2.18.0</log4j2.slf4j.impl>
+ <log4j2.slf4j.impl>2.24.0</log4j2.slf4j.impl>
<log4j2.version>2.24.0</log4j2.version>
<surefire.version>3.0.0-M4</surefire.version>
<junit.version>4.12</junit.version>
@@ -172,7 +172,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j18-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -204,7 +204,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j18-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.slf4j.impl}</version>
</dependency>
<dependency>
