You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/10/24 06:40:07 UTC
[logging-log4j2] 03/09: Re-enable some dependencies
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2f9154413439d4c5e9e9bf82d5717e64c93f6827
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Oct 20 17:43:49 2023 +0200
Re-enable some dependencies
---
log4j-core-its/pom.xml | 33 +++++++++++++++++++++++++++++++++
log4j-osgi-test/pom.xml | 27 +++++++++++++++++++++++++++
log4j-taglib/pom.xml | 5 +++++
log4j-web/pom.xml | 5 +++++
4 files changed, 70 insertions(+)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index e594926512..a0aa5ce922 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -153,6 +153,12 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Logback performance tests -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- SLF4J tests -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -178,6 +184,29 @@
</dependencies>
<build>
<plugins>
+
+ <!--
+ ~ Unban Logback.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-logging-dependencies</id>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <includes>
+ <include>ch.qos.logback:*:*:*:test</include>
+ </includes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -195,6 +224,7 @@
org.apache.logging.log4j.categories.Appenders$Jms</groups>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -213,6 +243,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -234,12 +265,14 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
+
</plugins>
</build>
</project>
diff --git a/log4j-osgi-test/pom.xml b/log4j-osgi-test/pom.xml
index 940e1f2225..681ac04d0a 100644
--- a/log4j-osgi-test/pom.xml
+++ b/log4j-osgi-test/pom.xml
@@ -86,6 +86,11 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
@@ -125,6 +130,28 @@
<build>
<plugins>
+ <!--
+ ~ Unban Logback.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-logging-dependencies</id>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <includes>
+ <include>ch.qos.logback:*:*:*:test</include>
+ </includes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 27efe28819..cee102f292 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -71,6 +71,11 @@
<artifactId>log4j-core-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 331bb0462f..7b27f3853d 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -63,6 +63,11 @@
<artifactId>log4j-core-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>