Index: /FCKeditor.Java/trunk/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-core/pom.xml	(revision 5430)
+++ /FCKeditor.Java/trunk/java-core/pom.xml	(revision 5431)
@@ -86,9 +86,9 @@
 		<groupId>net.fckeditor</groupId>
 		<artifactId>fckeditor-java</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<build>
-		<finalName>fckeditor-${artifactId}-${version}</finalName>
+		<finalName>fckeditor-${project.artifactId}-${project.version}</finalName>
 		<plugins>
 			<plugin>
@@ -112,11 +112,4 @@
 					</execution>
 				</executions>
-				<!--<dependencies>
-					<dependency>
-					<groupId>ant</groupId>
-					<artifactId>ant-nodeps</artifactId>
-					<version>1.6.5</version>
-					</dependency>
-					</dependencies>-->
 			</plugin>
 			<plugin>
@@ -156,25 +149,37 @@
 				<groupId>net.sourceforge.maven-taglib</groupId>
 				<artifactId>maven-taglib-plugin</artifactId>
+				<version>2.4</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.5</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.3</version>
+				<version>2.4</version>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-					</tags>
+				<version>2.4</version>
+				<configuration>
+					<tagListOptions>
+						<tagClasses>
+							<tagClass>
+								<displayName>Todo Work</displayName>
+								<tags>
+									<tag>
+										<matchString>TODO</matchString>
+										<matchType>exact</matchType>
+									</tag>
+								</tags>
+							</tagClass>
+						</tagClasses>
+					</tagListOptions>
 				</configuration>
 			</plugin>
@@ -183,4 +188,5 @@
 					maven-project-info-reports-plugin
 				</artifactId>
+				<version>2.1.2</version>
 				<reportSets>
 					<reportSet>
@@ -194,4 +200,5 @@
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
 				<configuration>
 					<quiet>true</quiet>
Index: /FCKeditor.Java/trunk/java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-demo/pom.xml	(revision 5430)
+++ /FCKeditor.Java/trunk/java-demo/pom.xml	(revision 5431)
@@ -41,9 +41,9 @@
 		<groupId>net.fckeditor</groupId>
 		<artifactId>fckeditor-java</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>2.7-SNAPSHOT</version>
 	</parent>
 
 	<build>
-		<finalName>fckeditor-${artifactId}-${version}</finalName>
+		<finalName>fckeditor-${project.artifactId}-${project.version}</finalName>
 		<plugins>
 			<plugin>
@@ -85,7 +85,8 @@
 								${project.url}
 							</Implementation-URL>
-							<Built-By>${organization.name}</Built-By>
+							<Built-By>${project.organization.name}</Built-By>
 						</manifestEntries>
 					</archive>
+					<filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
 				</configuration>
 			</plugin>
@@ -118,4 +119,5 @@
 					maven-project-info-reports-plugin
 				</artifactId>
+				<version>2.1.2</version>
 				<reportSets>
 					<reportSet>
@@ -129,5 +131,5 @@
 		</plugins>
 	</reporting>
-	<name>FCKeditor.Java Integration Demo Webapp</name>
+	<name>FCKeditor.Java Integration Demo Web Application</name>
 	<description>
 		This is a drop-in demo of the FCKeditor.Java Integration. It's
Index: /FCKeditor.Java/trunk/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/pom.xml	(revision 5430)
+++ /FCKeditor.Java/trunk/pom.xml	(revision 5431)
@@ -25,5 +25,5 @@
 	<groupId>net.fckeditor</groupId>
 	<artifactId>fckeditor-java</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>2.7-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
@@ -42,5 +42,5 @@
 		<currentVersion>${project.version}</currentVersion>
 		<FCKeditorVersion>2.6.6</FCKeditorVersion>
-		<ticketUrl>${issueManagement.url}ticket</ticketUrl>
+		<ticketUrl>${project.issueManagement.url}ticket</ticketUrl>
 		<mavenVersion>2.0.10</mavenVersion>
 	</properties>
