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 71fc429d10ce1fb0b9e0344cbbc3746b2ac1cd54 (commit) from b1d03d5ce82626fbc2e4b5ad13f8e92128b18038 (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=71fc429d10ce1fb0b9e0344cbbc... http://github.com/ceki/slf4j/commit/71fc429d10ce1fb0b9e0344cbbc3746b2ac1cd54 commit 71fc429d10ce1fb0b9e0344cbbc3746b2ac1cd54 Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Jun 30 15:52:25 2010 +0200 - starting work on 1.6.1 - Fixed OSGi metatdata in log4j-over-slf4j. See http://bugzilla.slf4j.org/show_bug.cgi?id=187 diff --git a/integration/pom.xml b/integration/pom.xml index e9a2d26..fa87087 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index a69d17d..e612e29 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 8a6f640..0a8c715 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index e5a2e62..68027d0 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index b9d2bbe..d71660b 100644 --- a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Implementation-Title: log4j-over-slf4j Bundle-SymbolicName: log4j.over.slf4j Bundle-Name: log4j-over-slf4j Bundle-Vendor: SLF4J.ORG -Export-Package: org.apache.log4j -Import-Package: org.slf4j, org.slf4j.helpers, org.slf4j.spi +Export-Package: org.apache.log4j;version=${parsedVersion.osgiVersion} +Import-Package: org.slf4j;version=${slf4j.api.minimum.compatible.version}, org.slf4j.helpers;version=${slf4j.api.minimum.compatible.version}, org.slf4j.spi;version=${slf4j.api.minimum.compatible.version} diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 1d1a8f6..f4054ff 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index b01b907..98cdf1d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>SLF4J</name> @@ -27,7 +27,7 @@ </licenses> <properties> - <slf4j.api.minimum.compatible.version>1.5.5</slf4j.api.minimum.compatible.version> + <slf4j.api.minimum.compatible.version>1.6.0</slf4j.api.minimum.compatible.version> <cal10n.version>0.7.2</cal10n.version> </properties> diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index b952f97..6d65557 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 3407f00..a366dab 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index 8d26730..1fac3e3 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>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 4377728..0214e5d 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 42300df..972793b 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>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index ac90f19..73c2585 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 6d0a265..5c02fd4 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>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index b1e92b2..7826e90 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 4c613c5..75d5fac 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index ef6ca97..fa6ae43 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>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index adf1ec1..dd91df9 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0</version> + <version>1.6.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-site/src/site/pages/css/popup.css b/slf4j-site/src/site/pages/css/popup.css new file mode 100644 index 0000000..2b20468 --- /dev/null +++ b/slf4j-site/src/site/pages/css/popup.css @@ -0,0 +1,67 @@ + +/* =========== popup ================== */ +#backgroundPopup { + display:none; + position:fixed; + _position:absolute; /* hack for internet explorer 6*/ + height:100%; + width:100%; + top:0; + left:0; + background:#000000; + border:1px solid #cecece; + z-index:1; +} + +#popupContents { + display:none; + position:fixed; + _position:absolute; /* hack for internet explorer 6*/ + height: 150px; + width: 408px; + background:#FFFFFF; + border: 2px solid #cecece; + z-index:2; + padding-left: 1ex; + font-size:13px; +} + +#popupContents p { + margin: 0px; +} +#popupContents h3 { + margin: 0px; +} + +#popupContactClose { + font-size:14px; + line-height:14px; + right:6px; + top:4px; + position:absolute; + color:#6fa5fd; + font-weight:700; + display:block; +} + +a.popupLink { + background: #FFF; + color: #0079C5; + font-family: "Comic Sans MS", sans-serif; + white-space: nowrap; + font-size: 14px; + font-weight: bold; + + border-top: 2px solid #DDD; + border-left: 2px solid #DDD; + border-right: 2px solid #888; + border-bottom: 2px solid #888; + padding: 0px 1em 0px 1em; + margin: 0px 0px 3px 0px; +} + +a.popupLink:hover { + background: #E0E0EF; + cursor: pointer; +} + diff --git a/slf4j-site/src/site/pages/css/site.css b/slf4j-site/src/site/pages/css/site.css index e0fcc88..ead42ab 100644 --- a/slf4j-site/src/site/pages/css/site.css +++ b/slf4j-site/src/site/pages/css/site.css @@ -304,70 +304,3 @@ table.bodyTable tr.alt { /* EOF =============== bodyTable =============== */ - -/* =========== popup ================== */ -#backgroundPopup { - display:none; - position:fixed; - _position:absolute; /* hack for internet explorer 6*/ - height:100%; - width:100%; - top:0; - left:0; - background:#000000; - border:1px solid #cecece; - z-index:1; -} - -#popupContents { - display:none; - position:fixed; - _position:absolute; /* hack for internet explorer 6*/ - height: 150px; - width: 408px; - background:#FFFFFF; - border: 2px solid #cecece; - z-index:2; - padding-left: 1ex; - font-size:13px; -} - -#popupContents p { - margin: 0px; -} -#popupContents h3 { - margin: 0px; -} - -#popupContactClose { - font-size:14px; - line-height:14px; - right:6px; - top:4px; - position:absolute; - color:#6fa5fd; - font-weight:700; - display:block; -} - -a.popupLink { - background: #FFF; - color: #0079C5; - font-family: "Comic Sans MS", sans-serif; - white-space: nowrap; - font-size: 14px; - font-weight: bold; - - border-top: 2px solid #DDD; - border-left: 2px solid #DDD; - border-right: 2px solid #888; - border-bottom: 2px solid #888; - padding: 0px 1em 0px 1em; - margin: 0px 0px 3px 0px; -} - -a.popupLink:hover { - background: #E0E0EF; - cursor: pointer; -} - diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html index 592bb0f..b3c8eae 100644 --- a/slf4j-site/src/site/pages/download.html +++ b/slf4j-site/src/site/pages/download.html @@ -6,6 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> <title>SLF4J Binary files</title> <link rel="stylesheet" type="text/css" media="screen" href="css/site.css" /> + <link rel="stylesheet" type="text/css" href="css/popup.css" media="screen" /> </head> <body onload="centerPopup(); loadPopup();"> <script type="text/javascript">prefix='';</script> diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 6fe9e67..323ae67 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -19,13 +19,23 @@ <div id="content"> - <h1>SLF4J News</h1> + <h1>SLF4J News</h1> - <p>Please note that you can receive SLF4J related announcements by - subscribing to the <a - href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch - announce</a> mailing list. - </p> + <p>Please note that you can receive SLF4J related announcements by + subscribing to the <a + href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch + announce</a> mailing list. + </p> + + <hr noshade="noshade" size="1"/> + + <h3>, 2010 - Release of SLF4J 1.6.1</h3> + + <p>Fixed missing versioning OSGi metadata in the log4j-over-slf4j + module. This problem was reported in <a + href="http://bugzilla.slf4j.org/show_bug.cgi?id=187">bug 187</a> by + David Savage. + </p> <hr noshade="noshade" size="1"/> ----------------------------------------------------------------------- Summary of changes: integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jul-to-slf4j/pom.xml | 2 +- log4j-over-slf4j/pom.xml | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 4 +- osgi-over-slf4j/pom.xml | 2 +- pom.xml | 4 +- slf4j-api/pom.xml | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- slf4j-jdk14/pom.xml | 2 +- slf4j-log4j12/pom.xml | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- slf4j-osgi-integration-test/pom.xml | 2 +- slf4j-osgi-test-bundle/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/css/popup.css | 67 ++++++++++++++++++++ slf4j-site/src/site/pages/css/site.css | 67 -------------------- slf4j-site/src/site/pages/download.html | 1 + slf4j-site/src/site/pages/news.html | 22 +++++-- 22 files changed, 104 insertions(+), 93 deletions(-) create mode 100644 slf4j-site/src/site/pages/css/popup.css hooks/post-receive -- SLF4J: Simple Logging Facade for Java