From 5c822203c9c334d8e4e5451e716f38c2fd4202c5 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Tue, 14 Feb 2017 23:38:20 +0100
Subject: [PATCH] release 1.7.23

---
 integration/pom.xml                           |  2 +-
 .../java/org/slf4j/test_osgi/BundleTest.java  |  4 ---
 jcl-over-slf4j/pom.xml                        |  2 +-
 jul-to-slf4j/pom.xml                          |  2 +-
 log4j-over-slf4j/pom.xml                      |  2 +-
 osgi-over-slf4j/pom.xml                       |  2 +-
 pom.xml                                       |  2 +-
 slf4j-android/pom.xml                         |  2 +-
 slf4j-api/pom.xml                             |  2 +-
 .../src/main/java/org/slf4j/helpers/Util.java | 26 ---------------
 slf4j-ext/pom.xml                             |  2 +-
 slf4j-jcl/pom.xml                             |  2 +-
 slf4j-jdk14/pom.xml                           |  2 +-
 slf4j-log4j12/pom.xml                         |  2 +-
 .../java/org/slf4j/impl/Log4jMDCAdapter.java  |  3 +-
 .../main/java/org/slf4j/impl/VersionUtil.java | 33 +++++++++++++++++++
 .../java/org/apache/log4j/MDCFriendTest.java  |  7 ++--
 .../java/org/slf4j/impl}/UtilVersionTest.java | 10 +++---
 slf4j-migrator/pom.xml                        |  2 +-
 slf4j-nop/pom.xml                             |  2 +-
 slf4j-simple/pom.xml                          |  2 +-
 slf4j-site/pom.xml                            |  2 +-
 slf4j-site/src/site/pages/news.html           |  9 +++++
 23 files changed, 68 insertions(+), 56 deletions(-)
 create mode 100755 slf4j-log4j12/src/main/java/org/slf4j/impl/VersionUtil.java
 rename {slf4j-api/src/test/java/org/slf4j/helpers => slf4j-log4j12/src/test/java/org/slf4j/impl}/UtilVersionTest.java (51%)

diff --git a/integration/pom.xml b/integration/pom.xml
index f872d3c0..3dfc64d3 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>integration</artifactId>
diff --git a/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java b/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java
index ce2e2801..920f228d 100644
--- a/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java
+++ b/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java
@@ -26,8 +26,6 @@ package org.slf4j.test_osgi;
 
 import java.io.File;
 
