This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via d8b43cb95f870840c8068efc4ccdb3487aebd41e (commit) from f880d89e0adcee2383032b9194c5d30bc8c6085b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=d8b43cb95f870840c8068efc4cc... http://github.com/ceki/slf4j/commit/d8b43cb95f870840c8068efc4ccdb3487aebd41e commit d8b43cb95f870840c8068efc4ccdb3487aebd41e Author: Ceki Gulcu <ceki@qos.ch> Date: Tue May 8 18:47:02 2012 +0200 moving to oss.sonatype repo, indentation changes diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 52385b5..5ac9863 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -12,11 +12,9 @@ <artifactId>jcl-over-slf4j</artifactId> <packaging>jar</packaging> <name>JCL 1.1.1 implemented over SLF4J</name> - + <description>JCL 1.1.1 implemented over SLF4J</description> <url>http://www.slf4j.org</url> - <description> - JCL 1.1.1 implementation over SLF4J - </description> + <dependencies> <!-- diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index ca64d4b..4851fcf 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -16,11 +16,9 @@ <packaging>jar</packaging> <name>JUL to SLF4J bridge</name> + <description>JUL to SLF4J bridge</description> <url>http://www.slf4j.org</url> - <description> - JUL to SLF4J bridge - </description> <dependencies> <dependency> diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index f7aea0b..e59549b 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -14,17 +14,10 @@ <artifactId>log4j-over-slf4j</artifactId> <packaging>jar</packaging> <name>Log4j Implemented Over SLF4J</name> + <description>Log4j implemented over SLF4J</description> <url>http://www.slf4j.org</url> - <description> - <!-- - Never _never_ let Eclipse's auto format function add - a line return in the description. - The generated jar will contain a corrupt MANIFEST file. - --> - Log4j implemented over SLF4J - </description> <licenses> <license> <name>Apache Software Licenses</name> diff --git a/pom.xml b/pom.xml index f38e7ed..060166f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <packaging>pom</packaging> <name>SLF4J</name> - + <description>Top SLF4J project pom.xml file</description> <url>http://www.slf4j.org</url> <organization> @@ -28,6 +28,11 @@ </license> </licenses> + <scm> + <url>https://github.com/ceki/slf4j</url> + <connection>git@github.com:ceki/slf4j.git</connection> + </scm> + <properties> <slf4j.api.minimum.compatible.version>1.6.0 </slf4j.api.minimum.compatible.version> @@ -35,6 +40,13 @@ <log4j.version>1.2.16</log4j.version> </properties> + <developers> + <developer> + <id>ceki</id> + <name>Ceki Gulcu</name> + <email>ceki@qos.ch</email> + </developer> + </developers> <modules> <module>slf4j-api</module> @@ -373,6 +385,28 @@ </pluginRepositories> </profile> + <profile> + <id>sign-artifacts</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <pluginRepositories> @@ -389,13 +423,6 @@ </pluginRepository> </pluginRepositories> - <scm> - <connection>scm:svn:http://svn.slf4j.org/repos/slf4j/trunk</connection> - <developerConnection>scm:svn:https://svn.slf4j.org/repos/slf4j/trunk - </developerConnection> - <url>http://svn.slf4j.org/viewvc/slf4j/trunk/</url> - </scm> - <distributionManagement> <site> <id>pixie</id> @@ -403,8 +430,10 @@ </site> <repository> - <id>pixie</id> - <url>scp://pixie.qos.ch/var/mvnrepo/</url> + <!--<id>pixie</id>--> + <!--<url>scp://pixie.qos.ch/var/mvnrepo/</url>--> + <id>sonatype-nexus-staging</id> + <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> </repository> </distributionManagement> diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 3048cf5..0626cb2 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -14,9 +14,9 @@ <artifactId>slf4j-api</artifactId> <packaging>jar</packaging> <name>SLF4J API Module</name> + <description>The slf4j API</description> <url>http://www.slf4j.org</url> - <description>The slf4j API</description> <dependencies> diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 1c4cc8f..65410bb 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -14,9 +14,9 @@ <artifactId>slf4j-ext</artifactId> <packaging>jar</packaging> <name>SLF4J Extensions Module</name> + <description>Extensions to the SLF4J API</description> <url>http://www.slf4j.org</url> - <description>Extensions to the SLF4J API</description> <dependencies> <dependency> diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index ba0ef72..a8517bd 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -12,12 +12,10 @@ <artifactId>slf4j-jcl</artifactId> <packaging>jar</packaging> <name>SLF4J JCL Binding</name> + <description>SLF4J JCL Binding</description> <url>http://www.slf4j.org</url> - <description> - The slf4j jcl binding - </description> <dependencies> <dependency> diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 1c964b3..8185e8f 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -1,32 +1,30 @@ -<project - 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"> +<project + 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"> - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <name>SLF4J JDK14 Binding</name> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + + <packaging>jar</packaging> + <name>SLF4J JDK14 Binding</name> + <description>SLF4J JDK14 Binding</description> + <url>http://www.slf4j.org</url> - <url>http://www.slf4j.org</url> - <description> - The slf4j JDK14 binding - </description> <dependencies> - <dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -38,19 +36,19 @@ </dependencies> <build> - <plugins> + <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -61,7 +59,7 @@ </manifestEntries> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> </archive> - </configuration> + </configuration> </plugin> </plugins> </build> diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index e7c4d38..d202266 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -1,55 +1,52 @@ -<project - 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"> +<project + 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"> - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <packaging>jar</packaging> - <name>SLF4J LOG4J-12 Binding</name> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <packaging>jar</packaging> + <name>SLF4J LOG4J-12 Binding</name> + <description>SLF4J LOG4J-12 Binding</description> + <url>http://www.slf4j.org</url> - <url>http://www.slf4j.org</url> - <description> - The slf4j log4j-12 binding - </description> - <dependencies> - <dependency> + <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> + <artifactId>slf4j-api</artifactId> + </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - </dependency> + </dependency> </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - </manifestEntries> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + </manifestEntries> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> </plugins> </build> diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 6596f00..da41ccf 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -1,26 +1,27 @@ -<project - 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"> - - - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> +<project + 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"> + + + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.slf4j</groupId> + <artifactId>slf4j-migrator</artifactId> + <packaging>jar</packaging> + <name>SLF4J Migrator</name> + <description>SLF4J Migrator</description> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-migrator</artifactId> - <packaging>jar</packaging> - <name>SLF4J Migrator</name> - <build> <plugins> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -28,7 +29,7 @@ <target>1.5</target> </configuration> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index cfc333f..6af5a0c 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -1,36 +1,34 @@ -<project - 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"> +<project + 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"> - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - <packaging>jar</packaging> - <name>SLF4J NOP Binding</name> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + <packaging>jar</packaging> + <name>SLF4J NOP Binding</name> + <description>SLF4J NOP Binding</description> + <url>http://www.slf4j.org</url> - <url>http://www.slf4j.org</url> - <description> - The slf4j NOP binding - </description> <dependencies> - <dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - </dependency> + </dependency> </dependencies> <build> <plugins> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -43,8 +41,8 @@ </manifestEntries> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> </archive> - </configuration> - </plugin> + </configuration> + </plugin> </plugins> </build> diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index c07d314..900a6df 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -1,240 +1,241 @@ <project - 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"> - - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.slf4j</groupId> - <artifactId>slf4j-osgi-integration-test</artifactId> - <packaging>jar</packaging> - <name>SLF4J OSGi Integration Test</name> - - <url>http://www.slf4j.org</url> - <description> - OSGi integration tests for the slf4j. - </description> - <!-- These dependencies are deceptive they are only for the springframework testing env. - bundles being tested are specified in the --> + 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"> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>javax.servlet</artifactId> - <version>0.8.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.0</version> - <scope>provided</scope> - </dependency> + <modelVersion>4.0.0</modelVersion> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-osgi-test-bundle</artifactId> - <version>${parent.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>org.springframework.osgi.test</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-core</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-context</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-beans</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-osgi-integration-test</artifactId> + <packaging>jar</packaging> + <name>SLF4J OSGi Integration Test</name> + <url>http://www.slf4j.org</url> + <description>OSGi integration tests</description> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-mock</artifactId> - <version>2.1-SNAPSHOT</version> - <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>jcl104-over-slf4j.osgi</artifactId> - <version>1.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j-full</artifactId> - <version>1.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>log4j.osgi</artifactId> - <version>1.2.13-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> + <!-- These dependencies are deceptive they are only for the springframework testing env. +bundles being tested are specified in the --> + <dependencies> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>javax.servlet</artifactId> + <version>0.8.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>4.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-osgi-test-bundle</artifactId> + <version>${parent.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>org.springframework.osgi.test</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-core</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-context</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-beans</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-mock</artifactId> + <version>2.1-SNAPSHOT</version> + <type>jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>jcl104-over-slf4j.osgi</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j-full</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>log4j.osgi</artifactId> + <version>1.2.13-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>backport-util-concurrent</artifactId> + <version>3.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> <!-- run tests during the integration-test phase, not the normal test phase --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - <systemProperties> - <property> - <name>org.springframework.osgi.test.framework</name> - <value>${osgi.test.platform}</value> - </property> - <property> - <name>org.osgi.framework.system.packages</name> - <value>${osgi.test.system.packages}</value> - </property> - <!-- - <property> - <name>org.osgi.vendor.framework</name> - <value>${org.osgi.vendor.framework}</value> - </property> - --> - </systemProperties> - </configuration> - <executions> - <execution> - <id>default</id> - <phase>test</phase> - <goals></goals> - </execution> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <forkMode>pertest</forkMode> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>equinox</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>3.2.0</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - </dependencies> - <properties> - <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management</osgi.test.system.packages> - <osgi.test.platform>equinox</osgi.test.platform> - </properties> - </profile> - <profile> - <id>knopflerfish</id> - <dependencies> - <dependency> - <groupId>org.knopflerfish</groupId> - <artifactId>framework</artifactId> - <version>2.0.1</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - </dependencies> - <properties> - <!-- knopflerfish testing requires that the system property - org.osgi.framework.system.packages be set with a list - system packages that are to be imported on the kf classpath. - This property is a placeholder for the list. See the surefire - plugin configuration systemProperties referenced above to see - the mapping to this element. --> - <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management</osgi.test.system.packages> - <osgi.test.platform>knopflerfish</osgi.test.platform> - </properties> - </profile> - <profile> - <id>felix</id> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>0.8.0-SNAPSHOT</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>0.8.0-SNAPSHOT</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>0.8.0-SNAPSHOT</version> - <type>jar</type> - <scope>runtime</scope> - </dependency> - </dependencies> - <properties> - <osgi.test.platform>felix</osgi.test.platform> - <!-- <org.osgi.vendor.framework>org.apache.felix.framework</org.osgi.vendor.framework> --> - </properties> - </profile> - </profiles> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + <systemProperties> + <property> + <name>org.springframework.osgi.test.framework</name> + <value>${osgi.test.platform}</value> + </property> + <property> + <name>org.osgi.framework.system.packages</name> + <value>${osgi.test.system.packages}</value> + </property> + <!-- + <property> + <name>org.osgi.vendor.framework</name> + <value>${org.osgi.vendor.framework}</value> + </property> + --> + </systemProperties> + </configuration> + <executions> + <execution> + <id>default</id> + <phase>test</phase> + <goals></goals> + </execution> + <execution> + <id>integration-test</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <forkMode>pertest</forkMode> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>equinox</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>3.2.0</version> + <type>jar</type> + <scope>provided</scope> + </dependency> + </dependencies> + <properties> + <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management + </osgi.test.system.packages> + <osgi.test.platform>equinox</osgi.test.platform> + </properties> + </profile> + <profile> + <id>knopflerfish</id> + <dependencies> + <dependency> + <groupId>org.knopflerfish</groupId> + <artifactId>framework</artifactId> + <version>2.0.1</version> + <type>jar</type> + <scope>provided</scope> + </dependency> + </dependencies> + <properties> + <!-- knopflerfish testing requires that the system property + org.osgi.framework.system.packages be set with a list + system packages that are to be imported on the kf classpath. + This property is a placeholder for the list. See the surefire + plugin configuration systemProperties referenced above to see + the mapping to this element. --> + <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management + </osgi.test.system.packages> + <osgi.test.platform>knopflerfish</osgi.test.platform> + </properties> + </profile> + <profile> + <id>felix</id> + <dependencies> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>0.8.0-SNAPSHOT</version> + <type>jar</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>0.8.0-SNAPSHOT</version> + <type>jar</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>0.8.0-SNAPSHOT</version> + <type>jar</type> + <scope>runtime</scope> + </dependency> + </dependencies> + <properties> + <osgi.test.platform>felix</osgi.test.platform> + <!-- <org.osgi.vendor.framework>org.apache.felix.framework</org.osgi.vendor.framework> --> + </properties> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 4faaa29..f62fab3 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -1,79 +1,76 @@ <project - 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"> - - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.5-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.slf4j</groupId> - <artifactId>slf4j-osgi-test-bundle</artifactId> - <packaging>bundle</packaging> - <name>SLF4J Testing Bundle</name> - - <url>http://www.slf4j.org</url> - <description> - The slf4j OSGi testing bundle. - </description> + 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"> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.slf4j</groupId> + <artifactId>slf4j-osgi-test-bundle</artifactId> + <packaging>bundle</packaging> + <name>SLF4J Testing Bundle</name> + <description>SLF4J OSGi testing bundle.</description> + <url>http://www.slf4j.org</url> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- To get org.apache.commons.logging package for + commons logging testing.--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>0.8.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>0.9.0-incubator-SNAPSHOT</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.slf4j.osgi.test.service + </Export-Package> + <Private-Package>org.slf4j.osgi.test</Private-Package> + <Import-Package> + org.osgi.framework,org.slf4j;version="[1.3,1.4)" + </Import-Package> + <Bundle-Activator>org.slf4j.osgi.test.Activator</Bundle-Activator> + <DynamicImport-Package>org.apache.commons.logging</DynamicImport-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <!-- To get org.apache.commons.logging package for - commons logging testing.--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>0.8.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>0.9.0-incubator-SNAPSHOT</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.slf4j.osgi.test.service - </Export-Package> - <Private-Package>org.slf4j.osgi.test</Private-Package> - <Import-Package> - org.osgi.framework,org.slf4j;version="[1.3,1.4)" - </Import-Package> - <Bundle-Activator>org.slf4j.osgi.test.Activator</Bundle-Activator> - <DynamicImport-Package>org.apache.commons.logging</DynamicImport-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file diff --git a/slf4j-scala-api/pom.xml b/slf4j-scala-api/pom.xml index 7ab9ef1..8ba7134 100644 --- a/slf4j-scala-api/pom.xml +++ b/slf4j-scala-api/pom.xml @@ -1,6 +1,6 @@ <project 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"> + 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"> <parent> <groupId>org.slf4j</groupId> @@ -57,7 +57,7 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - </dependencies> + </dependencies> <build> <plugins> @@ -185,7 +185,7 @@ </plugins> </build> - + <reporting> <plugins> <plugin> diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 612f1e8..fe7d057 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -1,31 +1,31 @@ -<project 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"> +<project 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"> <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> <version>1.6.5-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <packaging>jar</packaging> - <name>SLF4J Simple Binding</name> + <modelVersion>4.0.0</modelVersion> - <url>http://www.slf4j.org</url> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <packaging>jar</packaging> + <name>SLF4J Simple Binding</name> <description>SLF4J Simple binding</description> + <url>http://www.slf4j.org</url> <dependencies> - <dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - </dependency> + </dependency> </dependencies> <build> - <plugins> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -38,11 +38,11 @@ </manifestEntries> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> </archive> - </configuration> - </plugin> - - </plugins> - </build> + </configuration> + </plugin> + + </plugins> + </build> </project> \ No newline at end of file diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 6d897ab..196655e 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -14,7 +14,7 @@ <artifactId>slf4j-site</artifactId> <packaging>jar</packaging> <name>SLF4J Site</name> - + <description>SLF4J Site</description> <url>http://www.slf4j.org</url> <build> diff --git a/slf4j-site/src/site/pages/legacy.html b/slf4j-site/src/site/pages/legacy.html index 866f1b9..7817684 100644 --- a/slf4j-site/src/site/pages/legacy.html +++ b/slf4j-site/src/site/pages/legacy.html @@ -210,7 +210,8 @@ javadocs</a> for usage instructions. </p> - <p>Contrary to other bridging modules, namely jcl-over-slf4j and + <p><span class="label notice">Note on performance</span> 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. <b>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).</b> 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 - <a + statements (60 fold or 6000%) and measurably impact the + performance of enabled log statements (20% overall increase).</b> + 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 <a href="http://logback.qos.ch/manual/configuration.html#LevelChangePropagator">LevelChangePropagator</a>. </p> <p>If you are concerned about application performance, then use of - <code>SLF4JBridgeHandler</code> is appropriate only if one the - following two conditions is true: + <code>SLF4JBridgeHandler</code> is appropriate only if any one of + the following two conditions is true: </p> <ol> <li>few j.u.l. logging statements are in play </li> ----------------------------------------------------------------------- Summary of changes: jcl-over-slf4j/pom.xml | 6 +- jul-to-slf4j/pom.xml | 4 +- log4j-over-slf4j/pom.xml | 9 +- pom.xml | 49 +++- slf4j-api/pom.xml | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 4 +- slf4j-jdk14/pom.xml | 64 +++--- slf4j-log4j12/pom.xml | 73 +++--- slf4j-migrator/pom.xml | 41 ++-- slf4j-nop/pom.xml | 46 ++-- slf4j-osgi-integration-test/pom.xml | 461 +++++++++++++++++---------------- slf4j-osgi-test-bundle/pom.xml | 147 +++++------ slf4j-scala-api/pom.xml | 8 +- slf4j-simple/pom.xml | 32 ++-- slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/legacy.html | 18 +- 17 files changed, 488 insertions(+), 480 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java