natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moving to oss.sonatype repo, indentation changes

This commit is contained in:
Ceki Gulcu 2012-05-08 18:47:02 +02:00
parent f880d89e0a
commit d8b43cb95f
17 changed files with 488 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jcl-over-slf4j/pom.xml
View File

@ -12,11 +12,9 @@
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>JCL 1.1.1 implemented over SLF4J</name> <name>JCL 1.1.1 implemented over SLF4J</name>
<description>JCL 1.1.1 implemented over SLF4J</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<description>
JCL 1.1.1 implementation over SLF4J
</description>
<dependencies> <dependencies>
<!-- <!--

4
jul-to-slf4j/pom.xml
View File

@ -16,11 +16,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>JUL to SLF4J bridge</name> <name>JUL to SLF4J bridge</name>
<description>JUL to SLF4J bridge</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<description>
JUL to SLF4J bridge
</description>
<dependencies> <dependencies>
<dependency> <dependency>

9
log4j-over-slf4j/pom.xml
View File

@ -14,17 +14,10 @@
<artifactId>log4j-over-slf4j</artifactId> <artifactId>log4j-over-slf4j</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Log4j Implemented Over SLF4J</name> <name>Log4j Implemented Over SLF4J</name>
<description>Log4j implemented over SLF4J</description>
<url>http://www.slf4j.org</url> <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> <licenses>
<license> <license>
<name>Apache Software Licenses</name> <name>Apache Software Licenses</name>

49
pom.xml
View File

@ -11,7 +11,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>SLF4J</name> <name>SLF4J</name>
<description>Top SLF4J project pom.xml file</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<organization> <organization>
@ -28,6 +28,11 @@
</license> </license>
</licenses> </licenses>
<scm>
<url>https://github.com/ceki/slf4j</url>
<connection>git@github.com:ceki/slf4j.git</connection>
</scm>
<properties> <properties>
<slf4j.api.minimum.compatible.version>1.6.0 <slf4j.api.minimum.compatible.version>1.6.0
</slf4j.api.minimum.compatible.version> </slf4j.api.minimum.compatible.version>
@ -35,6 +40,13 @@
<log4j.version>1.2.16</log4j.version> <log4j.version>1.2.16</log4j.version>
</properties> </properties>
<developers>
<developer>
<id>ceki</id>
<name>Ceki Gulcu</name>
<email>ceki@qos.ch</email>
</developer>
</developers>
<modules> <modules>
<module>slf4j-api</module> <module>slf4j-api</module>
@ -373,6 +385,28 @@
</pluginRepositories> </pluginRepositories>
</profile> </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> </profiles>
<pluginRepositories> <pluginRepositories>
@ -389,13 +423,6 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </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> <distributionManagement>
<site> <site>
<id>pixie</id> <id>pixie</id>
@ -403,8 +430,10 @@
</site> </site>
<repository> <repository>
<id>pixie</id> <!--<id>pixie</id>-->
<url>scp://pixie.qos.ch/var/mvnrepo/</url> <!--<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> </repository>
</distributionManagement> </distributionManagement>

2
slf4j-api/pom.xml
View File

@ -14,9 +14,9 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SLF4J API Module</name> <name>SLF4J API Module</name>
<description>The slf4j API</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<description>The slf4j API</description>
<dependencies> <dependencies>

2
slf4j-ext/pom.xml
View File

@ -14,9 +14,9 @@
<artifactId>slf4j-ext</artifactId> <artifactId>slf4j-ext</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SLF4J Extensions Module</name> <name>SLF4J Extensions Module</name>
<description>Extensions to the SLF4J API</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<description>Extensions to the SLF4J API</description>
<dependencies> <dependencies>
<dependency> <dependency>

4
slf4j-jcl/pom.xml
View File

@ -12,12 +12,10 @@
<artifactId>slf4j-jcl</artifactId> <artifactId>slf4j-jcl</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SLF4J JCL Binding</name> <name>SLF4J JCL Binding</name>
<description>SLF4J JCL Binding</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<description>
The slf4j jcl binding
</description>
<dependencies> <dependencies>
<dependency> <dependency>

64
slf4j-jdk14/pom.xml
View File

