preparing release 1.1.0-beta0
diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml
index 3ae5597..be36c7c 100644
--- a/jcl104-over-slf4j/pom.xml
+++ b/jcl104-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>$parent-version</version>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index 66f5557..9aa9869 100644
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -2,8 +2,8 @@
<parent>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j</artifactId>
- <version>1.1.0</version>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
index f65ca6a..7192274 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
@@ -1,12 +1,18 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
*
- * Copyright (C) 1999-2006, QOS.ch
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This library is free software, you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation.
- */
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j;
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
index 886191d..a42b1c2 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
@@ -1,12 +1,18 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
*
- * Copyright (C) 1999-2006, QOS.ch
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This library is free software, you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation.
- */
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j;
@@ -171,4 +177,4 @@
// return false;
// }
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 54a44e8..5d346c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j</artifactId>
- <version>1.1.0</version>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.1.0-beta0</version>
+
<packaging>pom</packaging>
<name>SLF4J</name>
@@ -26,9 +27,10 @@
<module>slf4j-log4j12</module>
<module>slf4j-jcl</module>
<module>jcl104-over-slf4j</module>
+ <module>log4j-over-slf4j</module>
<module>slf4j-site</module>
-
<module>slf4j-archetype</module>
+
</modules>
<dependencies>
@@ -96,12 +98,18 @@
<groups>
<group>
<title>SLF4J packages</title>
- <packages>org.slf4j.*</packages>
+ <packages>org.slf4j:org.slf4j.*</packages>
</group>
<group>
<title>Jakarta Commons Logging packages</title>
<packages>org.apache.commons.*</packages>
</group>
+
+ <group>
+ <title>Apache log4j</title>
+ <packages>org.apache.log4j</packages>
+ </group>
+
</groups>
</configuration>
</plugin>
@@ -145,5 +153,11 @@
</reporting>
+ <distributionManagement>
+ <site>
+ <id>pixie</id>
+ <url>scp://pixie/var/www/www.slf4j.org/htdocs/</url>
+ </site>
+ </distributionManagement>
</project>
\ No newline at end of file
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 5959bb9..e82a75f 100644
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -1,10 +1,12 @@
-<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>$parent-version</version>
-
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-archetype/pom.xml b/slf4j-archetype/pom.xml
index 79d80e4..3614797 100644
--- a/slf4j-archetype/pom.xml
+++ b/slf4j-archetype/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?><project>
<parent>
- <artifactId>slf4j</artifactId>
+ <artifactId>slf4j-parent</artifactId>
<groupId>org.slf4j</groupId>
- <version>1.1.0</version>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
index 702cb9b..450d488 100644
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>$parent-version</version>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index 81e63af..670ee1b 100644
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -1,9 +1,12 @@
-<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</artifactId>
- <version>1.1.0</version>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index 633448e..79bc1b2 100644
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>$parent-version</version>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index c7e6895..c93f2f6 100644
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>$parent-version</version>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index b3c076c..d2239b3 100644
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>$parent-version</version>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/src/site/site.xml b/slf4j-site/src/site/site.xml
index c3cf160..421f50f 100644
--- a/slf4j-site/src/site/site.xml
+++ b/slf4j-site/src/site/site.xml
@@ -31,9 +31,9 @@
<item name="x4juli" href="http://www.x4juli.org/"/>
</menu>
<menu name="Wrapped implementations">
- <item name="JDK14" href="apidocs/org/slf4j/impl/JDK14LoggerAdapter.html"/>
- <item name="Log4j" href="apidocs/org/slf4j/impl/Log4jLoggerAdapter.html"/>
- <item name="Simple" href="apidocs/org/slf4j/impl/SimpleLogger.html"/>
+ <item name="JDK14" href="api/org/slf4j/impl/JDK14LoggerAdapter.html"/>
+ <item name="Log4j" href="api/org/slf4j/impl/Log4jLoggerAdapter.html"/>
+ <item name="Simple" href="api/org/slf4j/impl/SimpleLogger.html"/>
<item name="Simple-Log" href="http://simple-log.dev.java.net/"/>
</menu>
</body>
diff --git a/slf4j-site/src/site/xdocs/download.xml b/slf4j-site/src/site/xdocs/download.xml
index 2078c26..bf3af8e 100644
--- a/slf4j-site/src/site/xdocs/download.xml
+++ b/slf4j-site/src/site/xdocs/download.xml
@@ -9,15 +9,28 @@
<body>
- <h2>SLF4J version 1.1.0</h2>
+ <h2>Latest official SLF4J version</h2>
- <p>Download version 1.1.0 including <i>full source code</i>,
+ <p>Download version 1.0.2 including <i>full source code</i>,
class files and documentation as
</p>
<ul>
- <li><a href="dist/slf4j-1.1.0.tar.gz"><b>slf4j-1.1.0.tar.gz</b></a> </li>
- <li><a href="dist/slf4j-1.1.0.zip"><b>slf4j-1.1.0.zip</b></a> </li>
+ <li><a href="dist/slf4j-1.0.2.tar.gz"><b>slf4j-1.0.2.tar.gz</b></a> </li>
+ <li><a href="dist/slf4j-1.0.2.zip"><b>slf4j-1.0.2.zip</b></a> </li>
+
+ </ul>
+
+
+ <h2>Current development version</h2>
+
+ <p>Download version 1.1.0-beta0 including <i>full source code</i>,
+ class files and documentation as
+ </p>
+
+ <ul>
+ <li><a href="dist/slf4j-1.1.0-beta0.tar.gz"><b>slf4j-1.1.0-beta0.tar.gz</b></a> </li>
+ <li><a href="dist/slf4j-1.1.0-beta0.zip"><b>slf4j-1.1.0-beta0.zip</b></a> </li>
</ul>
diff --git a/slf4j-skin/pom.xml b/slf4j-skin/pom.xml
index f473a0c..f3a6874 100644
--- a/slf4j-skin/pom.xml
+++ b/slf4j-skin/pom.xml
@@ -4,8 +4,8 @@
<parent>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j</artifactId>
- <version>1.1.0</version>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.1.0-beta0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml
index 6cc9279..2e90528 100644
--- a/src/main/assembly/source.xml
+++ b/src/main/assembly/source.xml
@@ -62,6 +62,14 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>log4j-over-slf4j/</directory>
+ <outputDirectory>log4j-over-slf4j/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
<!-- Module Source directories (includes tests) -->
<fileSet>
<directory>slf4j-api/src/</directory>
@@ -99,6 +107,10 @@
<directory>jcl104-over-slf4j/src/</directory>
<outputDirectory>jcl104-over-slf4j/src/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>log4j-over-slf4j/src/</directory>
+ <outputDirectory>log4j-over-slf4j/src/</outputDirectory>
+ </fileSet>
<!-- Module JARs -->
<fileSet>
@@ -156,6 +168,13 @@
<include>jcl104-over-slf4j-${project.version}*.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>log4j-over-slf4j/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>log4j-over-slf4j-${project.version}*.jar</include>
+ </includes>
+ </fileSet>
<!-- Website -->
<fileSet>