Skip to content

Commit bdb538e

Browse files
upgraded the sfl4j version
1 parent efa5548 commit bdb538e

File tree

12 files changed

+30
-11
lines changed

12 files changed

+30
-11
lines changed

airavata-services/profile-service/profile-service-commons/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<groupId>net.sf.dozer</groupId>
4545
<artifactId>dozer</artifactId>
4646
<version>${dozer.version}</version>
47+
<exclusions>
48+
<exclusion>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>slf4j-log4j12</artifactId>
51+
</exclusion>
52+
</exclusions>
4753
</dependency>
4854
<dependency>
4955
<groupId>org.apache.openjpa</groupId>

modules/distribution/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,14 @@
315315
<groupId>log4j</groupId>
316316
<artifactId>log4j</artifactId>
317317
</exclusion>
318+
<exclusion>
319+
<groupId>ch.qos.logback</groupId>
320+
<artifactId>logback-classic</artifactId>
321+
</exclusion>
322+
<exclusion>
323+
<groupId>ch.qos.logback</groupId>
324+
<artifactId>logback-core</artifactId>
325+
</exclusion>
318326
</exclusions>
319327
</dependency>
320328
<dependency>

modules/distribution/src/main/assembly/controller-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<include>org.apache.zookeeper:zookeeper:jar</include>
161161
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
162162
<include>io.netty:netty-handler:jar</include>
163-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
163+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
164164

165165
<include>org.apache.commons:commons-pool2:jar</include>
166166
<include>org.json:json:jar</include>

modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<include>org.apache.logging.log4j:log4j-api</include>
121121
<include>org.apache.logging.log4j:log4j-core</include>
122122
<include>org.apache.logging.log4j:log4j-1.2-api</include>
123-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
123+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
124124
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
125125
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
126126
<include>org.apache.commons:commons-pool2:jar</include>

modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<include>org.slf4j:log4j-over-slf4j:jar</include>
133133
<include>org.apache.logging.log4j:log4j-api</include>
134134
<include>org.apache.logging.log4j:log4j-core</include>
135-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
135+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
136136
<include>org.apache.logging.log4j:log4j-1.2-api</include>
137137
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
138138
<include>net.logstash.logback:logstash-logback-encoder:jar</include>

modules/distribution/src/main/assembly/participant-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<include>org.apache.zookeeper:zookeeper:jar</include>
163163
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
164164
<include>io.netty:netty-handler:jar</include>
165-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
165+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
166166
<include>org.apache.airavata:profile-service-stubs:jar</include>
167167
<include>org.apache.airavata:services-security:jar</include>
168168
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>

modules/distribution/src/main/assembly/post-wm-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<include>org.apache.zookeeper:zookeeper:jar</include>
166166
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
167167
<include>io.netty:netty-handler:jar</include>
168-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
168+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
169169
<include>org.apache.airavata:airavata-security:jar</include>
170170
<include>org.apache.commons:commons-pool2:jar</include>
171171
<include>org.json:json:jar</include>

modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<include>org.apache.zookeeper:zookeeper:jar</include>
162162
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
163163
<include>io.netty:netty-handler:jar</include>
164-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
164+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
165165
<include>org.apache.airavata:profile-service-stubs:jar</include>
166166
<include>org.apache.airavata:services-security:jar</include>
167167
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>

modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<include>org.apache.logging.log4j:log4j-api</include>
115115
<include>org.apache.logging.log4j:log4j-core</include>
116116
<include>org.apache.logging.log4j:log4j-1.2-api</include>
117-
<include>org.apache.logging.log4j:log4j-slf4j18-impl:jar</include>
117+
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
118118

119119
<include>org.apache.commons:commons-pool2:jar</include>
120120
<include>org.json:json:jar</include>

modules/registry/registry-tools/registry-tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<dependency>
5858
<groupId>org.slf4j</groupId>
5959
<artifactId>jcl-over-slf4j</artifactId>
60-
<version>1.6.1</version>
6160
</dependency>
6261
<dependency>
6362
<groupId>commons-cli</groupId>

modules/sharing-registry/sharing-registry-distribution/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<groupId>net.sf.dozer</groupId>
4444
<artifactId>dozer</artifactId>
4545
<version>${dozer.version}</version>
46+
<exclusions>
47+
<exclusion>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-log4j12</artifactId>
50+
</exclusion>
51+
</exclusions>
4652
</dependency>
4753
<dependency>
4854
<groupId>org.apache.openjpa</groupId>

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
110110
<derby.version>10.13.1.1</derby.version>
111111
<org.slf4j.version>2.0.16</org.slf4j.version>
112-
<log4j2.slf4j.impl>2.18.0</log4j2.slf4j.impl>
112+
<log4j2.slf4j.impl>2.24.0</log4j2.slf4j.impl>
113113
<log4j2.version>2.24.0</log4j2.version>
114114
<surefire.version>3.0.0-M4</surefire.version>
115115
<junit.version>4.12</junit.version>
@@ -172,7 +172,7 @@
172172
</dependency>
173173
<dependency>
174174
<groupId>org.apache.logging.log4j</groupId>
175-
<artifactId>log4j-slf4j18-impl</artifactId>
175+
<artifactId>log4j-slf4j2-impl</artifactId>
176176
</dependency>
177177
<dependency>
178178
<groupId>org.apache.logging.log4j</groupId>
@@ -204,7 +204,7 @@
204204
</dependency>
205205
<dependency>
206206
<groupId>org.apache.logging.log4j</groupId>
207-
<artifactId>log4j-slf4j18-impl</artifactId>
207+
<artifactId>log4j-slf4j2-impl</artifactId>
208208
<version>${log4j2.slf4j.impl}</version>
209209
</dependency>
210210
<dependency>

0 commit comments

Comments
 (0)