@ -1,32 +1,30 @@
<project <project
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId> <artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version> <version>1.6.5-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>slf4j-jdk14</artifactId>
<packaging>jar</packaging> <groupId>org.slf4j</groupId>
<name>SLF4J JDK14 Binding</name> <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> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -38,19 +36,19 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.4</source> <source>1.4</source>
<target>1.4</target> <target>1.4</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
@ -61,7 +59,7 @@
</manifestEntries> </manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

73
slf4j-log4j12/pom.xml
View File

@ -1,55 +1,52 @@
<project <project
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId> <artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version> <version>1.6.5-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>slf4j-log4j12</artifactId>
<packaging>jar</packaging> <groupId>org.slf4j</groupId>
<name>SLF4J LOG4J-12 Binding</name> <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> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description> <Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version> <Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries> </manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

41
slf4j-migrator/pom.xml
View File

@ -1,26 +1,27 @@
<project <project
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId> <artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version> <version>1.6.5-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <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> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
@ -28,7 +29,7 @@
<target>1.5</target> <target>1.5</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>

46
slf4j-nop/pom.xml
View File

@ -1,36 +1,34 @@
<project <project
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId> <artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version> <version>1.6.5-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>slf4j-nop</artifactId>
<packaging>jar</packaging> <groupId>org.slf4j</groupId>
<name>SLF4J NOP Binding</name> <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> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
@ -43,8 +41,8 @@
</manifestEntries> </manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

461
slf4j-osgi-integration-test/pom.xml
View File

