diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 52385b56..5ac9863e 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -12,11 +12,9 @@ jcl-over-slf4j jar JCL 1.1.1 implemented over SLF4J - + JCL 1.1.1 implemented over SLF4J http://www.slf4j.org - - JCL 1.1.1 implementation over SLF4J - + - Log4j implemented over SLF4J - Apache Software Licenses diff --git a/pom.xml b/pom.xml index f38e7edf..060166f5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom SLF4J - + Top SLF4J project pom.xml file http://www.slf4j.org @@ -28,6 +28,11 @@ + + https://github.com/ceki/slf4j + git@github.com:ceki/slf4j.git + + 1.6.0 @@ -35,6 +40,13 @@ 1.2.16 + + + ceki + Ceki Gulcu + ceki@qos.ch + + slf4j-api @@ -373,6 +385,28 @@ + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + @@ -389,13 +423,6 @@ - - scm:svn:http://svn.slf4j.org/repos/slf4j/trunk - scm:svn:https://svn.slf4j.org/repos/slf4j/trunk - - http://svn.slf4j.org/viewvc/slf4j/trunk/ - - pixie @@ -403,8 +430,10 @@ - pixie - scp://pixie.qos.ch/var/mvnrepo/ + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 3048cf55..0626cb2a 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -14,9 +14,9 @@ slf4j-api jar SLF4J API Module + The slf4j API http://www.slf4j.org - The slf4j API diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 1c4cc8ff..65410bb6 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -14,9 +14,9 @@ slf4j-ext jar SLF4J Extensions Module + Extensions to the SLF4J API http://www.slf4j.org - Extensions to the SLF4J API diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index ba0ef722..a8517bd6 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -12,12 +12,10 @@ slf4j-jcl jar SLF4J JCL Binding + SLF4J JCL Binding http://www.slf4j.org - - The slf4j jcl binding - diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 1c964b31..8185e8fd 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -1,32 +1,30 @@ - + - - org.slf4j - slf4j-parent - 1.6.5-SNAPSHOT - - - 4.0.0 + + org.slf4j + slf4j-parent + 1.6.5-SNAPSHOT + - org.slf4j - slf4j-jdk14 + 4.0.0 - jar - SLF4J JDK14 Binding + org.slf4j + slf4j-jdk14 + + jar + SLF4J JDK14 Binding + SLF4J JDK14 Binding + http://www.slf4j.org - http://www.slf4j.org - - The slf4j JDK14 binding - - + org.slf4j slf4j-api - + org.slf4j @@ -38,19 +36,19 @@ - + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + - - org.apache.maven.plugins + + org.apache.maven.plugins maven-jar-plugin @@ -61,7 +59,7 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - + diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index e7c4d388..d2022669 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -1,55 +1,52 @@ - + - - org.slf4j - slf4j-parent - 1.6.5-SNAPSHOT - - - 4.0.0 + + org.slf4j + slf4j-parent + 1.6.5-SNAPSHOT + - org.slf4j - slf4j-log4j12 - jar - SLF4J LOG4J-12 Binding + 4.0.0 + + org.slf4j + slf4j-log4j12 + jar + SLF4J LOG4J-12 Binding + SLF4J LOG4J-12 Binding + http://www.slf4j.org - http://www.slf4j.org - - The slf4j log4j-12 binding - - - + org.slf4j - slf4j-api - + slf4j-api + log4j log4j - + - - org.apache.maven.plugins - maven-jar-plugin - - - - ${parsedVersion.osgiVersion} - ${project.description} - ${project.version} - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - + + org.apache.maven.plugins + maven-jar-plugin + + + + ${parsedVersion.osgiVersion} + ${project.description} + ${project.version} + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 6596f00e..da41ccf1 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -1,26 +1,27 @@ - - - - - org.slf4j - slf4j-parent - 1.6.5-SNAPSHOT - - - 4.0.0 + + + + + org.slf4j + slf4j-parent + 1.6.5-SNAPSHOT + + + 4.0.0 + + org.slf4j + slf4j-migrator + jar + SLF4J Migrator + SLF4J Migrator - org.slf4j - slf4j-migrator - jar - SLF4J Migrator - - + org.apache.maven.plugins maven-compiler-plugin @@ -28,7 +29,7 @@ 1.5 - + org.apache.maven.plugins maven-jar-plugin diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index cfc333f4..6af5a0c6 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -1,36 +1,34 @@ - + - - org.slf4j - slf4j-parent - 1.6.5-SNAPSHOT - - - 4.0.0 + + org.slf4j + slf4j-parent + 1.6.5-SNAPSHOT + - org.slf4j - slf4j-nop - jar - SLF4J NOP Binding + 4.0.0 + + org.slf4j + slf4j-nop + jar + SLF4J NOP Binding + SLF4J NOP Binding + http://www.slf4j.org - http://www.slf4j.org - - The slf4j NOP binding - - + org.slf4j slf4j-api - + - + org.apache.maven.plugins maven-jar-plugin @@ -43,8 +41,8 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - + + diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index c07d3145..900a6df7 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -1,240 +1,241 @@ - - - org.slf4j - slf4j-parent - 1.6.5-SNAPSHOT - - - 4.0.0 - - org.slf4j - slf4j-osgi-integration-test - jar - SLF4J OSGi Integration Test - - http://www.slf4j.org - - OSGi integration tests for the slf4j. - - + 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/maven-v4_0_0.xsd"> - - - org.apache.felix - javax.servlet - 0.8.0-SNAPSHOT - test - + + org.slf4j + slf4j-parent + 1.6.5-SNAPSHOT + - - org.osgi - org.osgi.compendium - 4.0 - provided - + 4.0.0 - - junit - junit - 3.8.1 - test - - - org.slf4j - slf4j-osgi-test-bundle - ${parent.version} - test - - - org.springframework.osgi - org.springframework.osgi.test - 1.0-SNAPSHOT - provided - - - org.springframework.osgi - spring-core - 2.1-SNAPSHOT - provided - - - org.springframework.osgi - spring-context - 2.1-SNAPSHOT - provided - - - org.springframework.osgi - spring-beans - 2.1-SNAPSHOT - provided - + org.slf4j + slf4j-osgi-integration-test + jar + SLF4J OSGi Integration Test + + http://www.slf4j.org + OSGi integration tests + + + + + + org.apache.felix + javax.servlet + 0.8.0-SNAPSHOT + test + + + + org.osgi + org.osgi.compendium + 4.0 + provided + + + + junit + junit + 3.8.1 + test + + + org.slf4j + slf4j-osgi-test-bundle + ${parent.version} + test + + + org.springframework.osgi + org.springframework.osgi.test + 1.0-SNAPSHOT + provided + + + org.springframework.osgi + spring-core + 2.1-SNAPSHOT + provided + + + org.springframework.osgi + spring-context + 2.1-SNAPSHOT + provided + + + org.springframework.osgi + spring-beans + 2.1-SNAPSHOT + provided + - - org.springframework.osgi - spring-mock - 2.1-SNAPSHOT - jar - test - - - org.springframework.osgi - jcl104-over-slf4j.osgi - 1.1.0 - provided - - - org.slf4j - slf4j-log4j-full - 1.1.0 - provided - - - org.springframework.osgi - log4j.osgi - 1.2.13-SNAPSHOT - test - - - org.springframework.osgi - backport-util-concurrent - 3.0-SNAPSHOT - test - - + + org.springframework.osgi + spring-mock + 2.1-SNAPSHOT + jar + test + + + org.springframework.osgi + jcl104-over-slf4j.osgi + 1.1.0 + provided + + + org.slf4j + slf4j-log4j-full + 1.1.0 + provided + + + org.springframework.osgi + log4j.osgi + 1.2.13-SNAPSHOT + test + + + org.springframework.osgi + backport-util-concurrent + 3.0-SNAPSHOT + test + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - org.springframework.osgi.test.framework - ${osgi.test.platform} - - - org.osgi.framework.system.packages - ${osgi.test.system.packages} - - - - - - - default - test - - - - integration-test - integration-test - - test - - - false - pertest - - - - - - - - - equinox - - true - - - - org.eclipse.equinox - org.eclipse.osgi - 3.2.0 - jar - provided - - - - org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management - equinox - - - - knopflerfish - - - org.knopflerfish - framework - 2.0.1 - jar - provided - - - - - org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management - knopflerfish - - - - felix - - - org.apache.felix - org.apache.felix.framework - 0.8.0-SNAPSHOT - jar - provided - - - org.apache.felix - org.apache.felix.main - 0.8.0-SNAPSHOT - jar - provided - - - org.apache.felix - org.osgi.core - 0.8.0-SNAPSHOT - jar - runtime - - - - felix - - - - + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + org.springframework.osgi.test.framework + ${osgi.test.platform} + + + org.osgi.framework.system.packages + ${osgi.test.system.packages} + + + + + + + default + test + + + + integration-test + integration-test + + test + + + false + pertest + + + + + + + + + equinox + + true + + + + org.eclipse.equinox + org.eclipse.osgi + 3.2.0 + jar + provided + + + + org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management + + equinox + + + + knopflerfish + + + org.knopflerfish + framework + 2.0.1 + jar + provided + + + + + org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management + + knopflerfish + + + + felix + + + org.apache.felix + org.apache.felix.framework + 0.8.0-SNAPSHOT + jar + provided + + + org.apache.felix + org.apache.felix.main + 0.8.0-SNAPSHOT + jar + provided + + + org.apache.felix + org.osgi.core + 0.8.0-SNAPSHOT + jar + runtime + + + + felix + + + + \ No newline at end of file diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 4faaa29f..f62fab3c 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -1,79 +1,76 @@ - - - org.slf4j - slf4j-parent - 1.6.5-SNAPSHOT - - - 4.0.0 - - org.slf4j - slf4j-osgi-test-bundle - bundle - SLF4J Testing Bundle - - http://www.slf4j.org - - The slf4j OSGi testing bundle. - + 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/maven-v4_0_0.xsd"> - - - org.slf4j - slf4j-api - provided - + + org.slf4j + slf4j-parent + 1.6.5-SNAPSHOT + + + 4.0.0 + + org.slf4j + slf4j-osgi-test-bundle + bundle + SLF4J Testing Bundle + SLF4J OSGi testing bundle. + http://www.slf4j.org + + + + org.slf4j + slf4j-api + provided + + + + org.slf4j + slf4j-nop + ${project.version} + provided + + + + + org.slf4j + jcl-over-slf4j + ${project.version} + provided + + + + org.apache.felix + org.osgi.core + 0.8.0-SNAPSHOT + provided + + + + + + + org.apache.felix + maven-bundle-plugin + 0.9.0-incubator-SNAPSHOT + true + + + + org.slf4j.osgi.test.service + + org.slf4j.osgi.test + + org.osgi.framework,org.slf4j;version="[1.3,1.4)" + + org.slf4j.osgi.test.Activator + org.apache.commons.logging + + + + + - - org.slf4j - slf4j-nop - ${project.version} - provided - - - - - org.slf4j - jcl-over-slf4j - ${project.version} - provided - - - - org.apache.felix - org.osgi.core - 0.8.0-SNAPSHOT - provided - - - - - - - org.apache.felix - maven-bundle-plugin - 0.9.0-incubator-SNAPSHOT - true - - - - org.slf4j.osgi.test.service - - org.slf4j.osgi.test - - org.osgi.framework,org.slf4j;version="[1.3,1.4)" - - org.slf4j.osgi.test.Activator - org.apache.commons.logging - - - - - - \ No newline at end of file diff --git a/slf4j-scala-api/pom.xml b/slf4j-scala-api/pom.xml index 7ab9ef15..8ba71349 100644 --- a/slf4j-scala-api/pom.xml +++ b/slf4j-scala-api/pom.xml @@ -1,6 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> org.slf4j @@ -57,7 +57,7 @@ ${project.version} test - + @@ -185,7 +185,7 @@ - + diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 612f1e83..fe7d0575 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -1,31 +1,31 @@ - + org.slf4j slf4j-parent 1.6.5-SNAPSHOT - - 4.0.0 - org.slf4j - slf4j-simple - jar - SLF4J Simple Binding + 4.0.0 - http://www.slf4j.org + org.slf4j + slf4j-simple + jar + SLF4J Simple Binding SLF4J Simple binding + http://www.slf4j.org - + org.slf4j slf4j-api - + - + org.apache.maven.plugins maven-jar-plugin @@ -38,11 +38,11 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + + + + \ No newline at end of file diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 6d897ab7..196655ec 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -14,7 +14,7 @@ slf4j-site jar SLF4J Site - + SLF4J Site http://www.slf4j.org diff --git a/slf4j-site/src/site/pages/legacy.html b/slf4j-site/src/site/pages/legacy.html index 866f1b90..7817684b 100644 --- a/slf4j-site/src/site/pages/legacy.html +++ b/slf4j-site/src/site/pages/legacy.html @@ -210,7 +210,8 @@ javadocs for usage instructions.

-

Contrary to other bridging modules, namely jcl-over-slf4j and +

Note on performance Contrary + to other bridging modules, namely jcl-over-slf4j and log4j-over-slf4j, which reimplement JCL and respectively log4j, the jul-to-slf4j module does not reimplement the java.util.logging because packages under the java.* namespace cannot be @@ -221,18 +222,17 @@ instance regardless of whether the SLF4J logger is disabled for the given level or nor. Consequently, j.u.l. to SLF4J translation can seriously increase the cost of disabled logging - statements (60 fold or 6000% increase) and - measurably impact the performance of enabled log statements (20% - overall increase). Please note that as of logback-version - 0.9.25, it is possible to completely eliminate the 60 fold - translation overhead for disabled log statements with the help of - + As of logback-version 0.9.25, it is possible to completely + eliminate the 60 fold translation overhead for disabled log + statements with the help of LevelChangePropagator.

If you are concerned about application performance, then use of - SLF4JBridgeHandler is appropriate only if one the - following two conditions is true: + SLF4JBridgeHandler is appropriate only if any one of + the following two conditions is true:

  1. few j.u.l. logging statements are in play