prepare release 1.7.36, fix SLF4J-541

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Feb 8, 2022 · 8825027 · 8825027
1 parent 5617387
commit 8825027
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 30 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>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>integration</artifactId>
@@ -116,4 +116,4 @@
 
   </build>
 
-</project>
+</project>
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>1.7.35</version>
+    <version>1.7.36</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>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>jul-to-slf4j</artifactId>

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>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
 

diff --git a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
@@ -3,12 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: log4j.over.slf4j
 Bundle-Name: log4j-over-slf4j
 Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Automatic-Module-Name: org.apache.log4j
-Export-Package: org.apache.log4j;version=${log4j.version},
- org.apache.log4j.helpers;version=${log4j.version},
- org.apache.log4j.spi;version=${log4j.version},
- org.apache.log4j.xml;version=${log4j.version}
+Export-Package: org.apache.log4j;version=${reload4j.version},
+ org.apache.log4j.helpers;version=${reload4j.version},
+ org.apache.log4j.spi;version=${reload4j.version},
+ org.apache.log4j.xml;version=${reload4j.version}
 Import-Package: org.slf4j;version=${slf4j.api.minimum.compatible.version},
  org.slf4j.helpers;version=${slf4j.api.minimum.compatible.version},
  org.slf4j.spi;version=${slf4j.api.minimum.compatible.version}
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>1.7.35</version>
+    <version>1.7.36</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>1.7.35</version>
+  <version>1.7.36</version>
 
   <packaging>pom</packaging>
   <name>SLF4J</name>
@@ -33,6 +33,9 @@
   </scm>  
 
   <properties>
+    <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
+    <project.build.outputTimestamp>2022-02-08T07:38:00Z</project.build.outputTimestamp>    
+
     <required.jdk.version>1.5</required.jdk.version>
     <maven.compiler.source>${required.jdk.version}</maven.compiler.source>
     <maven.compiler.target>${required.jdk.version}</maven.compiler.target>
@@ -42,8 +45,8 @@
     <!-- used in integration testing -->
     <slf4j.api.minimum.compatible.version>1.6.0</slf4j.api.minimum.compatible.version>
     <cal10n.version>0.8.1</cal10n.version>
-    <reload4j.version>1.2.18.3</reload4j.version>    
-    <logback.version>1.0.13</logback.version>
+    <reload4j.version>1.2.18.5</reload4j.version>    
+    <logback.version>1.2.10</logback.version>
     <junit.version>4.12</junit.version>
     <maven-site-plugin.version>3.3</maven-site-plugin.version>
     <maven-source-plugin.version>3.0.1</maven-source-plugin.version>

diff --git a/slf4j-android/pom.xml b/slf4j-android/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-parent</artifactId>
-        <version>1.7.35</version>
+        <version>1.7.36</version>
     </parent>
 
     <artifactId>slf4j-android</artifactId>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
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>1.7.35</version>
+    <version>1.7.36</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>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-ext</artifactId>

diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-jcl</artifactId>
@@ -29,4 +29,4 @@
     </dependency>
   </dependencies>
 
-</project>
+</project>
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>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-jdk14</artifactId>

diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
@@ -7,10 +7,9 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
-  <groupId>org.slf4j</groupId>
   <artifactId>slf4j-log4j12</artifactId>
   <packaging>pom</packaging>
 
@@ -23,7 +22,7 @@
     <relocation>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-reload4j</artifactId>
-      <version>1.7.35</version>      
+      <version>1.7.36</version>      
     </relocation>
   </distributionManagement>
 

diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-migrator</artifactId>
@@ -16,4 +16,4 @@
   <name>SLF4J Migrator</name>
   <description>SLF4J Migrator</description>
 
-</project>
+</project>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-nop</artifactId>

diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-reload4j</artifactId>

diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-simple</artifactId>

diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.35</version>
+    <version>1.7.36</version>
   </parent>
 
   <artifactId>slf4j-site</artifactId>