@ -1,240 +1,241 @@
<project <project
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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 -->
<dependencies> <parent>
<dependency> <groupId>org.slf4j</groupId>
<groupId>org.apache.felix</groupId> <artifactId>slf4j-parent</artifactId>
<artifactId>javax.servlet</artifactId> <version>1.6.5-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version> </parent>
<scope>test</scope>
</dependency>
<dependency> <modelVersion>4.0.0</modelVersion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>4.0</version>
<scope>provided</scope>
</dependency>
<dependency> <groupId>org.slf4j</groupId>
<groupId>junit</groupId> <artifactId>slf4j-osgi-integration-test</artifactId>
<artifactId>junit</artifactId> <packaging>jar</packaging>
<version>3.8.1</version> <name>SLF4J OSGi Integration Test</name>
<scope>test</scope>
</dependency> <url>http://www.slf4j.org</url>
<dependency> <description>OSGi integration tests</description>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-osgi-test-bundle</artifactId> <!-- These dependencies are deceptive they are only for the springframework testing env.
<version>${parent.version}</version> bundles being tested are specified in the -->
<scope>test</scope>
</dependency> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.osgi</groupId> <groupId>org.apache.felix</groupId>
<artifactId>org.springframework.osgi.test</artifactId> <artifactId>javax.servlet</artifactId>
<version>1.0-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<scope>provided</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.osgi</groupId> <dependency>
<artifactId>spring-core</artifactId> <groupId>org.osgi</groupId>
<version>2.1-SNAPSHOT</version> <artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope> <version>4.0</version>
</dependency> <scope>provided</scope>
<dependency> </dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-context</artifactId> <dependency>
<version>2.1-SNAPSHOT</version> <groupId>junit</groupId>
<scope>provided</scope> <artifactId>junit</artifactId>
</dependency> <version>3.8.1</version>
<dependency> <scope>test</scope>
<groupId>org.springframework.osgi</groupId> </dependency>
<artifactId>spring-beans</artifactId> <dependency>
<version>2.1-SNAPSHOT</version> <groupId>org.slf4j</groupId>
<scope>provided</scope> <artifactId>slf4j-osgi-test-bundle</artifactId>
</dependency> <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> <dependency>
<groupId>org.springframework.osgi</groupId> <groupId>org.springframework.osgi</groupId>
<artifactId>spring-mock</artifactId> <artifactId>spring-mock</artifactId>
<version>2.1-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.osgi</groupId> <groupId>org.springframework.osgi</groupId>
<artifactId>jcl104-over-slf4j.osgi</artifactId> <artifactId>jcl104-over-slf4j.osgi</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j-full</artifactId> <artifactId>slf4j-log4j-full</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.osgi</groupId> <groupId>org.springframework.osgi</groupId>
<artifactId>log4j.osgi</artifactId> <artifactId>log4j.osgi</artifactId>
<version>1.2.13-SNAPSHOT</version> <version>1.2.13-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.osgi</groupId> <groupId>org.springframework.osgi</groupId>
<artifactId>backport-util-concurrent</artifactId> <artifactId>backport-util-concurrent</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
</configuration> </configuration>
</plugin> </plugin>
<!-- run tests during the integration-test phase, not the normal test phase --> <!-- run tests during the integration-test phase, not the normal test phase -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
<systemProperties> <systemProperties>
<property> <property>
<name>org.springframework.osgi.test.framework</name> <name>org.springframework.osgi.test.framework</name>
<value>${osgi.test.platform}</value> <value>${osgi.test.platform}</value>
</property> </property>
<property> <property>
<name>org.osgi.framework.system.packages</name> <name>org.osgi.framework.system.packages</name>
<value>${osgi.test.system.packages}</value> <value>${osgi.test.system.packages}</value>
</property> </property>
<!-- <!--
<property> <property>
<name>org.osgi.vendor.framework</name> <name>org.osgi.vendor.framework</name>
<value>${org.osgi.vendor.framework}</value> <value>${org.osgi.vendor.framework}</value>
</property> </property>
--> -->
</systemProperties> </systemProperties>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>default</id> <id>default</id>
<phase>test</phase> <phase>test</phase>
<goals></goals> <goals></goals>
</execution> </execution>
<execution> <execution>
<id>integration-test</id> <id>integration-test</id>
<phase>integration-test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<skip>false</skip> <skip>false</skip>
<forkMode>pertest</forkMode> <forkMode>pertest</forkMode>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>equinox</id> <id>equinox</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.equinox</groupId> <groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.osgi</artifactId> <artifactId>org.eclipse.osgi</artifactId>
<version>3.2.0</version> <version>3.2.0</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management</osgi.test.system.packages> <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management
<osgi.test.platform>equinox</osgi.test.platform> </osgi.test.system.packages>
</properties> <osgi.test.platform>equinox</osgi.test.platform>
</profile> </properties>
<profile> </profile>
<id>knopflerfish</id> <profile>
<dependencies> <id>knopflerfish</id>
<dependency> <dependencies>
<groupId>org.knopflerfish</groupId> <dependency>
<artifactId>framework</artifactId> <groupId>org.knopflerfish</groupId>
<version>2.0.1</version> <artifactId>framework</artifactId>
<type>jar</type> <version>2.0.1</version>
<scope>provided</scope> <type>jar</type>
</dependency> <scope>provided</scope>
</dependencies> </dependency>
<properties> </dependencies>
<!-- knopflerfish testing requires that the system property <properties>
org.osgi.framework.system.packages be set with a list <!-- knopflerfish testing requires that the system property
system packages that are to be imported on the kf classpath. org.osgi.framework.system.packages be set with a list
This property is a placeholder for the list. See the surefire system packages that are to be imported on the kf classpath.
plugin configuration systemProperties referenced above to see This property is a placeholder for the list. See the surefire
the mapping to this element. --> plugin configuration systemProperties referenced above to see
<osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management</osgi.test.system.packages> the mapping to this element. -->
<osgi.test.platform>knopflerfish</osgi.test.platform> <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management
</properties> </osgi.test.system.packages>
</profile> <osgi.test.platform>knopflerfish</osgi.test.platform>
<profile> </properties>
<id>felix</id> </profile>
<dependencies> <profile>
<dependency> <id>felix</id>
<groupId>org.apache.felix</groupId> <dependencies>
<artifactId>org.apache.felix.framework</artifactId> <dependency>
<version>0.8.0-SNAPSHOT</version> <groupId>org.apache.felix</groupId>
<type>jar</type> <artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope> <version>0.8.0-SNAPSHOT</version>
</dependency> <type>jar</type>
<dependency> <scope>provided</scope>
<groupId>org.apache.felix</groupId> </dependency>
<artifactId>org.apache.felix.main</artifactId> <dependency>
<version>0.8.0-SNAPSHOT</version> <groupId>org.apache.felix</groupId>
<type>jar</type> <artifactId>org.apache.felix.main</artifactId>
<scope>provided</scope> <version>0.8.0-SNAPSHOT</version>
</dependency> <type>jar</type>
<dependency> <scope>provided</scope>
<groupId>org.apache.felix</groupId> </dependency>
<artifactId>org.osgi.core</artifactId> <dependency>
<version>0.8.0-SNAPSHOT</version> <groupId>org.apache.felix</groupId>
<type>jar</type> <artifactId>org.osgi.core</artifactId>
<scope>runtime</scope> <version>0.8.0-SNAPSHOT</version>
</dependency> <type>jar</type>
</dependencies> <scope>runtime</scope>
<properties> </dependency>
<osgi.test.platform>felix</osgi.test.platform> </dependencies>
<!-- <org.osgi.vendor.framework>org.apache.felix.framework</org.osgi.vendor.framework> --> <properties>
</properties> <osgi.test.platform>felix</osgi.test.platform>
</profile> <!-- <org.osgi.vendor.framework>org.apache.felix.framework</org.osgi.vendor.framework> -->
</profiles> </properties>
</profile>
</profiles>
</project> </project>