-import org.slf4j.helpers.Util;
-
 import junit.framework.TestCase;
 
 public class BundleTest extends TestCase {
@@ -48,8 +46,6 @@ public class BundleTest extends TestCase {
     }
 
     public void testSmoke() {
-    	if(Util.getJavaMajorVersion() >= 9)
-    		return;
         System.out.println("===========" + new File(".").getAbsolutePath());
         mbl.dumpAll();
         // check that the bundle was installed
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index 7626f9f2..6cd84378 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index a4dd1855..d4bdfe70 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>jul-to-slf4j</artifactId>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index 2b490516..10b77e2a 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
 
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index ddbed643..40e541b5 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>osgi-over-slf4j</artifactId>
diff --git a/pom.xml b/pom.xml
index 4fe4d1c5..fa67d7e4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-parent</artifactId>
-  <version>1.7.23-SNAPSHOT</version>
+  <version>1.7.23</version>
 
   <packaging>pom</packaging>
   <name>SLF4J</name>
diff --git a/slf4j-android/pom.xml b/slf4j-android/pom.xml
index 156e046f..95c7bcef 100644
--- 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.23-SNAPSHOT</version>
+        <version>1.7.23</version>
     </parent>
 
     <artifactId>slf4j-android</artifactId>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 68807ebf..86526177 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-api</artifactId>
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/Util.java b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
index 5ef9f95b..06017849 100755
--- a/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
@@ -24,8 +24,6 @@
  */
 package org.slf4j.helpers;
 
-import java.lang.reflect.Method;
-
 /**
  * An internal utility class.
  *
@@ -34,8 +32,6 @@ import java.lang.reflect.Method;
  */
 public final class Util {
 
-	static final int MINIMAL_VERSION = 5;
-	
 	
     private Util() {
     }
@@ -133,27 +129,5 @@ public final class Util {
     }
     
 	
-	static public int getJavaMajorVersion() {
-		String javaVersionString = Util.safeGetSystemProperty("java.version");
-		return getJavaMajorVersion(javaVersionString);
-	}
 
-	static int getJavaMajorVersion(String versionString) {
-		if(versionString == null)
-			return MINIMAL_VERSION;
-		if(versionString.startsWith("1.")) {
-			return versionString.charAt(2) - '0';
-		} else {
-			// we running  under Java 9 or later
-			try {
-				Method versionMethod = Runtime.class.getMethod("version");
-				Object versionObj = versionMethod.invoke(null);
-				Method majorMethod = versionObj.getClass().getMethod("major");
-				Integer resultInteger = (Integer) majorMethod.invoke(versionObj);
-				return resultInteger.intValue();
-			} catch (Exception e) {
-				return MINIMAL_VERSION;
-			} 
-		}
-	}
 }
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index 509e3f03..f6099c4e 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-ext</artifactId>
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
index 50f9c6ce..68340c9a 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-jcl</artifactId>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index e7a22b4f..f8ccd5a4 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-jdk14</artifactId>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index 0e64e8c5..fa4f78c8 100755
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.7.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-log4j12</artifactId>
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
index 54796296..43afe0d9 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
@@ -29,13 +29,12 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.log4j.MDCFriend;
-import org.slf4j.helpers.Util;
 import org.slf4j.spi.MDCAdapter;
 
 public class Log4jMDCAdapter implements MDCAdapter {
 
 	static {
-		if (Util.getJavaMajorVersion() >= 9) {
+		if (VersionUtil.getJavaMajorVersion() >= 9) {
 			MDCFriend.fixForJava9();
 		}
 	}
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/VersionUtil.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/VersionUtil.java
new file mode 100755
index 00000000..2fa54d1a
--- /dev/null
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/VersionUtil.java
@@ -0,0 +1,33 @@
+package org.slf4j.impl;
+
+import java.lang.reflect.Method;
+
+import org.slf4j.helpers.Util;
+
+public class VersionUtil {
+	static final int MINIMAL_VERSION = 5;
+
+	static public int getJavaMajorVersion() {
+		String javaVersionString = Util.safeGetSystemProperty("java.version");
+		return getJavaMajorVersion(javaVersionString);
+	}
+
+	static int getJavaMajorVersion(String versionString) {
+		if (versionString == null)
+			return MINIMAL_VERSION;
+		if (versionString.startsWith("1.")) {
+			return versionString.charAt(2) - '0';
+		} else {
+			// we running under Java 9 or later
+			try {
+				Method versionMethod = Runtime.class.getMethod("version");
+				Object versionObj = versionMethod.invoke(null);
+				Method majorMethod = versionObj.getClass().getMethod("major");
+				Integer resultInteger = (Integer) majorMethod.invoke(versionObj);
+				return resultInteger.intValue();
+			} catch (Exception e) {
+				return MINIMAL_VERSION;
+			}
+		}
+	}
+}
diff --git a/slf4j-log4j12/src/test/java/org/apache/log4j/MDCFriendTest.java b/slf4j-log4j12/src/test/java/org/apache/log4j/MDCFriendTest.java
index 34e94e5d..e487adf1 100755
--- a/slf4j-log4j12/src/test/java/org/apache/log4j/MDCFriendTest.java
+++ b/slf4j-log4j12/src/test/java/org/apache/log4j/MDCFriendTest.java
@@ -1,11 +1,12 @@
 package org.apache.log4j;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.util.Random;
 
 import org.junit.Test;
-import org.slf4j.helpers.Util;
+import org.slf4j.impl.VersionUtil;
 
 public class MDCFriendTest {
 
@@ -15,7 +16,7 @@ public class MDCFriendTest {
 	
 	@Test
 	public void smoke() {
-		if(Util.getJavaMajorVersion() < 9)
+		if(VersionUtil.getJavaMajorVersion() < 9)
 			return;
 
 		MDCFriend.fixForJava9();
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/UtilVersionTest.java b/slf4j-log4j12/src/test/java/org/slf4j/impl/UtilVersionTest.java
similarity index 51%
rename from slf4j-api/src/test/java/org/slf4j/helpers/UtilVersionTest.java
rename to slf4j-log4j12/src/test/java/org/slf4j/impl/UtilVersionTest.java
index 1b363e9f..934e6b47 100755
--- a/slf4j-api/src/test/java/org/slf4j/helpers/UtilVersionTest.java
+++ b/slf4j-log4j12/src/test/java/org/slf4j/impl/UtilVersionTest.java
@@ -1,4 +1,4 @@
-package org.slf4j.helpers;
+package org.slf4j.impl;
 
 import static org.junit.Assert.*;
 
@@ -10,15 +10,15 @@ public class UtilVersionTest {
 	@Test
 	public void test() {
 		System.out.println(System.getProperty("java.version"));
-		assertEquals(6, Util.getJavaMajorVersion("1.6"));
-		assertEquals(7, Util.getJavaMajorVersion("1.7.0_21-b11"));
-		assertEquals(8, Util.getJavaMajorVersion("1.8.0_25"));
+		assertEquals(6, VersionUtil.getJavaMajorVersion("1.6"));
+		assertEquals(7, VersionUtil.getJavaMajorVersion("1.7.0_21-b11"));
+		assertEquals(8, VersionUtil.getJavaMajorVersion("1.8.0_25"));
 	}
 	
 	@Ignore
 	@Test  // requires Java 9 to pass
 	public void testJava9() {
-		assertEquals(9, Util.getJavaMajorVersion("9ea"));
+		assertEquals(9, VersionUtil.getJavaMajorVersion("9ea"));
 	}
 
 }
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
index 99a10bad..8dc45775 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-migrator</artifactId>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index 9e7850ad..ac491929 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-nop</artifactId>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index dae85477..57f10063 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-simple</artifactId>
diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
index b22bc3af..f821cf6e 100755
--- 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.23-SNAPSHOT</version>
+    <version>1.7.23</version>
   </parent>
 
   <artifactId>slf4j-site</artifactId>
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index 885e6f95..7e15ab33 100755
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -35,6 +35,10 @@
 
    <h3>February 15th, 2017 - Release of SLF4J 1.7.23</h3>
 
+   <p class="highlight">Update to SLF4J version 1.7.23 to enable
+   slf4j-log4j12 to run under Java 9.</p>
+
+
    <p>When running under Java 9, log4j version 1.2.x is unable to
    correctly parse the "java.version" system property. Assuming an
    inccorect Java version, it proceeded to disable its MDC
@@ -49,6 +53,11 @@
    Soni with Jonas Neukomm providing the relevant PR.
    </p>
 
+   <p>The slf4j-simple module now uses the latest reference to
+   System.out or System.err. In previous releases the reference was
+   set at the beginning and re-used. This change fixes <a
+   href="https://jira.qos.ch/browse/SLF4J-389">SLF4J-389</a> reported
+   by Igor Polevoy.</p>
 
    <hr noshade="noshade" size="1"/>