Skip to content

Commit 74688cf

Browse files
Doha2012pivovarit
Doha2012
authored and
pivovarit
committed
remove log4j dependencies (eugenp#1675)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies
1 parent a5f4ae9 commit 74688cf

File tree

59 files changed

+63
-414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+63
-414
lines changed

‎apache-fop/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
<version>${org.slf4j.version}</version>
2929
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
3030
</dependency>
31-
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
32-
<groupId>org.slf4j</groupId>
33-
<artifactId>log4j-over-slf4j</artifactId>
34-
<version>${org.slf4j.version}</version>
35-
</dependency>
3631

3732
<!-- test scoped -->
3833

‎core-java/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@
9292
<version>${org.slf4j.version}</version>
9393
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
9494
</dependency>
95-
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
96-
<groupId>org.slf4j</groupId>
97-
<artifactId>log4j-over-slf4j</artifactId>
98-
<version>${org.slf4j.version}</version>
99-
</dependency>
10095
<dependency>
10196
<groupId>org.projectlombok</groupId>
10297
<artifactId>lombok</artifactId>

‎core-java/src/test/java/org/baeldung/core/exceptions/FileNotFoundExceptionUnitTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
import java.io.FileReader;
77
import java.io.IOException;
88

9-
import org.apache.log4j.Logger;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
1012
import org.junit.Test;
1113

1214
public class FileNotFoundExceptionUnitTest {
1315

14-
private static final Logger LOG = Logger.getLogger(FileNotFoundExceptionUnitTest.class);
16+
private static final Logger LOG = LoggerFactory.getLogger(FileNotFoundExceptionUnitTest.class);
1517

1618
private String fileName = Double.toString(Math.random());
1719

‎couchbase-sdk/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
<artifactId>jcl-over-slf4j</artifactId>
4747
<version>${org.slf4j.version}</version>
4848
</dependency>
49-
<dependency>
50-
<groupId>org.slf4j</groupId>
51-
<artifactId>log4j-over-slf4j</artifactId>
52-
<version>${org.slf4j.version}</version>
53-
</dependency>
5449

5550
<!-- Test-Scoped Dependencies -->
5651
<dependency>

‎deltaspike/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,6 @@
201201
<artifactId>querydsl-jpa</artifactId>
202202
<version>${querydsl.version}</version>
203203
</dependency>
204-
205-
<dependency>
206-
<groupId>org.slf4j</groupId>
207-
<artifactId>slf4j-log4j12</artifactId>
208-
<version>${slf4j.version}</version>
209-
</dependency>
210204
</dependencies>
211205

212206
<build>

‎disruptor/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@
4040
<artifactId>jcl-over-slf4j</artifactId>
4141
<version>${org.slf4j.version}</version>
4242
</dependency>
43-
<dependency>
44-
<groupId>org.slf4j</groupId>
45-
<artifactId>log4j-over-slf4j</artifactId>
46-
<version>${org.slf4j.version}</version>
47-
</dependency>
4843

4944
<!-- test scoped -->
5045

‎feign/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<feign.version>9.4.0</feign.version>
2020
<slf4j.version>1.7.21</slf4j.version>
21-
<log4j.version>2.7</log4j.version>
2221
<lombok.version>1.16.12</lombok.version>
2322
<junit.version>4.12</junit.version>
2423
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
@@ -52,16 +51,6 @@
5251
<artifactId>slf4j-api</artifactId>
5352
<version>${slf4j.version}</version>
5453
</dependency>
55-
<dependency>
56-
<groupId>org.apache.logging.log4j</groupId>
57-
<artifactId>log4j-core</artifactId>
58-
<version>${log4j.version}</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.apache.logging.log4j</groupId>
62-
<artifactId>log4j-slf4j-impl</artifactId>
63-
<version>${log4j.version}</version>
64-
</dependency>
6554
<dependency>
6655
<groupId>org.projectlombok</groupId>
6756
<artifactId>lombok</artifactId>

‎feign/src/main/resources/log4j2.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎guava/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@
7676
<version>${org.slf4j.version}</version>
7777
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
7878
</dependency>
79-
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
80-
<groupId>org.slf4j</groupId>
81-
<artifactId>log4j-over-slf4j</artifactId>
82-
<version>${org.slf4j.version}</version>
83-
</dependency>
8479

8580

8681
<dependency>

‎handling-spring-static-resources/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,6 @@
155155
<version>${org.slf4j.version}</version>
156156
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
157157
</dependency>
158-
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
159-
<groupId>org.slf4j</groupId>
160-
<artifactId>log4j-over-slf4j</artifactId>
161-
<version>${org.slf4j.version}</version>
162-
</dependency>
163158

164159
</dependencies>
165160

0 commit comments

Comments
 (0)