release 1.6.4, fix issues with site plugin
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