This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 651be153d531f51c5f42f31efd1f4538b89e5905 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sun Sep 4 07:13:17 2022 +0200 Rename `log4j-slf4j20-impl` to `log4j-slf4j2-impl` Since the 1.8 binding is gone, we can use a simpler name. --- log4j-bom/pom.xml | 2 +- {log4j-slf4j20-impl => log4j-slf4j2-impl}/pom.xml | 6 +++--- .../src/main/java/org/apache/logging/slf4j/Log4jEventBuilder.java | 0 .../src/main/java/org/apache/logging/slf4j/Log4jLogger.java | 0 .../src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java | 0 .../src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java | 0 .../src/main/java/org/apache/logging/slf4j/Log4jMarker.java | 0 .../src/main/java/org/apache/logging/slf4j/Log4jMarkerFactory.java | 0 .../main/java/org/apache/logging/slf4j/SLF4JLoggingException.java | 0 .../main/java/org/apache/logging/slf4j/SLF4JServiceProvider.java | 0 .../src/main/java/org/apache/logging/slf4j/package-info.java | 0 .../resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider | 0 .../src/site/markdown/index.md | 0 {log4j-slf4j20-impl => log4j-slf4j2-impl}/src/site/site.xml | 0 .../java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java | 0 .../test/java/org/apache/logging/slf4j/CallerInformationTest.java | 0 .../src/test/java/org/apache/logging/slf4j/CustomFlatMarker.java | 0 .../src/test/java/org/apache/logging/slf4j/Log4j1222Test.java | 0 .../test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java | 0 .../test/java/org/apache/logging/slf4j/Log4jEventBuilderTest.java | 0 .../src/test/java/org/apache/logging/slf4j/Log4jMDCAdapterTest.java | 0 .../src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java | 0 .../src/test/java/org/apache/logging/slf4j/LoggerContextTest.java | 0 .../src/test/java/org/apache/logging/slf4j/LoggerTest.java | 0 .../src/test/java/org/apache/logging/slf4j/MarkerTest.java | 0 .../src/test/java/org/apache/logging/slf4j/OverflowTest.java | 0 .../src/test/java/org/apache/logging/slf4j/SerializeTest.java | 0 .../src/test/resources/log4j-test1.xml | 0 .../src/test/resources/log4j2-1482.xml | 0 .../src/test/resources/log4j2-config.xml | 0 pom.xml | 2 +- 31 files changed, 5 insertions(+), 5 deletions(-) diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index 97d1f4a24e..a39f7bfdd2 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@ -260,7 +260,7 @@ <!-- SLF4J 2.0.x Compatibility API --> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j20-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <version>${project.version}</version> </dependency> <!-- SMTP Appender plugin --> diff --git a/log4j-slf4j20-impl/pom.xml b/log4j-slf4j2-impl/pom.xml similarity index 98% rename from log4j-slf4j20-impl/pom.xml rename to log4j-slf4j2-impl/pom.xml index a87a44e9c3..50c964986f 100644 --- a/log4j-slf4j20-impl/pom.xml +++ b/log4j-slf4j2-impl/pom.xml @@ -22,14 +22,14 @@ <artifactId>log4j</artifactId> <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>log4j-slf4j20-impl</artifactId> + <artifactId>log4j-slf4j2-impl</artifactId> <packaging>jar</packaging> - <name>Apache Log4j SLF4J 2.0+ Binding</name> + <name>Apache Log4j SLF4J 2.0 Binding</name> <description>The Apache Log4j SLF4J 2.0 API binding to Log4j 2 Core</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> <docLabel>SLF4J Documentation</docLabel> - <projectDir>/slf4j20</projectDir> + <projectDir>/slf4j2-impl</projectDir> <slf4j.version>2.0.0</slf4j.version> <module.name>org.apache.logging.log4j.slf4j</module.name> <maven.doap.skip>true</maven.doap.skip> diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jEventBuilder.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jEventBuilder.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jEventBuilder.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jEventBuilder.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jLoggerFactory.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jMarkerFactory.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarkerFactory.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/Log4jMarkerFactory.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarkerFactory.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/SLF4JServiceProvider.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/SLF4JServiceProvider.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/SLF4JServiceProvider.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/SLF4JServiceProvider.java diff --git a/log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/package-info.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/package-info.java similarity index 100% rename from log4j-slf4j20-impl/src/main/java/org/apache/logging/slf4j/package-info.java rename to log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/package-info.java diff --git a/log4j-slf4j20-impl/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/log4j-slf4j2-impl/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider similarity index 100% rename from log4j-slf4j20-impl/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider rename to log4j-slf4j2-impl/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider diff --git a/log4j-slf4j20-impl/src/site/markdown/index.md b/log4j-slf4j2-impl/src/site/markdown/index.md similarity index 100% rename from log4j-slf4j20-impl/src/site/markdown/index.md rename to log4j-slf4j2-impl/src/site/markdown/index.md diff --git a/log4j-slf4j20-impl/src/site/site.xml b/log4j-slf4j2-impl/src/site/site.xml similarity index 100% rename from log4j-slf4j20-impl/src/site/site.xml rename to log4j-slf4j2-impl/src/site/site.xml diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/other/pkg/LoggerContextAnchorTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/CustomFlatMarker.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CustomFlatMarker.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/CustomFlatMarker.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/CustomFlatMarker.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4jEventBuilderTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jEventBuilderTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4jEventBuilderTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jEventBuilderTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4jMDCAdapterTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMDCAdapterTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4jMDCAdapterTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMDCAdapterTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/OverflowTest.java diff --git a/log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java b/log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java similarity index 100% rename from log4j-slf4j20-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java rename to log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java diff --git a/log4j-slf4j20-impl/src/test/resources/log4j-test1.xml b/log4j-slf4j2-impl/src/test/resources/log4j-test1.xml similarity index 100% rename from log4j-slf4j20-impl/src/test/resources/log4j-test1.xml rename to log4j-slf4j2-impl/src/test/resources/log4j-test1.xml diff --git a/log4j-slf4j20-impl/src/test/resources/log4j2-1482.xml b/log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml similarity index 100% rename from log4j-slf4j20-impl/src/test/resources/log4j2-1482.xml rename to log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml diff --git a/log4j-slf4j20-impl/src/test/resources/log4j2-config.xml b/log4j-slf4j2-impl/src/test/resources/log4j2-config.xml similarity index 100% rename from log4j-slf4j20-impl/src/test/resources/log4j2-config.xml rename to log4j-slf4j2-impl/src/test/resources/log4j2-config.xml diff --git a/pom.xml b/pom.xml index 1cbdea5c01..9b27aa4d84 100644 --- a/pom.xml +++ b/pom.xml @@ -1649,8 +1649,8 @@ <module>log4j-redis</module> <module>log4j-samples</module> <module>log4j-script</module> - <module>log4j-slf4j20-impl</module> <module>log4j-slf4j-impl</module> + <module>log4j-slf4j2-impl</module> <module>log4j-smtp</module> <module>log4j-spring-boot</module> <module>log4j-spring-cloud-config</module>
