slf4j-log4j12 relocated, prepare release 2.0.0-alpha7

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Mar 17, 2022 · 5fcbb28 · 5fcbb28
1 parent 956acb0
commit 5fcbb28
Show file tree

Hide file tree

Showing 35 changed files with 37 additions and 1,386 deletions.
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>integration</artifactId>

diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>jul-to-slf4j</artifactId>
@@ -25,10 +25,10 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-reload4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
-</project>
+</project>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
 

diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>osgi-over-slf4j</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-parent</artifactId>
-  <version>2.0.0-alpha7-SNAPSHOT</version>
+  <version>2.0.0-alpha7</version>
 
   <packaging>pom</packaging>
   <name>SLF4J</name>
@@ -33,8 +33,10 @@
   </scm>  
 
   <properties>
+    <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
+    <project.build.outputTimestamp>2022-03-17T16:21:00Z</project.build.outputTimestamp>    
     <latest.stable.version>1.7.36</latest.stable.version>
-    <latest.2.version>2.0.0-alpha6</latest.2.version>    
+    <latest.2.version>2.0.0-alpha7</latest.2.version>    
     <!-- java.util.ServiceLoader requires Java 6 -->
     <jdk.version>8</jdk.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>

diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>slf4j-api</artifactId>

diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>slf4j-ext</artifactId>
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-reload4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>		
@@ -77,4 +77,4 @@
 
   </build>
 
-</project>
+</project>
diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>slf4j-parent</artifactId>
     <groupId>org.slf4j</groupId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>slf4j-jdk-platform-logging</artifactId>

diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
 
   <artifactId>slf4j-jdk14</artifactId>

diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
@@ -2,64 +2,30 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.0-alpha7-SNAPSHOT</version>
+    <version>2.0.0-alpha7</version>
   </parent>
-
+  
   <artifactId>slf4j-log4j12</artifactId>
-
-  <packaging>jar</packaging>
-  <name>SLF4J LOG4J-12 Binding</name>
-  <description>SLF4J LOG4J-12 Binding</description>
+  <packaging>pom</packaging>
+
+  <name>SLF4J LOG4J-12 Binding relocated</name>
+  <description>SLF4J LOG4J-12 relocated to slf4j-reload4j</description>
   <url>http://www.slf4j.org</url>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
 
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-
-    <dependency>
+  <distributionManagement>
+    <relocation>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <type>test-jar</type>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+      <artifactId>slf4j-reload4j</artifactId>
+      <version>2.0.0-alpha7</version>      
+    </relocation>
+  </distributionManagement>
 
 
-  <build>
-    <plugins>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
-        <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
-          <reportFormat>plain</reportFormat>
-          <trimStackTrace>false</trimStackTrace>
-          <excludes>
-            <exclude>**/AllTest.java</exclude>
-            <exclude>**/PackageTest.java</exclude>
-          </excludes>
-          <argLine>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8001</argLine>
-          <!--<argLine>XXadd-opens log4j/org.apache.log4j=org.slf4j.log4j12</argLine>-->
-        </configuration>
-      </plugin>     
-
-
-    </plugins>
-  </build>
-</project>
+</project>
diff --git a/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java b/slf4j-log4j12/src/main/java/org/apache/log4j/MDCFriend.java
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4j12ServiceProvider.java b/slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4j12ServiceProvider.java