[slf4j-dev] svn commit: r836 - in slf4j/trunk: . jcl104-over-slf4j osgi-over-slf4j slf4j-api slf4j-api/src/main/java/org/slf4j slf4j-archetype slf4j-converter slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-nop slf4j-osgi-integration-test slf4j-osgi-test-bundle slf4j-simple slf4j-site

ceki at slf4j.org ceki at slf4j.org
Sat Jul 7 16:10:19 CEST 2007


Author: ceki
Date: Sat Jul  7 16:10:18 2007
New Revision: 836

Modified:
   slf4j/trunk/jcl104-over-slf4j/pom.xml
   slf4j/trunk/osgi-over-slf4j/pom.xml
   slf4j/trunk/pom.xml
   slf4j/trunk/slf4j-api/pom.xml
   slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java
   slf4j/trunk/slf4j-archetype/pom.xml
   slf4j/trunk/slf4j-converter/pom.xml
   slf4j/trunk/slf4j-jcl/pom.xml
   slf4j/trunk/slf4j-jdk14/pom.xml
   slf4j/trunk/slf4j-log4j12/pom.xml
   slf4j/trunk/slf4j-nop/pom.xml
   slf4j/trunk/slf4j-osgi-integration-test/pom.xml
   slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
   slf4j/trunk/slf4j-simple/pom.xml
   slf4j/trunk/slf4j-site/pom.xml

Log:

reconciliation with logback, starting work on 1.4.2

Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml	(original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml	Sat Jul  7 16:10:18 2007
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/osgi-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/osgi-over-slf4j/pom.xml	(original)
+++ slf4j/trunk/osgi-over-slf4j/pom.xml	Sat Jul  7 16:10:18 2007
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml	(original)
+++ slf4j/trunk/pom.xml	Sat Jul  7 16:10:18 2007
@@ -5,7 +5,7 @@
 
 	<groupId>org.slf4j</groupId>
 	<artifactId>slf4j-parent</artifactId>
-	<version>1.4.1</version>
+	<version>1.4.2-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 	<name>SLF4J</name>

Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml	(original)
+++ slf4j/trunk/slf4j-api/pom.xml	Sat Jul  7 16:10:18 2007
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java	(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java	Sat Jul  7 16:10:18 2007
@@ -129,5 +129,13 @@
     mdcAdapter.clear();
   }
   
- 
+  /**
+   * Returns the MDCAdapter instance currently in use.
+   * 
+   * @return the MDcAdapter instance currently in use.
+   * @since 1.4.2
+   */
+  public static MDCAdapter getMDCAdapter() {
+    return mdcAdapter;
+  }
 }
\ No newline at end of file

Modified: slf4j/trunk/slf4j-archetype/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-archetype/pom.xml	(original)
+++ slf4j/trunk/slf4j-archetype/pom.xml	Sat Jul  7 16:10:18 2007
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>slf4j-parent</artifactId>
     <groupId>org.slf4j</groupId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-converter/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-converter/pom.xml	(original)
+++ slf4j/trunk/slf4j-converter/pom.xml	Sat Jul  7 16:10:18 2007
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-      	<version>1.4.1</version>
+      	<version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml	(original)
+++ slf4j/trunk/slf4j-jcl/pom.xml	Sat Jul  7 16:10:18 2007
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml	(original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml	Sat Jul  7 16:10:18 2007
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>1.4.1</version>
+    	<version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml	(original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml	Sat Jul  7 16:10:18 2007
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml	(original)
+++ slf4j/trunk/slf4j-nop/pom.xml	Sat Jul  7 16:10:18 2007
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>1.4.1</version>
+    	<version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/pom.xml	(original)
+++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml	Sat Jul  7 16:10:18 2007
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-test-bundle/pom.xml	(original)
+++ slf4j/trunk/slf4j-osgi-test-bundle/pom.xml	Sat Jul  7 16:10:18 2007
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml	(original)
+++ slf4j/trunk/slf4j-simple/pom.xml	Sat Jul  7 16:10:18 2007
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
 	
 	<modelVersion>4.0.0</modelVersion>

Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml	(original)
+++ slf4j/trunk/slf4j-site/pom.xml	Sat Jul  7 16:10:18 2007
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>



More information about the slf4j-dev mailing list