147
slf4j-osgi-test-bundle/pom.xml
View File

@ -1,79 +1,76 @@
<project <project
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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>
<dependencies> <parent>
<dependency> <groupId>org.slf4j</groupId>
<groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId>
<artifactId>slf4j-api</artifactId> <version>1.6.5-SNAPSHOT</version>
<scope>provided</scope> </parent>
</dependency>
<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> </project>

8
slf4j-scala-api/pom.xml
View File

@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -57,7 +57,7 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
@ -185,7 +185,7 @@
</plugins> </plugins>
</build> </build>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>

32
slf4j-simple/pom.xml
View File

@ -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> <parent>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId> <artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version> <version>1.6.5-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>slf4j-simple</artifactId>
<packaging>jar</packaging>
<name>SLF4J Simple Binding</name>
<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> <description>SLF4J Simple binding</description>
<url>http://www.slf4j.org</url>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
@ -38,11 +38,11 @@
</manifestEntries> </manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

2
slf4j-site/pom.xml
View File

@ -14,7 +14,7 @@
<artifactId>slf4j-site</artifactId> <artifactId>slf4j-site</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SLF4J Site</name> <name>SLF4J Site</name>
<description>SLF4J Site</description>
<url>http://www.slf4j.org</url> <url>http://www.slf4j.org</url>
<build> <build>

18
slf4j-site/src/site/pages/legacy.html
View File

@ -210,7 +210,8 @@
javadocs</a> for usage instructions. javadocs</a> for usage instructions.
</p> </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, log4j-over-slf4j, which reimplement JCL and respectively log4j,
the jul-to-slf4j module does not reimplement the java.util.logging the jul-to-slf4j module does not reimplement the java.util.logging
because packages under the java.* namespace cannot be because packages under the java.* namespace cannot be
@ -221,18 +222,17 @@
instance regardless of whether the SLF4J logger is disabled for instance regardless of whether the SLF4J logger is disabled for
the given level or nor. <b>Consequently, j.u.l. to SLF4J the given level or nor. <b>Consequently, j.u.l. to SLF4J
translation can seriously increase the cost of disabled logging translation can seriously increase the cost of disabled logging
statements (60 fold or 6000% increase) and statements (60 fold or 6000%) and measurably impact the
measurably impact the performance of enabled log statements (20% performance of enabled log statements (20% overall increase).</b>
overall increase).</b> Please note that as of logback-version As of logback-version 0.9.25, it is possible to completely
0.9.25, it is possible to completely eliminate the 60 fold eliminate the 60 fold translation overhead for disabled log
translation overhead for disabled log statements with the help of statements with the help of <a
<a
href="http://logback.qos.ch/manual/configuration.html#LevelChangePropagator">LevelChangePropagator</a>. href="http://logback.qos.ch/manual/configuration.html#LevelChangePropagator">LevelChangePropagator</a>.
</p> </p>
<p>If you are concerned about application performance, then use of <p>If you are concerned about application performance, then use of
<code>SLF4JBridgeHandler</code> is appropriate only if one the <code>SLF4JBridgeHandler</code> is appropriate only if any one of
following two conditions is true: the following two conditions is true:
</p> </p>
<ol> <ol>
<li>few j.u.l. logging statements are in play </li> <li>few j.u.l. logging statements are in play </li>