Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove support for Log4j

Browse Source 
Apache Log4j 1.x is EOL and has now been replaced by log4j 2. This commit
removes the deprecated support for Log4j 1.x

See gh-4905
This commit is contained in:
Stephane Nicoll
2016-01-25 13:43:36 +01:00
parent 7b9cd20e98
commit bead239448
34 changed files with 40 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml
View File

@@ -20,7 +20,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<excludeGroupIds>log4j</excludeGroupIds>
<excludeGroupIds>org.apache.logging.log4j</excludeGroupIds>
</configuration>
</execution>
</executions>
@@ -52,9 +52,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.4.1</version>
</dependency>
</dependencies>
</project>

2
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/verify.groovy
View File

@@ -22,6 +22,6 @@ new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("lib/log4j-1.2.17.jar")
verifier.assertHasNoEntryNameStartingWith("lib/log4j-api-2.4.1.jar")
}
}.verify();

6
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml
View File

@@ -52,9 +52,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>@log4j.version@</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.4.1</version>
<scope>test</scope>
</dependency>
</dependencies>

2
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/verify.groovy
View File

@@ -22,6 +22,6 @@ new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
@Override
protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
super.verifyZipEntries(verifier)
verifier.assertHasNoEntryNameStartingWith("lib/log4j-1.2.17.jar")
verifier.assertHasNoEntryNameStartingWith("lib/log4j-api-2.4.1.jar")
}
}.verify();

6
spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml
View File

@@ -57,9 +57,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>@log4j.version@</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>@log4j2.version@</version>
</dependency>
</dependencies>
</project>

10
spring-boot-tools/spring-boot-maven-plugin/src/it/run-exclude/pom.xml
View File

@@ -23,8 +23,8 @@
<configuration>
<excludes>
<exclude>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclude>
</excludes>
<excludeGroupIds>javax.servlet</excludeGroupIds>
@@ -36,9 +36,9 @@
</build>
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>@log4j.version@</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>@log4j2.version@</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>