From f67363eb62173c7c6a42d79020d22b8d17f3805a Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Mon, 23 Nov 2009 17:29:50 +0100 Subject: [PATCH 01/13] Applied Hugues Malphettes patch #66 [1] as attached to bug 75 [2] [1] http://bugzilla.slf4j.org/attachment.cgi?id=66 [2] http://bugzilla.slf4j.org/show_bug.cgi?id=75 --- pom.xml | 1 + slf4j-api/src/main/resources/META-INF/MANIFEST.MF | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d2650a18..71e8ce4bc 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ + 1.5.5 0.7.2 diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF index 8c6fdd146..9cb6230a2 100644 --- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-Name: slf4j-api Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.3 Export-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version} -Import-Package: org.slf4j.impl;version=${project.version} +Import-Package: org.slf4j.impl;version=${slf4j.api.minimum.compatible.version} From 83b7bf33691bcff75575f9e9ea94e586f3e58469 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Mon, 23 Nov 2009 17:36:15 +0100 Subject: [PATCH 02/13] upped version to 1.5.10-SNAPSHOT --- integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jcl104-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-api/pom.xml | 2 +- slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-jdk14/pom.xml | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-log4j12/pom.xml | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-osgi-integration-test/pom.xml | 2 +- slf4j-osgi-test-bundle/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- .../src/main/java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-site/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/integration/pom.xml b/integration/pom.xml index 59bf40234..092b2648f 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index a793148b7..100fae0aa 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index 0523e5abe..7076ce0da 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index e64564a5e..04e4d5ccf 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index c89cdc1df..b340f989c 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 9f241f41c..901e2b9d7 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 71e8ce4bc..a81545d88 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT pom SLF4J diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index b96f4bf34..e2f50023c 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index bddc36a94..23e04445d 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -61,7 +61,7 @@ public static final StaticLoggerBinder getSingleton() { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private StaticLoggerBinder() { throw new UnsupportedOperationException("This code should have never made it into the jar"); diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 2dc65fb30..18676527a 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index a52fe22c8..685980760 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 794bc9e56..6c63536a1 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -65,7 +65,7 @@ public static final StaticLoggerBinder getSingleton() { */ //to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9.RC1"; + public static String REQUESTED_API_VERSION = "1.5.10"; // Binding specific code: private static final String loggerFactoryClassStr = JCLLoggerFactory.class diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 3a2fd2762..ab33b77b7 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 5c423b91f..b32a59d5b 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -66,7 +66,7 @@ public static final StaticLoggerBinder getSingleton() { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName(); diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index d0ae4bc86..208242543 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index e2e746163..03543caa2 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -66,7 +66,7 @@ public static final StaticLoggerBinder getSingleton() { * against. The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = Log4jLoggerFactory.class .getName(); diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index c2b65b3c4..8b5595add 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 4d002f5b4..1175b879e 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 1e622ee9f..329587137 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -66,7 +66,7 @@ public static final StaticLoggerBinder getSingleton() { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName(); diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index 147a1bb8c..4cd846895 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index ce8cab873..0955253c5 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 849e6cf06..0ecee7752 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 51c6901b5..87914bece 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public static final StaticLoggerBinder getSingleton() { * against. The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.5.9.RC1"; // !final + public static String REQUESTED_API_VERSION = "1.5.10"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName(); diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 6cb0e6416..852d41a71 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.9.RC1 + 1.5.10-SNAPSHOT 4.0.0 From e5bbca3f28f08327497f591c72b5aac429e15f65 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Tue, 24 Nov 2009 00:21:59 +0100 Subject: [PATCH 03/13] Applied Hugues Malphettes's patch #65 as given in [1] [1] http://bugzilla.slf4j.org/show_bug.cgi?id=152 --- jcl-over-slf4j/pom.xml | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 2 +- log4j-over-slf4j/pom.xml | 2 +- pom.xml | 15 +++++++++++++++ slf4j-api/pom.xml | 2 +- slf4j-api/src/main/resources/META-INF/MANIFEST.MF | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-ext/src/main/resources/META-INF/MANIFEST.MF | 4 ++-- slf4j-jcl/pom.xml | 2 +- slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF | 4 ++-- slf4j-jdk14/pom.xml | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 4 ++-- slf4j-log4j12/pom.xml | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 4 ++-- slf4j-nop/pom.xml | 2 +- slf4j-nop/src/main/resources/META-INF/MANIFEST.MF | 4 ++-- slf4j-simple/pom.xml | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 4 ++-- 18 files changed, 38 insertions(+), 23 deletions(-) diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 100fae0aa..bee0bd5df 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -49,7 +49,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index 3a3903708..390f3c12b 100644 --- a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.3 Export-Package: org.apache.commons.logging;version=1.1.1, org.apache.commons.logging.impl;version=1.1.1 -Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version} +Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion} diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index b340f989c..4f4c621e6 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -54,7 +54,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/pom.xml b/pom.xml index a81545d88..ad9ef2f23 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,21 @@ + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.3 + + + parse-version + + parse-version + + + + diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index e2f50023c..42e3133b6 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -44,7 +44,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF index 9cb6230a2..732e527c5 100644 --- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.api Bundle-Name: slf4j-api Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Export-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version} +Export-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j.impl;version=${slf4j.api.minimum.compatible.version} diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 18676527a..1aec7251b 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -81,7 +81,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} org.slf4j.agent.AgentPremain diff --git a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF index 2235ed754..f90c7af88 100644 --- a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.ext Bundle-Name: slf4j-log4j12 Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.slf4j.profiler;version=${project.version}, org.slf4j.cal10n;version=${project.version}, org.slf4j.ext;version=${project.version} -Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}, ch.qos.cal10n;version=${cal10n.version} +Export-Package: org.slf4j.profiler;version=${parsedVersion.osgiVersion}, org.slf4j.cal10n;version=${parsedVersion.osgiVersion}, org.slf4j.ext;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, ch.qos.cal10n;version=${cal10n.version} diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 685980760..49cdfd416 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -41,7 +41,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF index fa431854a..a905c8f4f 100644 --- a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-Name: slf4j-jcl Bundle-Vendor: SLF4J.ORG Require-Bundle: slf4j.api Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Export-Package: org.slf4j.impl;version=${project.version} -Import-Package: org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}, org.apache.commons.logging +Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.apache.commons.logging Fragment-Host: slf4j.api \ No newline at end of file diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index ab33b77b7..ab08cacc5 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -55,7 +55,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF index 5bb3ad9cd..4838f9db7 100644 --- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-SymbolicName: slf4j.jdk14 Bundle-Name: slf4j-jdk14 Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Export-Package: org.slf4j.impl;version=${project.version} -Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version} +Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Fragment-Host: slf4j.api \ No newline at end of file diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 208242543..671975354 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -42,7 +42,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF index 1de0956ad..d925dccb7 100644 --- a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-SymbolicName: slf4j.log4j12 Bundle-Name: slf4j-log4j12 Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Export-Package: org.slf4j.impl;version=${project.version} -Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}, org.apache.log4j +Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.apache.log4j Fragment-Host: slf4j.api \ No newline at end of file diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 1175b879e..10b80cbca 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -37,7 +37,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF index 970f28ee6..3623e7456 100644 --- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-SymbolicName: slf4j.nop Bundle-Name: slf4j-nop Bundle-Vendor: SLF4J.ORG Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Export-Package: org.slf4j.impl;version=${project.version} -Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version} +Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Fragment-Host: slf4j.api \ No newline at end of file diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 0ecee7752..8fb801ac4 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -32,7 +32,7 @@ - ${project.version} + ${parsedVersion.osgiVersion} ${project.description} ${project.version} diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF index 84ebee0be..b2aa0c025 100644 --- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-Name: slf4j-simple Bundle-Vendor: SLF4J.ORG Require-Bundle: slf4j.api Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Export-Package: org.slf4j.impl;version=${project.version} -Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version} +Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Fragment-Host: slf4j.api \ No newline at end of file From bd6f4a930aa5fed314d3fc54f39a283103551b6d Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Tue, 24 Nov 2009 01:06:27 +0100 Subject: [PATCH 04/13] -updates news.html --- slf4j-site/src/site/pages/news.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 076af3ad3..d3657d024 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -71,6 +71,12 @@

