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 38915dafe04496b42ec65732c9376aa26b3c81e9 (commit) from f5865d3241e71a58d49a72992a63ad1f7f282b50 (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=38915dafe04496b42ec65732c93... http://github.com/ceki/slf4j/commit/38915dafe04496b42ec65732c9376aa26b3c81e9 commit 38915dafe04496b42ec65732c9376aa26b3c81e9 Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Oct 31 23:51:10 2011 +0100 release 1.6.4, fix issues with site plugin diff --git a/integration/pom.xml b/integration/pom.xml index 240a8ca..288c9bf 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index e4b384c..9c3cd76 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 8d0e609..abd063b 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index eca58de..94c62ad 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index aaf0953..fed86fa 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 326fa16..1ab95e7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.4-SNAPSHOT</version> + <version>1.6.4</version> <packaging>pom</packaging> <name>SLF4J</name> @@ -95,6 +95,14 @@ <build> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + <version>2.0</version> + </extension> + </extensions> + <resources> <resource> <directory>src/main/resources</directory> @@ -151,51 +159,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - <configuration> - <aggregate>true</aggregate> - <excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.* - </excludePackageNames> - <links> - <link> - http://java.sun.com/j2se/1.5.0/docs/api - </link> - </links> - <groups> - <group> - <title>SLF4J packages</title> - <packages>org.slf4j:org.slf4j.*</packages> - </group> - - <group> - <title>SLF4J extensions</title> - <packages> - org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent - </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> - - <group> - <title>java.util.logging (JUL) to SLF4J bridge</title> - <packages>org.slf4j.bridge</packages> - </group> - - </groups> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2</version> <configuration> @@ -216,12 +179,78 @@ <executions> <execution> <id>parse-version</id> - <goals> <goal>parse-version</goal> + <goals> + <goal>parse-version</goal> </goals> </execution> </executions> </plugin> + <!-- ====== site plugin ===== --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.0</version> + <configuration> + <reportPlugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + <configuration> + <aggregate>true</aggregate> + <javadocDir>target/site/apidocs/</javadocDir> + <linkJavadoc>true</linkJavadoc> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8</version> + <configuration> + <aggregate>true</aggregate> + <excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.* + </excludePackageNames> + <links> + <link> + http://java.sun.com/j2se/1.5.0/docs/api + </link> + </links> + <groups> + <group> + <title>SLF4J packages</title> + <packages>org.slf4j:org.slf4j.*</packages> + </group> + + <group> + <title>SLF4J extensions</title> + <packages> + org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent + </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> + + <group> + <title>java.util.logging (JUL) to SLF4J bridge</title> + <packages>org.slf4j.bridge</packages> + </group> + + </groups> + </configuration> + </plugin> + + </reportPlugins> + </configuration> + </plugin> </plugins> </build> @@ -360,43 +389,6 @@ </pluginRepository> </pluginRepositories> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> - - <reportSets> - <reportSet> - <reports/> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - <configuration> - <aggregate>true</aggregate> - <javadocDir>target/site/apidocs/</javadocDir> - <linkJavadoc>true</linkJavadoc> - </configuration> - </plugin> - - - </plugins> - - </reporting> - - <scm> <connection>scm:svn:http://svn.slf4j.org/repos/slf4j/trunk</connection> <developerConnection>scm:svn:https://svn.slf4j.org/repos/slf4j/trunk diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 8aa54d7..83b4c7f 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index b4c31c9..cd7bec2 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html b/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html index ddd4f3a..4ed5eaa 100644 --- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html +++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html @@ -1,4 +1,8 @@ +<html> +<body> Tests related to the org.slfj.ext package. However, location information code required the caller class (XLogger) to have a different prefix than the test class XLoggerTest. This is ensured by having the test class -placed in a different package. \ No newline at end of file +placed in a different package. +</body> +</html> \ No newline at end of file diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index c007f49..0bceb52 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 8d8c4c9..438a20f 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 8a979d6..ef3218c 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index f0be206..1804286 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 4403bd2..30e6fdd 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index e311f4c..9d42737 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index edaeae7..ecf9650 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 7d73577..05ee7bd 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.4-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index 1e8925f..b55b444 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -1,43 +1,42 @@ <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"> + 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>1.6.4-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.4</version> + </parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-site</artifactId> - <packaging>jar</packaging> - <name>SLF4J Site</name> + <modelVersion>4.0.0</modelVersion> - <url>http://www.slf4j.org</url> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-site</artifactId> + <packaging>jar</packaging> + <name>SLF4J Site</name> - <build> - <resources> - <resource> - <directory>src/site/pages</directory> - <!-- - We're saving filtered html docs in a temporary folder - and telling the site plug in to get the docs there. - --> + <url>http://www.slf4j.org</url> + + <build> + <resources> + <resource> + <directory>src/site/pages</directory> + <!--We're saving filtered html docs in a temporary folder--> + <!--and telling the site plug in to get the docs there.--> <targetPath>../../../target/site</targetPath> - <filtering>true</filtering> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <outputDirectory>${project.parent.basedir}/target/site</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <outputDirectory>${project.parent.basedir}/target/site + </outputDirectory> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file ----------------------------------------------------------------------- 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 +- osgi-over-slf4j/pom.xml | 2 +- pom.xml | 160 +++++++++---------- slf4j-api/pom.xml | 2 +- slf4j-ext/pom.xml | 2 +- .../src/test/java/org/slf4j/dummyExt/package.html | 6 +- 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 | 69 ++++----- 18 files changed, 130 insertions(+), 135 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java