Skip to content

Commit 4bd8f74

Browse files
rmansoorrmansoor
authored
Merge pull request pentaho#4972 from rmansoor/master
[BISERVER-14720] Upgrade log4j2
2 parents 0e82ead + 0197ea6 commit 4bd8f74

File tree

6 files changed

+56
-9
lines changed

6 files changed

+56
-9
lines changed

‎api/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
<dependency>
6969
<groupId>org.slf4j</groupId>
7070
<artifactId>slf4j-api</artifactId>
71+
<exclusions>
72+
<exclusion>
73+
<artifactId>*</artifactId>
74+
<groupId>*</groupId>
75+
</exclusion>
76+
</exclusions>
7177
</dependency>
7278
<dependency>
7379
<groupId>org.apache.logging.log4j</groupId>

‎assemblies/pentaho-war/pom.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,9 +418,8 @@
418418
</exclusions>
419419
</dependency>
420420
<dependency>
421-
<groupId>org.slf4j</groupId>
422-
<artifactId>slf4j-log4j12</artifactId>
423-
<version>${slf4j.version}</version>
421+
<groupId>org.apache.logging.log4j</groupId>
422+
<artifactId>log4j-slf4j-impl</artifactId>
424423
<scope>compile</scope>
425424
</dependency>
426425
<dependency>
@@ -865,6 +864,12 @@
865864
<groupId>org.slf4j</groupId>
866865
<artifactId>jcl-over-slf4j</artifactId>
867866
<version>${slf4j.version}</version>
867+
<exclusions>
868+
<exclusion>
869+
<artifactId>*</artifactId>
870+
<groupId>*</groupId>
871+
</exclusion>
872+
</exclusions>
868873
</dependency>
869874
<dependency>
870875
<groupId>rhino</groupId>
@@ -936,6 +941,12 @@
936941
<groupId>org.slf4j</groupId>
937942
<artifactId>slf4j-api</artifactId>
938943
<version>${slf4j.version}</version>
944+
<exclusions>
945+
<exclusion>
946+
<artifactId>*</artifactId>
947+
<groupId>*</groupId>
948+
</exclusion>
949+
</exclusions>
939950
</dependency>
940951
<dependency>
941952
<groupId>jcommon</groupId>

‎core/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,12 @@
310310
<dependency>
311311
<groupId>org.slf4j</groupId>
312312
<artifactId>slf4j-api</artifactId>
313+
<exclusions>
314+
<exclusion>
315+
<artifactId>*</artifactId>
316+
<groupId>*</groupId>
317+
</exclusion>
318+
</exclusions>
313319
</dependency>
314320
<!-- Only needed for runtime testing -->
315321
<dependency>

‎extensions/pom.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,24 @@
161161
<groupId>org.slf4j</groupId>
162162
<artifactId>slf4j-api</artifactId>
163163
<version>${slf4j.version}</version>
164+
<exclusions>
165+
<exclusion>
166+
<artifactId>*</artifactId>
167+
<groupId>*</groupId>
168+
</exclusion>
169+
</exclusions>
164170
</dependency>
165171
<!-- Only needed for runtime testing -->
166172
<dependency>
167-
<groupId>org.slf4j</groupId>
168-
<artifactId>slf4j-log4j12</artifactId>
169-
<version>${slf4j.version}</version>
173+
<groupId>org.apache.logging.log4j</groupId>
174+
<artifactId>log4j-slf4j-impl</artifactId>
175+
<version>${log4j.version}</version>
176+
<exclusions>
177+
<exclusion>
178+
<artifactId>*</artifactId>
179+
<groupId>*</groupId>
180+
</exclusion>
181+
</exclusions>
170182
<scope>test</scope>
171183
</dependency>
172184
<dependency>

‎repository/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,12 @@
712712
<dependency>
713713
<groupId>org.slf4j</groupId>
714714
<artifactId>slf4j-api</artifactId>
715+
<exclusions>
716+
<exclusion>
717+
<artifactId>*</artifactId>
718+
<groupId>*</groupId>
719+
</exclusion>
720+
</exclusions>
715721
</dependency>
716722
<dependency>
717723
<groupId>xml-apis</groupId>

‎scheduler/pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,15 @@
144144
</exclusions>
145145
</dependency>
146146
<dependency>
147-
<groupId>org.slf4j</groupId>
148-
<artifactId>slf4j-log4j12</artifactId>
149-
<version>${slf4j.version}</version>
147+
<groupId>org.apache.logging.log4j</groupId>
148+
<artifactId>log4j-slf4j-impl</artifactId>
149+
<version>${log4j.version}</version>
150+
<exclusions>
151+
<exclusion>
152+
<artifactId>*</artifactId>
153+
<groupId>*</groupId>
154+
</exclusion>
155+
</exclusions>
150156
<scope>test</scope>
151157
</dependency>
152158

0 commit comments

Comments
 (0)