October 28th, 2009 - Release of SLF4J 1.5.9.RC1

href="http://bugzilla.slf4j.org/show_bug.cgi?id=117">bug 117.

+

OSGi manifests produced by SLF4J now replace the '-' character by + '.' in compliance with the OSGi specification. This fixes bug 152 + according to the patch supplied by Hugues Malphettes. +

+

Fixed packaging issue in jcl104-over-slf4j which inadvertently produced a jar file as described in bug 151 by From 19fc29d089340cb27c541db2b77dc7b7a991cbec Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Sat, 28 Nov 2009 19:35:28 +0100 Subject: [PATCH 05/13] - added unit tests verifying that the slf4j artifacts can actually be used by other osgi bundles within a real osgi framework. The tests depend on Felix. --- .gitignore | 4 +- integration/build.xml | 3 +- integration/osgi-build.xml | 92 +++++++++++++ integration/pom.xml | 23 ++++ integration/src/IBUNDLE-META-INF/MANIFEST.MF | 15 +++ .../src/test/java/integrator/Activator.java | 57 ++++++++ .../java/org/slf4j/test_osgi/BundleTest.java | 35 +++++ .../test_osgi/CheckingBundleListener.java | 43 ++++++ .../java/org/slf4j/test_osgi/FelixHost.java | 126 ++++++++++++++++++ .../test_osgi/FrameworkErrorListener.java | 60 +++++++++ slf4j-site/src/site/pages/mailing-lists.html | 18 +-- 11 files changed, 465 insertions(+), 11 deletions(-) create mode 100644 integration/osgi-build.xml create mode 100644 integration/src/IBUNDLE-META-INF/MANIFEST.MF create mode 100644 integration/src/test/java/integrator/Activator.java create mode 100644 integration/src/test/java/org/slf4j/test_osgi/BundleTest.java create mode 100644 integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java create mode 100644 integration/src/test/java/org/slf4j/test_osgi/FelixHost.java create mode 100644 integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java diff --git a/.gitignore b/.gitignore index 9539fb57e..ebc44e141 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ target .classpath .project -*~ \ No newline at end of file +*~ +integration/bundle/ +integration/felix-cache/ \ No newline at end of file diff --git a/integration/build.xml b/integration/build.xml index a73f9bfd0..cc549493f 100644 --- a/integration/build.xml +++ b/integration/build.xml @@ -47,7 +47,8 @@ - + diff --git a/integration/osgi-build.xml b/integration/osgi-build.xml new file mode 100644 index 000000000..00f59f7fe --- /dev/null +++ b/integration/osgi-build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + value of t = @{t} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/integration/pom.xml b/integration/pom.xml index 092b2648f..52e530edc 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -38,6 +38,13 @@ 1.6.5 + + + + org.apache.felix + org.apache.felix.main + 2.0.2 + @@ -75,6 +82,22 @@ run + + ant-osgi-test + package + + + + + + + + + + run + + + diff --git a/integration/src/IBUNDLE-META-INF/MANIFEST.MF b/integration/src/IBUNDLE-META-INF/MANIFEST.MF new file mode 100644 index 000000000..c06e46097 --- /dev/null +++ b/integration/src/IBUNDLE-META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Archiver-Version: Plexus Archiver +Created-By: Apache Maven +Built-By: ceki +Build-Jdk: 1.6.0_16 +Bundle-Description: iBundle +Bundle-Version: 0.1 +Bundle-Activator: integrator.Activator +Implementation-Title: iBundle +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: iBundle +Bundle-Name: abundle +Bundle-RequiredExecutionEnvironment: J2SE-1.3 +Export-Package: apack +Import-Package: org.osgi.framework, org.slf4j;version=1.5 \ No newline at end of file diff --git a/integration/src/test/java/integrator/Activator.java b/integration/src/test/java/integrator/Activator.java new file mode 100644 index 000000000..c2f6617e0 --- /dev/null +++ b/integration/src/test/java/integrator/Activator.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2004-2009 QOS.ch All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package integrator; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A BundleActivator which invokes slf4j loggers + * @author Ceki Gülcü + * + */ +public class Activator implements BundleActivator { + + private BundleContext m_context = null; + + public void start(BundleContext context) { + Logger logger = LoggerFactory.getLogger(this.getClass()); + logger.info("Activator.start()"); + m_context = context; + } + + public void stop(BundleContext context) { + m_context = null; + Logger logger = LoggerFactory.getLogger(this.getClass()); + logger.info("Activator.stop"); + } + + public Bundle[] getBundles() { + if (m_context != null) { + return m_context.getBundles(); + } + return null; + } +} \ No newline at end of file diff --git a/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java b/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java new file mode 100644 index 000000000..6488a9a9c --- /dev/null +++ b/integration/src/test/java/org/slf4j/test_osgi/BundleTest.java @@ -0,0 +1,35 @@ +package org.slf4j.test_osgi; + +import java.io.File; + +import junit.framework.TestCase; + +public class BundleTest extends TestCase { + + FrameworkErrorListener fel = new FrameworkErrorListener(); + CheckingBundleListener mbl = new CheckingBundleListener(); + + FelixHost felixHost = new FelixHost(fel, mbl); + + protected void setUp() throws Exception { + super.setUp(); + felixHost.doLaunch(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + felixHost.stop(); + } + + public void testSmoke() { + System.out.println("==========="+new File(".").getAbsolutePath()); + mbl.dumpAll(); + // check that the bundle was installed + assertTrue(mbl.exists("iBundle")); + if(fel.errorList.size() != 0) { + fel.dumpAll(); + } + // check that no errors occured + assertEquals(0, fel.errorList.size()); + } +} diff --git a/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java b/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java new file mode 100644 index 000000000..bfaeed064 --- /dev/null +++ b/integration/src/test/java/org/slf4j/test_osgi/CheckingBundleListener.java @@ -0,0 +1,43 @@ +package org.slf4j.test_osgi; + +import java.util.ArrayList; +import java.util.List; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleListener; + +public class CheckingBundleListener implements BundleListener { + + List eventList = new ArrayList(); + + public void bundleChanged(BundleEvent be) { + eventList.add(be); + } + + private void dump(BundleEvent be) { + System.out.println("BE:" + ", source " + be.getSource() + ", bundle=" + + be.getBundle() + ", type=" + be.getType()); + + } + + public void dumpAll() { + for (int i = 0; i < eventList.size(); i++) { + BundleEvent fe = (BundleEvent) eventList.get(i); + dump(fe); + } + } + + boolean exists(String bundleName) { + for (int i = 0; i < eventList.size(); i++) { + BundleEvent fe = (BundleEvent) eventList.get(i); + Bundle b = fe.getBundle(); + System.out.println("===["+b+"]"); + if (bundleName.equals(b.getSymbolicName())) { + return true; + } + } + return false; + } + +} diff --git a/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java b/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java new file mode 100644 index 000000000..4fd572d20 --- /dev/null +++ b/integration/src/test/java/org/slf4j/test_osgi/FelixHost.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2004-2009 QOS.ch All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package org.slf4j.test_osgi; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.felix.framework.Felix; +import org.apache.felix.framework.util.FelixConstants; +import org.apache.felix.framework.util.StringMap; +import org.apache.felix.main.AutoProcessor; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; + +/** + * Runs a hosted version of Felix for testing purposes. Any bundle errors are + * reported via the FrameworkListener passed to the constructor. + * + * @author Ceki Gücü + */ +public class FelixHost { + + private Felix felix = null; + + Properties otherProps = new Properties(); + + final FrameworkErrorListener frameworkErrorListener; + final CheckingBundleListener myBundleListener; + + public FelixHost(FrameworkErrorListener frameworkErrorListener, + CheckingBundleListener myBundleListener) { + this.frameworkErrorListener = frameworkErrorListener; + this.myBundleListener = myBundleListener; + } + + public void doLaunch() { + // Create a case-insensitive configuration property map. + Map configMap = new StringMap(false); + // Configure the Felix instance to be embedded. + // configMap.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true"); + // Add core OSGi packages to be exported from the class path + // via the system bundle. + configMap.put(Constants.FRAMEWORK_SYSTEMPACKAGES, + "org.osgi.framework; version=1.3.0," + + "org.osgi.service.packageadmin; version=1.2.0," + + "org.osgi.service.startlevel; version=1.0.0," + + "org.osgi.service.url; version=1.0.0"); + + configMap.put(Constants.FRAMEWORK_STORAGE_CLEAN, + Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT); + + // Explicitly specify the directory to use for caching bundles. + // configMap.put(BundleCache.CACHE_PROFILE_DIR_PROP, "cache"); + + try { + // Create host activator; + + List list = new ArrayList(); + + // list.add(new HostActivator()); + configMap.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, + "org.xml.sax, org.xml.sax.helpers, javax.xml.parsers, javax.naming"); + configMap.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, list); + configMap.put("felix.log.level", "4"); + + // Now create an instance of the framework with + // our configuration properties and activator. + felix = new Felix(configMap); + felix.init(); + + // otherProps.put(Constants.FRAMEWORK_STORAGE, "bundles"); + + otherProps.put(AutoProcessor.AUTO_DEPLOY_DIR_PROPERY, + AutoProcessor.AUTO_DEPLOY_DIR_VALUE); + otherProps.put(AutoProcessor.AUTO_DEPLOY_ACTION_PROPERY, + AutoProcessor.AUTO_DEPLOY_START_VALUE + "," + + AutoProcessor.AUTO_DEPLOY_INSTALL_VALUE); + + BundleContext felixBudleContext = felix.getBundleContext(); + + AutoProcessor.process(otherProps, felixBudleContext); + // listen to errors + felixBudleContext.addFrameworkListener(frameworkErrorListener); + felixBudleContext.addBundleListener(myBundleListener); + // Now start Felix instance. + felix.start(); + System.out.println("felix started"); + + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + public void stop() throws BundleException { + felix.stop(); + } + + public Bundle[] getInstalledBundles() { + // Use the system bundle activator to gain external + // access to the set of installed bundles. + return null;// m_activator.getBundles(); + } +} \ No newline at end of file diff --git a/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java b/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java new file mode 100644 index 000000000..3e9ee36a7 --- /dev/null +++ b/integration/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2004-2009 QOS.ch All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package org.slf4j.test_osgi; + +import java.util.ArrayList; +import java.util.List; + +import org.osgi.framework.FrameworkEvent; +import org.osgi.framework.FrameworkListener; + +public class FrameworkErrorListener implements FrameworkListener { + + public List errorList = new ArrayList(); + + public void frameworkEvent(FrameworkEvent fe) { + if (fe.getType() == FrameworkEvent.ERROR) { + errorList.add(fe); + + } + } + + private void dump(FrameworkEvent fe) { + Throwable t = fe.getThrowable(); + String tString = null; + if (t != null) { + tString = t.toString(); + } + System.out.println("Framework ERROR:" + ", source " + fe.getSource() + + ", bundle=" + fe.getBundle() + ", ex=" + tString); + if(t != null) { + t.printStackTrace(); + } + } + + public void dumpAll() { + for(int i = 0; i < errorList.size(); i++) { + FrameworkEvent fe = (FrameworkEvent) errorList.get(i); + dump(fe); + } + } +} diff --git a/slf4j-site/src/site/pages/mailing-lists.html b/slf4j-site/src/site/pages/mailing-lists.html index 1f17e1192..84b262b6c 100644 --- a/slf4j-site/src/site/pages/mailing-lists.html +++ b/slf4j-site/src/site/pages/mailing-lists.html @@ -65,11 +65,11 @@

slf4j-announcements list

Low Traffic: - Subscribe | - Unsubscribe + Subscribe | + Unsubscribe
Archives: - Pipermail | + Pipermail | MARC

The announcements list is reserved for important SLF4J API @@ -86,11 +86,11 @@

slf4j-user list

Medium Traffic: - Subscribe | - Unsubscribe + Subscribe | + Unsubscribe
Archives: - Pipermail | + Pipermail | Gmane | MARC | Nabble | @@ -109,11 +109,11 @@

slf4j-dev list

Medium Traffic: - Subscribe | - Unsubscribe + Subscribe | + Unsubscribe
Archives: - Pipermail | + Pipermail | Gmane | MARC | Nabble | From 9f25dd7f5ceef38015ca93b49d90f3bc5d788644 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Mon, 30 Nov 2009 10:05:48 +0100 Subject: [PATCH 06/13] - added links to new articles in the documentation --- slf4j-site/src/site/pages/docs.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/slf4j-site/src/site/pages/docs.html b/slf4j-site/src/site/pages/docs.html index d4ec3199b..c7d4eb96a 100644 --- a/slf4j-site/src/site/pages/docs.html +++ b/slf4j-site/src/site/pages/docs.html @@ -49,6 +49,10 @@

Articles

Logger Plug-ins for RCP Applications, by John J. Franey + +
  • Thoughts on Java logging and SLF4J by Nicolas Frankel +
    • +
  • Logging with SLF4J and Guice, by Michael Glauche @@ -85,8 +89,20 @@

    Articles

    Soapbox for SLF4J, by Bruce Snyder
    • +
  • Logging: + should I wrap? by Chris Wong +
    • +

    In french

    + +

    Conferences

    From 5ddd342e9db6143dd0f5b87f0218a7a6d5ad1e3d Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Tue, 1 Dec 2009 18:36:12 +0100 Subject: [PATCH 07/13] - added references to slf4j-android --- slf4j-site/src/site/pages/news.html | 6 ++++++ slf4j-site/src/site/pages/templates/left.js | 1 + 2 files changed, 7 insertions(+) diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index d3657d024..ebb6605fd 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -37,6 +37,12 @@

    October 28th, 2009 - Release of SLF4J 1.5.9.RC1

    support as a thin layer built upon the CAL10N API.

    +

    SLF4J-adroid, + maintained by Thorsten + Möller, was added as a daugther project of SLF4J. +

    +

    Added missing "Export-Package" declaration for cal10n in the OSGi manifest file for sfl4j-ext. This was requested in bug 156 by diff --git a/slf4j-site/src/site/pages/templates/left.js b/slf4j-site/src/site/pages/templates/left.js index a505cc8c1..c40904fb1 100644 --- a/slf4j-site/src/site/pages/templates/left.js +++ b/slf4j-site/src/site/pages/templates/left.js @@ -22,6 +22,7 @@ document.write(' Simple-log'); document.write('

    '); document.write('

    Sub-projects

    '); +document.write(' slf4j-android'); document.write(' slf4j-taglib'); document.write('

    '); From 32c1ac054bd700ccc2585eb57b63d614e3dc4552 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Thu, 3 Dec 2009 00:22:57 +0100 Subject: [PATCH 08/13] - setting version number to 1.5.10 - changed references from pixie to pixie.qos.ch --- integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jcl104-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 | 7 +++---- slf4j-api/pom.xml | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- slf4j-jdk14/pom.xml | 2 +- slf4j-log4j12/pom.xml | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- slf4j-osgi-integration-test/pom.xml | 2 +- slf4j-osgi-test-bundle/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/download.html | 7 ------- slf4j-site/src/site/pages/news.html | 4 ++-- 20 files changed, 22 insertions(+), 30 deletions(-) diff --git a/integration/pom.xml b/integration/pom.xml index 52e530edc..bb4078304 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index bee0bd5df..96b61b061 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml index 7076ce0da..c2049d9a2 100644 --- a/jcl104-over-slf4j/pom.xml +++ b/jcl104-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 04e4d5ccf..713df4a21 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 4f4c621e6..afe2dc036 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 901e2b9d7..ff817487e 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/pom.xml b/pom.xml index ad9ef2f23..b0514fb6d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 pom SLF4J @@ -181,7 +181,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.3 parse-version @@ -319,12 +318,12 @@ pixie - scp://pixie/var/www/www.slf4j.org/htdocs/ + scp://pixie.qos.ch/var/www/www.slf4j.org/htdocs/ pixie - scp://pixie/var/mvnrepo/ + scp://pixie.qos.ch/var/mvnrepo/ diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 42e3133b6..299a05be2 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 1aec7251b..3448f30b8 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 49cdfd416..edaaa0a62 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index ab08cacc5..ce76d61d4 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 671975354..976dadbfd 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 8b5595add..cb91f7999 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 10b80cbca..baddf306a 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index 4cd846895..b07050f73 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 0955253c5..723382eea 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 8fb801ac4..5b5d66bcf 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 852d41a71..e96eb39f8 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 1.5.10-SNAPSHOT + 1.5.10 4.0.0 diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html index ee9bf446e..f9f8b482c 100644 --- a/slf4j-site/src/site/pages/download.html +++ b/slf4j-site/src/site/pages/download.html @@ -26,13 +26,6 @@

    Latest official SLF4J distribution

    Stable version

    - - -

    Release candidate (not for production use)

    -