Index: /FCKeditor.Java/trunk/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-core/pom.xml	(revision 5441)
+++ /FCKeditor.Java/trunk/java-core/pom.xml	(revision 5442)
@@ -21,5 +21,6 @@
  * @version: $Id$
 -->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>java-core</artifactId>
@@ -97,5 +98,5 @@
 					<execution>
 						<id>rewrite-tagreference-links</id>
-						<phase>site</phase>
+						<phase>post-site</phase>
 						<goals>
 							<goal>run</goal>
@@ -113,32 +114,4 @@
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				 <configuration>
-					<links>
-						<link>http://tomcat.apache.org/tomcat-5.5-doc/servletapi/</link>
-						<link>http://tomcat.apache.org/tomcat-5.5-doc/jspapi/</link>
-					</links>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
@@ -185,7 +158,5 @@
 			</plugin>-->
 			<plugin>
-				<artifactId>
-					maven-project-info-reports-plugin
-				</artifactId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>2.1.2</version>
 				<reportSets>
@@ -203,11 +174,12 @@
 				<configuration>
 					<quiet>true</quiet>
-		 			<links>
+					<show>package</show>
+					<docfilessubdirs>true</docfilessubdirs>
+					<keywords>true</keywords>
+					<detectOfflineLinks>false</detectOfflineLinks>
+		  			<links>
 						<link>http://tomcat.apache.org/tomcat-5.5-doc/servletapi/</link>
 						<link>http://tomcat.apache.org/tomcat-5.5-doc/jspapi/</link>
 					</links>
-					<show>package</show>
-					<docfilessubdirs>true</docfilessubdirs>
-					<keywords>true</keywords>
 				</configuration>
 				<reportSets>
@@ -224,5 +196,5 @@
 				<version>2.2.2</version>
 				<configuration>
-					<comparisonVersion>2.5</comparisonVersion>
+					<comparisonVersion>2.6</comparisonVersion>
 					<minSeverity>info</minSeverity>
 				</configuration>
Index: /FCKeditor.Java/trunk/java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-demo/pom.xml	(revision 5441)
+++ /FCKeditor.Java/trunk/java-demo/pom.xml	(revision 5442)
@@ -21,5 +21,6 @@
  * @version: $Id$
 -->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>java-demo</artifactId>
@@ -77,12 +78,8 @@
 						<addMavenDescriptor>false</addMavenDescriptor>
 						<manifest>
-							<addDefaultImplementationEntries>
-								true
-							</addDefaultImplementationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
 						<manifestEntries>
-							<Implementation-URL>
-								${project.url}
-							</Implementation-URL>
+							<Implementation-URL>${project.url}</Implementation-URL>
 							<Built-By>${project.organization.name}</Built-By>
 						</manifestEntries>
@@ -116,7 +113,5 @@
 		<plugins>
 			<plugin>
-				<artifactId>
-					maven-project-info-reports-plugin
-				</artifactId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>2.1.2</version>
 				<reportSets>
Index: /FCKeditor.Java/trunk/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/pom.xml	(revision 5441)
+++ /FCKeditor.Java/trunk/pom.xml	(revision 5442)
@@ -21,5 +21,6 @@
  * @version: $Id$
 -->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.fckeditor</groupId>
@@ -32,10 +33,6 @@
 	</modules>
 	<properties>
-		<project.build.sourceEncoding>
-			UTF-8
-		</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>
-			UTF-8
-		</project.reporting.outputEncoding>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<!-- SLF4J version range [1.5.5,1.6) won't work due to http://jira.codehaus.org/browse/MNG-3806 -->
 		<slf4jVersion>1.5.8</slf4jVersion>
@@ -55,26 +52,27 @@
 					<version>2.0.1</version>
 				</plugin>
-				<plugin>
+	 			<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
 					<version>2.7</version>
 					<configuration>
-					<detectOfflineLinks>false</detectOfflineLinks>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>
-								true
-							</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-URL>
-								${project.url}
-							</Implementation-URL>
-							<Built-By>${project.organization.name}</Built-By>
-						</manifestEntries>
-					</archive>
-					<show>package</show>
-					<docfilessubdirs>true</docfilessubdirs>
-					<keywords>true</keywords>
-				</configuration>
+						<archive>
+							<manifest>
+								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							</manifest>
+							<manifestEntries>
+								<Implementation-URL>${project.url}</Implementation-URL>
+								<Built-By>${project.organization.name}</Built-By>
+							</manifestEntries>
+						</archive>
+						<!-- This can be disabled right now because javadoc plugin inherits
+							from reports an we have only one module with javadoc. -->
+						<!-- 
+						<quiet>true</quiet>
+						<show>package</show>
+						<docfilessubdirs>true</docfilessubdirs>
+						<keywords>true</keywords>
+						<detectOfflineLinks>false</detectOfflineLinks>
+						 -->
+					</configuration>
 				</plugin>
 				<plugin>
@@ -82,22 +80,18 @@
 					<version>2.1.1</version>
 					<configuration>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>
-								true
-							</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-URL>
-								${project.url}
-							</Implementation-URL>
-							<Built-By>${project.organization.name}</Built-By>
-						</manifestEntries>
-					</archive>
-					<excludes>
-						<exclude>**/package-info.java</exclude>
-					</excludes>
-					<excludeResources>true</excludeResources>
-				</configuration>
+						<archive>
+							<manifest>
+								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							</manifest>
+							<manifestEntries>
+								<Implementation-URL>${project.url}</Implementation-URL>
+								<Built-By>${project.organization.name}</Built-By>
+							</manifestEntries>
+						</archive>
+						<excludes>
+							<exclude>**/package-info.java</exclude>
+						</excludes>
+						<excludeResources>true</excludeResources>
+					</configuration>
 				</plugin>
 				<plugin>
@@ -134,12 +128,8 @@
 						<archive>
 							<manifest>
-								<addDefaultImplementationEntries>
-									true
-								</addDefaultImplementationEntries>
+								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 							</manifest>
 							<manifestEntries>
-								<Implementation-URL>
-									${project.url}
-								</Implementation-URL>
+								<Implementation-URL>${project.url}</Implementation-URL>
 								<Built-By>${project.organization.name}</Built-By>
 							</manifestEntries>
@@ -151,10 +141,10 @@
 					<version>1.3</version>
 					<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-				</dependencies>
+						<dependency>
+							<groupId>ant</groupId>
+							<artifactId>ant-nodeps</artifactId>
+							<version>1.6.5</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
@@ -245,7 +235,5 @@
 		<plugins>
 			<plugin>
-				<artifactId>
-					maven-project-info-reports-plugin
-				</artifactId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>2.1.2</version>
 				<inherited>false</inherited>