diff --git a/api/pom.xml b/api/pom.xml
index f34ef9b72..2d86fbac7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-api</artifactId>
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 5ff22d744..f78f4743e 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 66522645e..a4852dfc3 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -27,7 +27,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.1.0-SNAPSHOT</version>
+      <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
diff --git a/apps/pom.xml b/apps/pom.xml
index 4453fc1ab..7b99fffdf 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 40ab40519..86be10038 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -27,7 +27,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.1.0-SNAPSHOT</version>
+      <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -39,38 +39,38 @@
        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</developerConnection>
        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/</url>
     </scm>
-	
-	<profiles>
-		<profile>
-			<id>pluto</id>
-			<build>
-				<plugins>
-				  <!-- configure maven-war-plugin to use updated web.xml -->
-			      <plugin>
-			        <artifactId>maven-war-plugin</artifactId>
-			        <configuration>
-			          <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-			        </configuration>
-			      </plugin>
-			      <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
-			      <plugin>
-			        <groupId>org.apache.pluto</groupId>
-			        <artifactId>maven-pluto-plugin</artifactId>
-			        <version>1.1.3</version>
-			        <executions>
-			          <execution>
-			            <phase>generate-resources</phase>
-			            <goals>
-			              <goal>assemble</goal>
-			            </goals>
-			          </execution>
-			        </executions>
-			      </plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	
+
+  <profiles>
+    <profile>
+      <id>pluto</id>
+      <build>
+        <plugins>
+          <!-- configure maven-war-plugin to use updated web.xml -->
+            <plugin>
+              <artifactId>maven-war-plugin</artifactId>
+              <configuration>
+                <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+              </configuration>
+            </plugin>
+            <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
+            <plugin>
+              <groupId>org.apache.pluto</groupId>
+              <artifactId>maven-pluto-plugin</artifactId>
+              <version>1.1.3</version>
+              <executions>
+                <execution>
+                  <phase>generate-resources</phase>
+                  <goals>
+                    <goal>assemble</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
     <dependencies>
         <dependency>
             <groupId>portlet-api</groupId>
@@ -109,21 +109,21 @@
             <artifactId>commons-digester</artifactId>
             <version>1.8</version>
         </dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.9</version>
-		</dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.9</version>
+    </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 15404a28b..ba1f97ae1 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0a9b86ac3..fbeff0330 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <scm>
diff --git a/backport/retrotranslator-runtime-1.2.0.jar b/backport/retrotranslator-runtime-1.2.0.jar
deleted file mode 100644
index 9ed5d0788..000000000
Binary files a/backport/retrotranslator-runtime-1.2.0.jar and /dev/null differ
diff --git a/backport/retrotranslator-runtime-1.2.3.jar b/backport/retrotranslator-runtime-1.2.3.jar
new file mode 100644
index 000000000..48a277859
Binary files /dev/null and b/backport/retrotranslator-runtime-1.2.3.jar differ
diff --git a/backport/retrotranslator-transformer-1.2.0.jar b/backport/retrotranslator-transformer-1.2.0.jar
deleted file mode 100644
index 726c9ca7d..000000000
Binary files a/backport/retrotranslator-transformer-1.2.0.jar and /dev/null differ
diff --git a/backport/retrotranslator-transformer-1.2.3.jar b/backport/retrotranslator-transformer-1.2.3.jar
new file mode 100644
index 000000000..cd291f581
Binary files /dev/null and b/backport/retrotranslator-transformer-1.2.3.jar differ
diff --git a/core/pom.xml b/core/pom.xml
index 091a7ca94..4a51d2793 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -459,7 +459,7 @@
             <scope>test</scope>
         </dependency>
 
-		<dependency>
+    <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock</artifactId>
             <version>1.0.1</version>
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 1f3f88961..9b4046dda 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-codebehind-plugin</artifactId>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 525981846..d3047d478 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-config-browser-plugin</artifactId>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index ae1dbc262..b60faaac3 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts</groupId>
@@ -206,7 +206,7 @@
             <version>1.2.8</version>
             <scope>test</scope>
         </dependency>
-        
+
          <!-- struts-annotations must be in compile scope for maven-apt-plugin to
         function correctly. Marking it optional to exclude it from transitive
         dependency resolution -->
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 7d1f8f5b5..5b7eb702d 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jasperreports-plugin</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 57dfadf0f..5470c8070 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
    </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jfreechart-plugin</artifactId>
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 79e517db7..f805ece71 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jsf-plugin</artifactId>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 29ce5b4c3..82fea6bbf 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-pell-multipart-plugin</artifactId>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index b3fb3a13c..c28969b5b 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-plexus-plugin</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b5220660e..7be6cc5cf 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-plugins</artifactId>
@@ -54,7 +54,7 @@
         <module>struts1</module>
         <module>tiles</module>
         <module>dojo</module>
-	  <module>portlet</module>
+    <module>portlet</module>
     </modules>
 
     <dependencies>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index dfbbdf20a..d19e52a95 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet-plugin</artifactId>
@@ -47,15 +47,15 @@
             <scope>test</scope>
             <version>3.8.1</version>
         </dependency>
-		
-	    <dependency>
+
+      <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
             <version>2.0</version>
             <scope>provided</scope>
         </dependency>
-		
-		<!-- Velocity -->
+
+    <!-- Velocity -->
         <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
@@ -69,7 +69,7 @@
             <version>1.1</version>
             <optional>true</optional>
         </dependency>
-		
+
         <!-- Portlet -->
         <dependency>
             <groupId>portlet-api</groupId>
@@ -77,60 +77,60 @@
             <version>1.0</version>
             <optional>true</optional>
         </dependency>
-		
+
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
             <version>0.09</version>
             <scope>test</scope>
-        </dependency>		
-		
+        </dependency>
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
             <version>2.0</version>
             <scope>test</scope>
         </dependency>
-		<dependency>
+    <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock</artifactId>
             <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
-		
+
         <dependency>
             <groupId>jmock</groupId>
             <artifactId>jmock-cglib</artifactId>
             <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
-		
+
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
             <version>0.09</version>
             <scope>test</scope>
         </dependency>
-		
-		 <dependency>
+
+     <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.9</version>
             <scope>test</scope>
         </dependency>
-		
+
         <!-- Mocks for unit testing (by Spring) -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
             <version>2.0.6</version>
-			<scope>test</scope>
+      <scope>test</scope>
         </dependency>
-		<dependency>
+    <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>2.0.6</version>
-			<scope>test</scope>
+      <scope>test</scope>
         </dependency>
    </dependencies>
 </project>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 8edba7591..2f94c625c 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-sitegraph-plugin</artifactId>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index a550a1c68..97c05545a 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-sitemesh-plugin</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index b8d289b29..0f6bee843 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-spring-plugin</artifactId>
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index e79202770..53a6d2b2e 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-struts1-plugin</artifactId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index acfd2f012..318a0c04a 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-tiles-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index a9e6fe77d..d3eac57fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/struts2</url>
@@ -283,7 +283,7 @@
                   </executions>
                 </plugin>
                 <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>        
+                  <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-release-plugin</artifactId>
                   <configuration>
                     <useReleaseProfile>false</useReleaseProfile>