@@ -57,5 +57,5 @@
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.6.1</version>
+					<version>2.7</version>
 					<configuration>
 					<detectOfflineLinks>false</detectOfflineLinks>
@@ -70,5 +70,5 @@
 								${project.url}
 							</Implementation-URL>
-							<Built-By>${organization.name}</Built-By>
+							<Built-By>${project.organization.name}</Built-By>
 						</manifestEntries>
 					</archive>
@@ -92,5 +92,5 @@
 								${project.url}
 							</Implementation-URL>
-							<Built-By>${organization.name}</Built-By>
+							<Built-By>${project.organization.name}</Built-By>
 						</manifestEntries>
 					</archive>
@@ -107,5 +107,5 @@
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.0-beta-9</version>
+					<version>2.0</version>
 				</plugin>
 				<plugin>
@@ -127,5 +127,5 @@
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.2-beta-4</version>
+					<version>2.2-beta-5</version>
 				</plugin>
 				<plugin>
@@ -142,35 +142,49 @@
 									${project.url}
 								</Implementation-URL>
-								<Built-By>${organization.name}</Built-By>
+								<Built-By>${project.organization.name}</Built-By>
 							</manifestEntries>
 						</archive>
 					</configuration>
 				</plugin>
+				<plugin>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.3</version>
+					<dependencies>
+					<dependency>
+						<groupId>ant</groupId>
+						<artifactId>ant-nodeps</artifactId>
+						<version>1.6.5</version>
+					</dependency>
+				</dependencies>
+				</plugin>
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3</version>
+					<configuration>
+						<target>jsr14</target>
+						<excludes>
+							<exclude>**/package-info.java</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<id>test-compiler</id>
+							<phase>process-test-sources</phase>
+							<goals>
+								<goal>testCompile</goal>
+							</goals>
+							<configuration>
+								<target>1.5</target>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>jsr14</target>
-					<excludes>
-						<exclude>**/package-info.java</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>test-compiler</id>
-						<phase>process-test-sources</phase>
-						<goals>
-							<goal>testCompile</goal>
-						</goals>
-						<configuration>
-							<source>1.5</source>
-							<target>1.5</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -203,17 +217,17 @@
 								</copy>
 								<replace value="&lt;src&gt;../" token="&lt;src&gt;/" dir="..">
-									<include name="${pom.artifactId}/src/site/site.xml" />
+									<include name="${project.artifactId}/src/site/site.xml" />
 									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
 								<replace value="href=&quot;../" token="href=&quot;/" dir="..">
-									<include name="${pom.artifactId}/src/site/site.xml" />
+									<include name="${project.artifactId}/src/site/site.xml" />
 									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
-								<replace value="href=&quot;" token="href=&quot;../${pom.artifactId}/" dir="..">
-									<include name="${pom.artifactId}/src/site/site.xml" />
+								<replace value="href=&quot;" token="href=&quot;../${project.artifactId}/" dir="..">
+									<include name="${project.artifactId}/src/site/site.xml" />
 									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
 								<replace value="href=&quot;../images" token="href=&quot;images" dir="..">
-									<include name="${pom.artifactId}/src/site/site.xml" />
+									<include name="${project.artifactId}/src/site/site.xml" />
 									<exclude name="fckeditor-java/src/site/site.xml" />
 								</replace>
@@ -222,11 +236,4 @@
 					</execution>
 				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-				</dependencies>
 			</plugin>
 		</plugins>
@@ -393,13 +400,13 @@
 	<distributionManagement>
 		<repository>
-			<id>local</id>
+			<id>local-java.fckeditor.net</id>
 			<url>file:///home/mosipov/public_html/m2repo</url>
 		</repository>
 		<snapshotRepository>
-			<id>local</id>
+			<id>local-java.fckeditor.net</id>
 			<url>file:///home/mosipov/public_html/m2repo-snapshots</url>
 		</snapshotRepository>
 		<site>
-			<id>local</id>
+			<id>local-java.fckeditor.net</id>
 			<url>file:///home/mosipov/public_html/docs</url>
 		</site>