Merge branch 'master' of github.com:qos-ch/slf4j
diff --git a/integration/pom.xml b/integration/pom.xml
index 327b398..63e572d 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,34 +1,35 @@
<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/xsd/maven-4.0.0.xsd">
+ 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/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
- </parent>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>integration</artifactId>
- <packaging>jar</packaging>
- <name>SLF4J Integration tests</name>
+ <artifactId>integration</artifactId>
+ <packaging>jar</packaging>
+ <name>SLF4J Integration tests</name>
- <url>http://www.slf4j.org</url>
+ <url>http://www.slf4j.org</url>
<description>SLF4J integration tests</description>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
+ </dependency>
<!-- declaration to circumvent http://jira.codehaus.org/browse/MANTRUN-95 -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
<!-- declaration to circumvent http://jira.codehaus.org/browse/MANTRUN-95 -->
<dependency>
@@ -38,7 +39,7 @@
</dependency>
- <!-- some test run Felix in hosted mode -->
+ <!-- some test run Felix in hosted mode -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
@@ -69,7 +70,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="currentVersion" value="${project.version}" />
+ <property name="currentVersion" value="${project.version}"/>
<property name="compile_classpath" refid="maven.compile.classpath"/>
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<property name="test_classpath" refid="maven.test.classpath"/>
@@ -86,7 +87,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="currentVersion" value="${project.version}" />
+ <property name="currentVersion" value="${project.version}"/>
<property name="test_classpath" refid="maven.test.classpath"/>
<property name="basedir" value="${basedir}"/>
<ant antfile="${basedir}/osgi-build.xml"/>
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
old mode 100644
new mode 100755
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
old mode 100644
new mode 100755
index 1dac382..25317d6
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>jul-to-slf4j</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
old mode 100644
new mode 100755
index 7a2e9de..b13057e
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -2,13 +2,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-over-slf4j</artifactId>
<packaging>jar</packaging>
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
old mode 100644
new mode 100755
index a4b9096..7b813a4
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -1,4 +1,7 @@
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.slf4j</groupId>
@@ -6,9 +9,8 @@
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>osgi-over-slf4j</artifactId>
+
<packaging>bundle</packaging>
<name>OSGi LogService implemented over SLF4J</name>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
old mode 100644
new mode 100755
index 1104801..ea04ded
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -2,15 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-api</artifactId>
+
<packaging>jar</packaging>
<name>SLF4J API Module</name>
<description>The slf4j API</description>
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
old mode 100644
new mode 100755
index 6bb0a5f..dea712b
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -2,15 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-ext</artifactId>
+
<packaging>jar</packaging>
<name>SLF4J Extensions Module</name>
<description>Extensions to the SLF4J API</description>
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
old mode 100644
new mode 100755
index c2c36bc..b7c7f46
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@@ -1,39 +1,39 @@
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
- <version>1.7.8-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>slf4j-jcl</artifactId>
- <packaging>jar</packaging>
- <name>SLF4J JCL Binding</name>
+ <parent>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.7.8-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>slf4j-jcl</artifactId>
+ <packaging>jar</packaging>
+ <name>SLF4J JCL Binding</name>
<description>SLF4J JCL Binding</description>
- <url>http://www.slf4j.org</url>
-
+ <url>http://www.slf4j.org</url>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -44,7 +44,7 @@
</manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
- </configuration>
+ </configuration>
</plugin>
</plugins>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
old mode 100644
new mode 100755
index ad08db3..5a044d4
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-jdk14</artifactId>
<packaging>jar</packaging>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
old mode 100644
new mode 100755
index 88e971f..bc0ffc8
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -3,15 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-log4j12</artifactId>
+
<packaging>jar</packaging>
<name>SLF4J LOG4J-12 Binding</name>
<description>SLF4J LOG4J-12 Binding</description>
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
old mode 100644
new mode 100755
index cf78d0b..7514cce
--- a/slf4j-migrator/pom.xml
+++ b/slf4j-migrator/pom.xml
@@ -3,6 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.slf4j</groupId>
@@ -10,9 +11,8 @@
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-migrator</artifactId>
+
<packaging>jar</packaging>
<name>SLF4J Migrator</name>
<description>SLF4J Migrator</description>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
old mode 100644
new mode 100755
index 774183a..133d0b9
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -3,15 +3,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-nop</artifactId>
+
<packaging>jar</packaging>
<name>SLF4J NOP Binding</name>
<description>SLF4J NOP Binding</description>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
old mode 100644
new mode 100755
index cedebfd..b26ec04
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -1,14 +1,14 @@
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-simple</artifactId>
<packaging>jar</packaging>
<name>SLF4J Simple Binding</name>
diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
old mode 100644
new mode 100755
index 5b7ec0c..03e7c9f
--- a/slf4j-site/pom.xml
+++ b/slf4j-site/pom.xml
@@ -2,15 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.7.8-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>slf4j-site</artifactId>
+
<packaging>jar</packaging>
<name>SLF4J Site</name>
<description>SLF4J Site</description>