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 918d144c67cc52a998f2a2b7b5efd61b799f9956 (commit) from 0116ae54455c37d47dc44dcbbcfa6d44248b1233 (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=918d144c67cc52a998f2a2b7b5e... http://github.com/ceki/slf4j/commit/918d144c67cc52a998f2a2b7b5efd61b799f9956 commit 918d144c67cc52a998f2a2b7b5efd61b799f9956 Author: Ceki Gulcu <ceki@qos.ch> Date: Sat May 8 12:26:23 2010 +0200 - preparing release 1.6.0 - the plan is for all versions in the 1.6.x series to be mutually compatible diff --git a/integration/build.xml b/integration/build.xml index 3c6e323..5ba578f 100644 --- a/integration/build.xml +++ b/integration/build.xml @@ -88,12 +88,6 @@ <pathelement location="./lib/slf4j-api-1.6.99.jar" /> </path > - <path id="api2099"> - <pathelement location="target/test-classes/" /> - <pathelement location="../slf4j-simple/target/slf4j-simple-${currentVersion}.jar" /> - <pathelement location="./lib/slf4j-api-2.0.99.jar" /> - </path > - <!-- this is really very ugly, but it's the only way to circumvent http://jira.codehaus.org/browse/MANTRUN-95 @@ -184,15 +178,7 @@ name="org.slf4j.CompatibilityAssertionTest" /> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> - <classpath refid="binding2099" /> - <formatter type="plain" /> - <test fork="yes" todir="target/unit-reports" - outfile="TEST-binding2099" - name="org.slf4j.CompatibilityAssertionTest" /> - </junit> - - + <junit printsummary="yes" fork="no" haltonfailure="yes"> <classpath refid="api1699" /> <formatter type="plain" /> @@ -201,12 +187,5 @@ name="org.slf4j.CompatibilityAssertionTest" /> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> - <classpath refid="api2099" /> - <formatter type="plain" /> - <test fork="yes" todir="target/unit-reports" - outfile="TEST-api2099" - name="org.slf4j.CompatibilityAssertionTest" /> - </junit> </target> </project> \ No newline at end of file diff --git a/integration/lib/slf4j-simple-2.0.99.jar b/integration/lib/slf4j-simple-2.0.99.jar deleted file mode 100644 index 996bceb..0000000 Binary files a/integration/lib/slf4j-simple-2.0.99.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 2158dfa..b5857ba 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-alpha2</version> + <version>1.6.0</version> <packaging>pom</packaging> <name>SLF4J</name> diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index e618e8a..c2063f3 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -84,8 +84,7 @@ public final class LoggerFactory { * <p> * It is assumed that all versions in the 1.6 are mutually compatible. * */ - static private final String[] API_COMPATIBILITY_LIST = new String[] { "1.6", - "2.0" }; + static private final String[] API_COMPATIBILITY_LIST = new String[] { "1.6" }; // private constructor prevents instantiation private LoggerFactory() { diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html index dae0a7b..592bb0f 100644 --- a/slf4j-site/src/site/pages/download.html +++ b/slf4j-site/src/site/pages/download.html @@ -46,21 +46,11 @@ <p>Download version ${project.version} including <i>full source code</i>, class files and documentation in ZIP or TAR.GZ format: </p> - <h4>Stable version</h4> - - <ul> - <li><a href="dist/slf4j-1.5.11.tar.gz"><b>slf4j-1.5.11.tar.gz</b></a> </li> - <li><a href="dist/slf4j-1.5.11.zip"><b>slf4j-1.5.11.zip</b></a> </li> - </ul> - - <h4 class="red">Experimental</h4> - <ul> <li><a href="dist/slf4j-${project.version}.tar.gz"><b>slf4j-${project.version}.tar.gz</b></a> </li> <li><a href="dist/slf4j-${project.version}.zip"><b>slf4j-${project.version}.zip</b></a> </li> </ul> - <h3>Previous versions</h3> diff --git a/slf4j-site/src/site/pages/faq.html b/slf4j-site/src/site/pages/faq.html index 8a858f1..2b26572 100644 --- a/slf4j-site/src/site/pages/faq.html +++ b/slf4j-site/src/site/pages/faq.html @@ -638,8 +638,8 @@ org.slf4j.impl.StaticLoggerBinder.SINGLETON from class org.slf4j.LoggerFactory <dt> - <a name="excludingJCL">How do I exclude commons-logging as a - Maven dependency? + <a name="excludingJCL" href="#excludingJCL">How do I exclude + commons-logging as a Maven dependency? </a> </dt> diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 2f71283..e5aaca7 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -29,11 +29,10 @@ <hr noshade="noshade" size="1"/> - <h3>May xth, 2010 - Release of SLF4J 1.6.0-alpha3</h3> + <h3>May 8th, 2010 - Release of SLF4J 1.6.0</h3> - <p>It is expected that <em>all</em> SLF4J releases in the 1.6.x and - 2.0.x series will be mutually compatible. Note that the 2.0.x - series is expected to require JDK 1.5 or later. + <p>It is expected that <em>all</em> SLF4J releases in the 1.6.x + series will be mutually compatible. </p> <p>As of SLF4J version 1.6.0, in the absence of an SLF4J binding, ----------------------------------------------------------------------- Summary of changes: integration/build.xml | 23 +------------------- integration/lib/slf4j-simple-2.0.99.jar | Bin 7603 -> 0 bytes pom.xml | 2 +- .../src/main/java/org/slf4j/LoggerFactory.java | 3 +- slf4j-site/src/site/pages/download.html | 10 -------- slf4j-site/src/site/pages/faq.html | 4 +- slf4j-site/src/site/pages/news.html | 7 ++--- 7 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 integration/lib/slf4j-simple-2.0.99.jar hooks/post-receive -- SLF4J: Simple Logging Facade for Java