diff --git a/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml b/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
index a638a88..0b99f2b 100644
--- a/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
+++ b/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ajax</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ajax-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Ajax Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.ajax.relPath}</url>
@@ -48,17 +48,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml b/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml
index 2c95baa..b768906 100644
--- a/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml
+++ b/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ajax</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ajax-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Ajax Block Sample</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-ajax/pom.xml b/blocks/cocoon-ajax/pom.xml
index 34b1ffd..c5ef878 100644
--- a/blocks/cocoon-ajax/pom.xml
+++ b/blocks/cocoon-ajax/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ajax</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Ajax</name>
diff --git a/blocks/cocoon-apples/cocoon-apples-impl/pom.xml b/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
index d1d94dd..a95875b 100644
--- a/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
+++ b/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-apples</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-apples-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Apples Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.apples.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   
diff --git a/blocks/cocoon-apples/cocoon-apples-sample/pom.xml b/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
index 0b5c4f2..f6c50ab 100644
--- a/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
+++ b/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-apples</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-apples-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Apples Block Samples</name>
 
@@ -35,27 +35,27 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-apples-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-apples/pom.xml b/blocks/cocoon-apples/pom.xml
index 2e2eda6..861afb5 100644
--- a/blocks/cocoon-apples/pom.xml
+++ b/blocks/cocoon-apples/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-apples</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Apples</name>
diff --git a/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml b/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
index 66653cc..2d31a3d 100644
--- a/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
+++ b/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-asciiart</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-asciiart-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Asciiart Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml b/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
index 9bfd3b8..f67ee1f 100644
--- a/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
+++ b/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-asciiart</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-asciiart-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Asciiart Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-asciiart-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-asciiart/pom.xml b/blocks/cocoon-asciiart/pom.xml
index 9d1741c..08939ae 100644
--- a/blocks/cocoon-asciiart/pom.xml
+++ b/blocks/cocoon-asciiart/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-asciiart</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Asciiart</name>
diff --git a/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml b/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
index f776670..3010f7b 100644
--- a/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
+++ b/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-auth</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cocoon-acegisecurity-sample</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
 
     <name>cocoon-acegisecurity</name>
 
@@ -94,12 +94,12 @@
         <dependency>
             <groupId>org.apache.cocoon</groupId>
             <artifactId>cocoon-core</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cocoon</groupId>
             <artifactId>cocoon-servlet-service-components</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.acegisecurity</groupId>
diff --git a/blocks/cocoon-auth/cocoon-auth-api/pom.xml b/blocks/cocoon-auth/cocoon-auth-api/pom.xml
index e9ac223..82513c2 100644
--- a/blocks/cocoon-auth/cocoon-auth-api/pom.xml
+++ b/blocks/cocoon-auth/cocoon-auth-api/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-auth</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-auth-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Authentication Block API</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-auth/cocoon-auth-impl/pom.xml b/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
index 032ec21..5699c15 100644
--- a/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
+++ b/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-auth</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-auth-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Authentication Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.auth.relPath}</url>
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-auth-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-auth/cocoon-auth-sample/pom.xml b/blocks/cocoon-auth/cocoon-auth-sample/pom.xml
index 87b66fe..cd7e842 100644
--- a/blocks/cocoon-auth/cocoon-auth-sample/pom.xml
+++ b/blocks/cocoon-auth/cocoon-auth-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-auth</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-auth-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Authentication Block Sample</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-auth-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-auth/pom.xml b/blocks/cocoon-auth/pom.xml
index 96d03d0..4de99b2 100644
--- a/blocks/cocoon-auth/pom.xml
+++ b/blocks/cocoon-auth/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-auth</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Authentication Block</name>
diff --git a/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml b/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
index 6f04c76..b6d82c0 100644
--- a/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
+++ b/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-authentication-fw</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-authentication-fw-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Authentication Framework Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml b/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
index 5d2a36a..18ec00b 100644
--- a/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
+++ b/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-authentication-fw</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-authentication-fw-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Authentication Framework Sample Application</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-authentication-fw-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-authentication-fw/pom.xml b/blocks/cocoon-authentication-fw/pom.xml
index 4bf564e..cf8a4e9 100644
--- a/blocks/cocoon-authentication-fw/pom.xml
+++ b/blocks/cocoon-authentication-fw/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-authentication-fw</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Authentication Framework</name>
diff --git a/blocks/cocoon-axis/cocoon-axis-impl/pom.xml b/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
index 7581f4c..6bccc9c 100644
--- a/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
+++ b/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-axis</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-axis-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Axis Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
diff --git a/blocks/cocoon-axis/cocoon-axis-sample/pom.xml b/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
index 89337bc..90da2eb 100644
--- a/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
+++ b/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-axis</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-axis-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Axis Block Samples</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-axis-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-axis/pom.xml b/blocks/cocoon-axis/pom.xml
index 11f0d80..202b553 100644
--- a/blocks/cocoon-axis/pom.xml
+++ b/blocks/cocoon-axis/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-axis</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Axis</name>
diff --git a/blocks/cocoon-batik/cocoon-batik-impl/pom.xml b/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
index 026f143..93069b3 100644
--- a/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
+++ b/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-batik</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-batik-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Batik Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.batik.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- TODO : add exclusions for xerces and rhino. -->
     <dependency>
diff --git a/blocks/cocoon-batik/cocoon-batik-sample/pom.xml b/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
index 7fa7ad2..4a3c4bf 100644
--- a/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
+++ b/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-batik</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-batik-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Batik Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-batik/pom.xml b/blocks/cocoon-batik/pom.xml
index cd9de7d..bffab1a 100644
--- a/blocks/cocoon-batik/pom.xml
+++ b/blocks/cocoon-batik/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-batik</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Batik</name>
diff --git a/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml b/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
index 05cc6f8..1120714 100644
--- a/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
+++ b/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-bsf</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-bsf-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Bsf Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>bsf</groupId>
diff --git a/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml b/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
index 8fe9886..5821eb9 100644
--- a/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
+++ b/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-bsf</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-bsf-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Bsf Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-bsf-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>groovy</groupId>
diff --git a/blocks/cocoon-bsf/pom.xml b/blocks/cocoon-bsf/pom.xml
index ff2f1ab..e7a4789 100644
--- a/blocks/cocoon-bsf/pom.xml
+++ b/blocks/cocoon-bsf/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-bsf</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Bsf</name>
diff --git a/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml b/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
index b83bfe9..c1ce9b4 100644
--- a/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
+++ b/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-captcha</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-captcha-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Captcha Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.captcha.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   
diff --git a/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml b/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
index 4ca3fdd..79acef0 100644
--- a/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
+++ b/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-captcha</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-captcha-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Captcha Block Sample</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-captcha-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-captcha/pom.xml b/blocks/cocoon-captcha/pom.xml
index f6f3c75..d6fb16f 100644
--- a/blocks/cocoon-captcha/pom.xml
+++ b/blocks/cocoon-captcha/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-captcha</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Captcha</name>
diff --git a/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml b/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml
index b191a5c..aacb848 100644
--- a/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml
+++ b/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-sample</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-core-additional-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Additional Sample Block</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml b/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
index dcbdece..1ace5ba 100644
--- a/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
+++ b/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-sample</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-core-main-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Main Core Sample Block</name>
 
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--dependency>
       <groupId>org.apache.cocoon</groupId>
diff --git a/blocks/cocoon-core-sample/pom.xml b/blocks/cocoon-core-sample/pom.xml
index 289ba9f..303d88a 100644
--- a/blocks/cocoon-core-sample/pom.xml
+++ b/blocks/cocoon-core-sample/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-core-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Core Sample</name>
diff --git a/blocks/cocoon-cron/cocoon-cron-impl/pom.xml b/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
index 4ab87f8..d833d0b 100644
--- a/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
+++ b/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-cron</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-cron-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cron block implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>quartz</groupId>
diff --git a/blocks/cocoon-cron/cocoon-cron-sample/pom.xml b/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
index 3d38dfd..d26e482 100644
--- a/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
+++ b/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-cron</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-cron-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cron Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-cron-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-cron/pom.xml b/blocks/cocoon-cron/pom.xml
index 70956b1..6de1b05 100644
--- a/blocks/cocoon-cron/pom.xml
+++ b/blocks/cocoon-cron/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-cron</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Cron</name>
diff --git a/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml b/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
index dc4bff2..e3f5916 100644
--- a/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-bridge</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Database Block Bridge for Avalon components</name>
   <url>http://cocoon.apache.org/${docs.m.databases-bridge.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
diff --git a/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml b/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
index 8514650..b24b9f4 100644
--- a/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-hsqldb-client</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Hsqldb Client Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.hsqldb-client.relPath}</url>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
diff --git a/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml b/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
index 21fea48..675ced1 100644
--- a/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-hsqldb-server</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Hsqldb Server Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.hsqldb-server.relPath}</url>
@@ -51,12 +51,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
diff --git a/blocks/cocoon-databases/cocoon-databases-impl/pom.xml b/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
index 5a89580..20393f7 100644
--- a/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Database Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.databases.relPath}</url>
@@ -48,18 +48,18 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-mocks</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-bridge</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
diff --git a/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml b/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
index 56bd49e..125d451 100644
--- a/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-mocks</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Database Block Mocks</name>
 
diff --git a/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml b/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
index 1e76900..2194b40 100644
--- a/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-odbc-client</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon ODBC client Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml b/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
index 02c5f41..56099a5 100644
--- a/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-oracle-client</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Oracle client Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml b/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
index 96d2905..236ded5 100644
--- a/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-postgresql-client</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon PostgreSQL client Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-databases/cocoon-databases-sample/pom.xml b/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
index f13414d..108113a 100644
--- a/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
+++ b/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-databases</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Databases Block Samples</name>
 
@@ -35,27 +35,27 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-hsqldb-server</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-hsqldb-client</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-databases/pom.xml b/blocks/cocoon-databases/pom.xml
index 4ba905f..0855a4b 100644
--- a/blocks/cocoon-databases/pom.xml
+++ b/blocks/cocoon-databases/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-databases</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Databases</name>
diff --git a/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml b/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
index 6a6632f..4cc9993 100644
--- a/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
+++ b/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-eventcache</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-eventcache-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Eventcache Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.eventcache.relPath}</url>
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml b/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
index b964450..9f3a074 100644
--- a/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
+++ b/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-eventcache</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-eventcache-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Eventcache Block Samples</name>
 
@@ -35,22 +35,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-eventcache-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-eventcache/pom.xml b/blocks/cocoon-eventcache/pom.xml
index 5a893d5..a5d2fa0 100644
--- a/blocks/cocoon-eventcache/pom.xml
+++ b/blocks/cocoon-eventcache/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-eventcache</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Eventcache</name>
diff --git a/blocks/cocoon-faces/cocoon-faces-impl/pom.xml b/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
index 1e6b612..0700420 100644
--- a/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
+++ b/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-faces</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-faces-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Faces Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>myfaces</groupId>
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-taglib-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-faces/cocoon-faces-sample/pom.xml b/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
index 31c1900..801e0b0 100644
--- a/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
+++ b/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-faces</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-faces-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Faces Block Samples</name>
 
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-faces-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-faces/pom.xml b/blocks/cocoon-faces/pom.xml
index cb4eaf1..f178144 100644
--- a/blocks/cocoon-faces/pom.xml
+++ b/blocks/cocoon-faces/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-faces</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Faces</name>
diff --git a/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml b/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
index 706168b..76e3daf 100644
--- a/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
+++ b/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-flowscript</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-flowscript-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Flowscript Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.flowscript.relPath}</url>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   
diff --git a/blocks/cocoon-flowscript/pom.xml b/blocks/cocoon-flowscript/pom.xml
index 9ef1195..33bcd11 100644
--- a/blocks/cocoon-flowscript/pom.xml
+++ b/blocks/cocoon-flowscript/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-flowscript</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Flowscript</name>
diff --git a/blocks/cocoon-fop/cocoon-fop-impl/pom.xml b/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
index 4edcfa5..c32a6ba 100644
--- a/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
+++ b/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-fop</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-fop-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon FOP Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.fop.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>fop</groupId>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   
diff --git a/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml b/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
index acbdb89..9d1fdf9 100644
--- a/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
+++ b/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-fop</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-fop-ng-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon FOP 0.9x Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml b/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
index afbab87..b376171 100644
--- a/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
+++ b/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-fop</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-fop-ng-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon FOP 0.9x Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-fop-ng-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-fop/cocoon-fop-sample/pom.xml b/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
index 17ab8db..a977674 100644
--- a/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
+++ b/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-fop</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-fop-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon FOP Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-fop-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-fop/pom.xml b/blocks/cocoon-fop/pom.xml
index 5d0da5e..9af2825 100644
--- a/blocks/cocoon-fop/pom.xml
+++ b/blocks/cocoon-fop/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-fop</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon FOP</name>
diff --git a/blocks/cocoon-forms/cocoon-forms-impl/pom.xml b/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
index 4518b78..7d440e3 100644
--- a/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
+++ b/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-forms</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-forms-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Forms Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.forms.relPath}</url>
@@ -74,33 +74,33 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/blocks/cocoon-forms/cocoon-forms-sample/pom.xml b/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
index 6877c62..6b9bbd4 100644
--- a/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
+++ b/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-forms</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-forms-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Forms Block Samples</name>
 
@@ -35,27 +35,27 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-forms/pom.xml b/blocks/cocoon-forms/pom.xml
index 0250010..f12f623 100644
--- a/blocks/cocoon-forms/pom.xml
+++ b/blocks/cocoon-forms/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-forms</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Forms</name>
diff --git a/blocks/cocoon-html/cocoon-html-impl/pom.xml b/blocks/cocoon-html/cocoon-html-impl/pom.xml
index 3199ca2..7b7c394 100644
--- a/blocks/cocoon-html/cocoon-html-impl/pom.xml
+++ b/blocks/cocoon-html/cocoon-html-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-html</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-html-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon HTML Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.html.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>jtidy</groupId>
diff --git a/blocks/cocoon-html/cocoon-html-sample/pom.xml b/blocks/cocoon-html/cocoon-html-sample/pom.xml
index 6538057..a8371ce 100644
--- a/blocks/cocoon-html/cocoon-html-sample/pom.xml
+++ b/blocks/cocoon-html/cocoon-html-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-html</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-html-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Html Block Sample</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-html-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-html/pom.xml b/blocks/cocoon-html/pom.xml
index ea7f95a..1246cea 100644
--- a/blocks/cocoon-html/pom.xml
+++ b/blocks/cocoon-html/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-html</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon HTML</name>
diff --git a/blocks/cocoon-it/pom.xml b/blocks/cocoon-it/pom.xml
index 1efc728..564d1e2 100644
--- a/blocks/cocoon-it/pom.xml
+++ b/blocks/cocoon-it/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-it</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Integration Tests Block</name>
   <description>
@@ -101,12 +101,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-itext/cocoon-itext-impl/pom.xml b/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
index e5132c3..383e2e2 100644
--- a/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
+++ b/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-itext</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-itext-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Itext Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.lowagie</groupId>
diff --git a/blocks/cocoon-itext/cocoon-itext-sample/pom.xml b/blocks/cocoon-itext/cocoon-itext-sample/pom.xml
index 21dedfb..c1c6eea 100644
--- a/blocks/cocoon-itext/cocoon-itext-sample/pom.xml
+++ b/blocks/cocoon-itext/cocoon-itext-sample/pom.xml
@@ -23,28 +23,28 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-itext</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-itext-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <name>Itext Block Samples</name>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-itext-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-itext/pom.xml b/blocks/cocoon-itext/pom.xml
index 44de131..6c5ada7 100644
--- a/blocks/cocoon-itext/pom.xml
+++ b/blocks/cocoon-itext/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-itext</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Itext</name>
diff --git a/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml b/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
index 3b8b8eb..a3c7de0 100644
--- a/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
+++ b/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-javaflow</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-javaflow-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Javaflow Block</name>
 
@@ -47,12 +47,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml b/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
index 547d97d..5c1ebb9 100644
--- a/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
+++ b/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
@@ -23,38 +23,38 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-javaflow</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-javaflow-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <name>Javaflow Block Samples</name>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-javaflow-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-javaflow/pom.xml b/blocks/cocoon-javaflow/pom.xml
index 4e8da16..6fde0a0 100644
--- a/blocks/cocoon-javaflow/pom.xml
+++ b/blocks/cocoon-javaflow/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-javaflow</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Javaflow</name>
diff --git a/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml b/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml
index 9a86a95..4b0f579 100644
--- a/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml
+++ b/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jcr</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jcr-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>JCR Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.jcr.relPath}</url>
@@ -48,19 +48,19 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/blocks/cocoon-jcr/cocoon-jcr-sample/pom.xml b/blocks/cocoon-jcr/cocoon-jcr-sample/pom.xml
index f7cdeaf..b402770 100644
--- a/blocks/cocoon-jcr/cocoon-jcr-sample/pom.xml
+++ b/blocks/cocoon-jcr/cocoon-jcr-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jcr</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jcr-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>JCR Block Sample</name>
 
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jcr-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-jcr/pom.xml b/blocks/cocoon-jcr/pom.xml
index 09a9cce..4a875d5 100644
--- a/blocks/cocoon-jcr/pom.xml
+++ b/blocks/cocoon-jcr/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jcr</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JCR Block [modules]</name>
diff --git a/blocks/cocoon-jfor/pom.xml b/blocks/cocoon-jfor/pom.xml
index d57bac1..f74eebb 100644
--- a/blocks/cocoon-jfor/pom.xml
+++ b/blocks/cocoon-jfor/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jfor</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Jfor</name>
diff --git a/blocks/cocoon-jms/cocoon-jms-impl/pom.xml b/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
index 908c0c3..7f2c5eb 100644
--- a/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
+++ b/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jms</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jms-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon JMS Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.jms.relPath}</url>
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-eventcache-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/blocks/cocoon-jms/cocoon-jms-sample/pom.xml b/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
index 7e82f7c..03b4a59 100644
--- a/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
+++ b/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jms</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jms-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon JMS Block Samples</name>
 
@@ -85,22 +85,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-jms/pom.xml b/blocks/cocoon-jms/pom.xml
index 5cf9c9a..b38eac5 100644
--- a/blocks/cocoon-jms/pom.xml
+++ b/blocks/cocoon-jms/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jms</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon JMS</name>
diff --git a/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml b/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
index aec72bc..52bcb14 100644
--- a/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
+++ b/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jsp</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jsp-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Jsp Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jsp-mocks</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml b/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
index 0772027..898dc9f 100644
--- a/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
+++ b/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jsp</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jsp-mocks</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Jsp Block Mocks</name>
 
diff --git a/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml b/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml
index 84c678b..01c7f1b 100644
--- a/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml
+++ b/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jsp</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jsp-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Jsp Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jsp-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-jsp/pom.xml b/blocks/cocoon-jsp/pom.xml
index 9609616..4d9bdda 100644
--- a/blocks/cocoon-jsp/pom.xml
+++ b/blocks/cocoon-jsp/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jsp</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Jsp</name>
diff --git a/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml b/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
index 3bb2020..88a5117 100644
--- a/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
+++ b/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-linkrewriter</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-linkrewriter-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Linkrewriter Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.linkrewriter.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   
diff --git a/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/pom.xml b/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/pom.xml
index 1f3448c..a994c35 100644
--- a/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/pom.xml
+++ b/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-linkrewriter</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-linkrewriter-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Linkrewriter Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-linkrewriter-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-linkrewriter/pom.xml b/blocks/cocoon-linkrewriter/pom.xml
index 55b30d5..bea4142 100644
--- a/blocks/cocoon-linkrewriter/pom.xml
+++ b/blocks/cocoon-linkrewriter/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-linkrewriter</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Linkrewriter</name>
diff --git a/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml b/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
index f7d6529..7ca736f 100644
--- a/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
+++ b/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-lucene</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-lucene-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Lucene Block Implementation</name>
 
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
diff --git a/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml b/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
index a1a63c5..32a9523 100644
--- a/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
+++ b/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-lucene</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-lucene-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Lucene Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-lucene-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-lucene/pom.xml b/blocks/cocoon-lucene/pom.xml
index f850308..87a6164 100644
--- a/blocks/cocoon-lucene/pom.xml
+++ b/blocks/cocoon-lucene/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-lucene</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Lucene</name>
diff --git a/blocks/cocoon-mail/cocoon-mail-impl/pom.xml b/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
index a505bc3..cd4197b 100644
--- a/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
+++ b/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-mail</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-mail-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Mail Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.forms.relPath}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
diff --git a/blocks/cocoon-mail/cocoon-mail-sample/pom.xml b/blocks/cocoon-mail/cocoon-mail-sample/pom.xml
index f53829b..05f9c34 100644
--- a/blocks/cocoon-mail/cocoon-mail-sample/pom.xml
+++ b/blocks/cocoon-mail/cocoon-mail-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-mail</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-mail-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Mail Block Sample</name>
 
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-mail-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-mail/pom.xml b/blocks/cocoon-mail/pom.xml
index c5b4d9f..47eec5a 100644
--- a/blocks/cocoon-mail/pom.xml
+++ b/blocks/cocoon-mail/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-mail</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Mail</name>
diff --git a/blocks/cocoon-midi/cocoon-midi-impl/pom.xml b/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
index fb16dba..257794e 100644
--- a/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
+++ b/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-midi</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-midi-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Midi Block Implementation</name>
 
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
diff --git a/blocks/cocoon-midi/cocoon-midi-sample/pom.xml b/blocks/cocoon-midi/cocoon-midi-sample/pom.xml
index 40494cb..e109bf8 100644
--- a/blocks/cocoon-midi/cocoon-midi-sample/pom.xml
+++ b/blocks/cocoon-midi/cocoon-midi-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-midi</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-midi-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Midi Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-midi-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-midi/pom.xml b/blocks/cocoon-midi/pom.xml
index e3d95e2..f35defc 100644
--- a/blocks/cocoon-midi/pom.xml
+++ b/blocks/cocoon-midi/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-midi</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Midi</name>
diff --git a/blocks/cocoon-naming/cocoon-naming-impl/pom.xml b/blocks/cocoon-naming/cocoon-naming-impl/pom.xml
index 49f13ce..3da59b7 100644
--- a/blocks/cocoon-naming/cocoon-naming-impl/pom.xml
+++ b/blocks/cocoon-naming/cocoon-naming-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-naming</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-naming-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Naming Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-naming/cocoon-naming-sample/pom.xml b/blocks/cocoon-naming/cocoon-naming-sample/pom.xml
index f3c9750..7319386 100644
--- a/blocks/cocoon-naming/cocoon-naming-sample/pom.xml
+++ b/blocks/cocoon-naming/cocoon-naming-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-naming</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-naming-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Naming Block Samples</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-naming-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-naming/pom.xml b/blocks/cocoon-naming/pom.xml
index e012931..54d6eb7 100644
--- a/blocks/cocoon-naming/pom.xml
+++ b/blocks/cocoon-naming/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-naming</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Naming</name>
diff --git a/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml b/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
index 51895ac..cd5bfc0 100644
--- a/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
+++ b/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ojb</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ojb-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Ojb Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>ojb</groupId>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-mocks</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml b/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
index 1d1f2c2..198265c 100644
--- a/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
+++ b/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ojb</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ojb-mocks</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Ojb Block Mocks</name>
 
diff --git a/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml b/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
index bbcc670..20c62b0 100644
--- a/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
+++ b/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ojb</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ojb-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Ojb Block Samples</name>
 
@@ -35,39 +35,39 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--  For now we have to depend on the querybean block as the ojb configuration contains
           mappings for some beans from the querybean block :( -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-querybean-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-mocks</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/blocks/cocoon-ojb/pom.xml b/blocks/cocoon-ojb/pom.xml
index a8c4606..a1f0bdc 100644
--- a/blocks/cocoon-ojb/pom.xml
+++ b/blocks/cocoon-ojb/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-ojb</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Ojb</name>
diff --git a/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml b/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml
index 26cd360..26112b5 100644
--- a/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml
+++ b/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-petstore</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-petstore-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Petstore Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml b/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
index 0c5d285..42d364e 100644
--- a/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
+++ b/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-petstore</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-petstore-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Petstore Block Samples</name>
 
@@ -35,22 +35,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-petstore-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-velocity-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-hsqldb-server</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-petstore/pom.xml b/blocks/cocoon-petstore/pom.xml
index 34e9fca..2a40e6f 100644
--- a/blocks/cocoon-petstore/pom.xml
+++ b/blocks/cocoon-petstore/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-petstore</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Petstore</name>
diff --git a/blocks/cocoon-poi/cocoon-poi-impl/pom.xml b/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
index d4eac23..ee1bd2d 100644
--- a/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
+++ b/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-poi</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-poi-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Poi Block Implementation</name>
 
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
diff --git a/blocks/cocoon-poi/cocoon-poi-sample/pom.xml b/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
index e404bb7..97be6e5 100644
--- a/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
+++ b/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-poi</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-poi-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Poi Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-poi-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-poi/pom.xml b/blocks/cocoon-poi/pom.xml
index 78ddff2..fac0f3d 100644
--- a/blocks/cocoon-poi/pom.xml
+++ b/blocks/cocoon-poi/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-poi</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Poi</name>
diff --git a/blocks/cocoon-portal/cocoon-portal-api/pom.xml b/blocks/cocoon-portal/cocoon-portal-api/pom.xml
index 5ddd999..cfc0b92 100644
--- a/blocks/cocoon-portal/cocoon-portal-api/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-api/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block API</name>
 
diff --git a/blocks/cocoon-portal/cocoon-portal-auth-impl/pom.xml b/blocks/cocoon-portal/cocoon-portal-auth-impl/pom.xml
index eacc3c6..2b86160 100644
--- a/blocks/cocoon-portal/cocoon-portal-auth-impl/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-auth-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-auth-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block CAuth Support</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-auth-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml b/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml
index 4985fcc..5da6e06 100644
--- a/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-bridges-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-bridges-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block Bridges Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.pluto</groupId>
diff --git a/blocks/cocoon-portal/cocoon-portal-converter-castor/pom.xml b/blocks/cocoon-portal/cocoon-portal-converter-castor/pom.xml
index 8e0b4e3..14fc8d0 100644
--- a/blocks/cocoon-portal/cocoon-portal-converter-castor/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-converter-castor/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-converter-castor</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Portal Castor Converter</name>
   <description>Profile Converter using Castor</description>
@@ -36,12 +36,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.castor</groupId>
diff --git a/blocks/cocoon-portal/cocoon-portal-impl/pom.xml b/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
index 3d4ecec..2eaef3e 100644
--- a/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block Implementation</name>
 
@@ -47,17 +47,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-serializers-charsets</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   
diff --git a/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml b/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml
index ff8c9be..e0ad2ef 100644
--- a/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-portlet-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block Portlet Implementation</name>
 
@@ -49,28 +49,28 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-bridges-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-serializers-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-sitemap</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.castor</groupId>
diff --git a/blocks/cocoon-portal/cocoon-portal-sample/pom.xml b/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
index 56d6891..5f962d2 100644
--- a/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block Sample</name>
 
@@ -35,32 +35,32 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-sitemap</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-auth-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-serializers-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-converter-castor</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-portal/cocoon-portal-sitemap/pom.xml b/blocks/cocoon-portal/cocoon-portal-sitemap/pom.xml
index 6103ab3..49d3cf5 100644
--- a/blocks/cocoon-portal/cocoon-portal-sitemap/pom.xml
+++ b/blocks/cocoon-portal/cocoon-portal-sitemap/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal-sitemap</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Portal Block Sitemap</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-portal/pom.xml b/blocks/cocoon-portal/pom.xml
index ea4462f..e79f0e9 100644
--- a/blocks/cocoon-portal/pom.xml
+++ b/blocks/cocoon-portal/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-portal</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Portal Block [modules]</name>
diff --git a/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml b/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml
index 1cf25de..b97b9dd 100644
--- a/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml
+++ b/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-profiler</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-profiler-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Profiler Block</name>
 
@@ -47,12 +47,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-auth-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml b/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml
index 669bf6a..638a470 100644
--- a/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml
+++ b/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-profiler</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-profiler-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Profiler Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-profiler-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-profiler/pom.xml b/blocks/cocoon-profiler/pom.xml
index 3b9cc04..371e640 100644
--- a/blocks/cocoon-profiler/pom.xml
+++ b/blocks/cocoon-profiler/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-profiler</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Profiler</name>
diff --git a/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml b/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
index 726867a..9f61d3f 100644
--- a/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
+++ b/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-proxy</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-proxy-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Proxy Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
diff --git a/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml b/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml
index af71b3f..b34f4e0 100644
--- a/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml
+++ b/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-proxy</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-proxy-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Proxy Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-proxy-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-proxy/pom.xml b/blocks/cocoon-proxy/pom.xml
index cb4fc5f..57cc1c4 100644
--- a/blocks/cocoon-proxy/pom.xml
+++ b/blocks/cocoon-proxy/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-proxy</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Proxy</name>
diff --git a/blocks/cocoon-python/cocoon-python-impl/pom.xml b/blocks/cocoon-python/cocoon-python-impl/pom.xml
index ccb7ab6..c195c97 100644
--- a/blocks/cocoon-python/cocoon-python-impl/pom.xml
+++ b/blocks/cocoon-python/cocoon-python-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-python</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-python-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Python Block Implementation</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-python-mocks</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-python/cocoon-python-mocks/pom.xml b/blocks/cocoon-python/cocoon-python-mocks/pom.xml
index 5b570dd..0f6664e 100644
--- a/blocks/cocoon-python/cocoon-python-mocks/pom.xml
+++ b/blocks/cocoon-python/cocoon-python-mocks/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-python</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-python-mocks</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Python Block Mocks</name>
 
diff --git a/blocks/cocoon-python/pom.xml b/blocks/cocoon-python/pom.xml
index 1a2209a..f6c83ee 100644
--- a/blocks/cocoon-python/pom.xml
+++ b/blocks/cocoon-python/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-python</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Python</name>
diff --git a/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml b/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml
index 65c32cb..f051afd 100644
--- a/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml
+++ b/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-qdox</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-qdox-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Qdox Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>qdox</groupId>
diff --git a/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml b/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml
index 10a91bf..e1fed50 100644
--- a/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml
+++ b/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-qdox</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-qdox-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Qdox Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-qdox-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-qdox/pom.xml b/blocks/cocoon-qdox/pom.xml
index fa1d789..9c7e325 100644
--- a/blocks/cocoon-qdox/pom.xml
+++ b/blocks/cocoon-qdox/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-qdox</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Qdox</name>
diff --git a/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml b/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml
index 7ad8fd8..3666739 100644
--- a/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml
+++ b/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-querybean</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-querybean-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Querybean Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-lucene-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml b/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
index e5e034c..b9a950f 100644
--- a/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
+++ b/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-querybean</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-querybean-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Querybean Block Samples</name>
 
@@ -35,22 +35,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-querybean-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-querybean/pom.xml b/blocks/cocoon-querybean/pom.xml
index 9d0d656..deb592c 100644
--- a/blocks/cocoon-querybean/pom.xml
+++ b/blocks/cocoon-querybean/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-querybean</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Querybean</name>
diff --git a/blocks/cocoon-repository/cocoon-repository-impl/pom.xml b/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
index f5b72fb..788f0bd 100644
--- a/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
+++ b/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-repository</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-repository-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Repository Block Implementation</name>
 
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-eventcache-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/blocks/cocoon-repository/pom.xml b/blocks/cocoon-repository/pom.xml
index 01f80cb..09073d4 100644
--- a/blocks/cocoon-repository/pom.xml
+++ b/blocks/cocoon-repository/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-repository</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Repository</name>
diff --git a/blocks/cocoon-samples-style/cocoon-samples-style-default/pom.xml b/blocks/cocoon-samples-style/cocoon-samples-style-default/pom.xml
index 51a769d..9683f81 100644
--- a/blocks/cocoon-samples-style/cocoon-samples-style-default/pom.xml
+++ b/blocks/cocoon-samples-style/cocoon-samples-style-default/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-samples-style</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-samples-style-default</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Samples Style Default Block</name>
 
@@ -56,12 +56,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-samples-style/pom.xml b/blocks/cocoon-samples-style/pom.xml
index b93675c..c4ca779 100644
--- a/blocks/cocoon-samples-style/pom.xml
+++ b/blocks/cocoon-samples-style/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-samples-style</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Samples Style</name>
diff --git a/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml b/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
index 5f0a967..049a887 100644
--- a/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
+++ b/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-scratchpad</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-scratchpad-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Scratchpad Block Implementation</name>
 
@@ -49,17 +49,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-repository-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
     </dependency>
     <dependency>
diff --git a/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml b/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
index 2abea30..2552f49 100644
--- a/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
+++ b/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-scratchpad</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-scratchpad-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Scratchpad Block Samples</name>
 
@@ -35,22 +35,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-scratchpad-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-scratchpad/pom.xml b/blocks/cocoon-scratchpad/pom.xml
index 44ebd28..1f14260 100644
--- a/blocks/cocoon-scratchpad/pom.xml
+++ b/blocks/cocoon-scratchpad/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-scratchpad</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Scratchpad</name>
diff --git a/blocks/cocoon-serializers/cocoon-serializers-charsets/pom.xml b/blocks/cocoon-serializers/cocoon-serializers-charsets/pom.xml
index 9f9cbc3..34de1f3 100644
--- a/blocks/cocoon-serializers/cocoon-serializers-charsets/pom.xml
+++ b/blocks/cocoon-serializers/cocoon-serializers-charsets/pom.xml
@@ -26,11 +26,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-serializers</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-serializers-charsets</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>Apache Cocoon Serializers Charsets</name>
diff --git a/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml b/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
index dbb0832..2ca0c47 100644
--- a/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
+++ b/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-serializers</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-serializers-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Serializers Block Implementation</name>
 
@@ -64,12 +64,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-serializers-charsets</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-serializers/pom.xml b/blocks/cocoon-serializers/pom.xml
index 2b50ac4..b03d212 100644
--- a/blocks/cocoon-serializers/pom.xml
+++ b/blocks/cocoon-serializers/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-serializers</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Serializers</name>
diff --git a/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml b/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
index df149b7..5e66edc 100644
--- a/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
+++ b/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-session-fw</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-session-fw-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Session Framework Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml b/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
index 18ad164..0a0f860 100644
--- a/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
+++ b/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-session-fw</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-session-fw-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Session Framework Sample Application</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-session-fw/pom.xml b/blocks/cocoon-session-fw/pom.xml
index 771c04a..53c9edc 100644
--- a/blocks/cocoon-session-fw/pom.xml
+++ b/blocks/cocoon-session-fw/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-session-fw</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Session Framework</name>
diff --git a/blocks/cocoon-slide/cocoon-slide-impl/pom.xml b/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
index d1cc296..403c78b 100644
--- a/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
+++ b/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slide</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-slide-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Slide Block Implementation</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-repository-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>slide</groupId>
diff --git a/blocks/cocoon-slide/cocoon-slide-sample/pom.xml b/blocks/cocoon-slide/cocoon-slide-sample/pom.xml
index 565d396..3dc81c2 100644
--- a/blocks/cocoon-slide/cocoon-slide-sample/pom.xml
+++ b/blocks/cocoon-slide/cocoon-slide-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slide</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-slide-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Slide Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-slide-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-slide/pom.xml b/blocks/cocoon-slide/pom.xml
index 37e64d7..f11b1f9 100644
--- a/blocks/cocoon-slide/pom.xml
+++ b/blocks/cocoon-slide/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-slide</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Slide</name>
diff --git a/blocks/cocoon-slop/cocoon-slop-impl/pom.xml b/blocks/cocoon-slop/cocoon-slop-impl/pom.xml
index c99d299..63d513b 100644
--- a/blocks/cocoon-slop/cocoon-slop-impl/pom.xml
+++ b/blocks/cocoon-slop/cocoon-slop-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slop</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-slop-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Slop Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-slop/cocoon-slop-sample/pom.xml b/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
index 8801981..ac26993 100644
--- a/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
+++ b/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slop</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-slop-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Slop Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-slop-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-slop/pom.xml b/blocks/cocoon-slop/pom.xml
index af6924f..5ab92f4 100644
--- a/blocks/cocoon-slop/pom.xml
+++ b/blocks/cocoon-slop/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-slop</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Slop</name>
diff --git a/blocks/cocoon-stx/cocoon-stx-impl/pom.xml b/blocks/cocoon-stx/cocoon-stx-impl/pom.xml
index efa483a..9bf57be 100644
--- a/blocks/cocoon-stx/cocoon-stx-impl/pom.xml
+++ b/blocks/cocoon-stx/cocoon-stx-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-stx</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-stx-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Stx Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-stx/cocoon-stx-sample/pom.xml b/blocks/cocoon-stx/cocoon-stx-sample/pom.xml
index 8a5dd96..815b2c9 100644
--- a/blocks/cocoon-stx/cocoon-stx-sample/pom.xml
+++ b/blocks/cocoon-stx/cocoon-stx-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-stx</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-stx-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Stx Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-stx-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-stx/pom.xml b/blocks/cocoon-stx/pom.xml
index 5ef55d5..a7a6fc3 100644
--- a/blocks/cocoon-stx/pom.xml
+++ b/blocks/cocoon-stx/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-stx</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Stx</name>
diff --git a/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml b/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
index 4d5afbf..464e842 100644
--- a/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
+++ b/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-taglib</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-taglib-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Taglib Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml b/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
index f49a0b7..5e930c5 100644
--- a/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
+++ b/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-taglib</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-taglib-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Taglib Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-taglib-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-taglib/pom.xml b/blocks/cocoon-taglib/pom.xml
index f324146..79936a6 100644
--- a/blocks/cocoon-taglib/pom.xml
+++ b/blocks/cocoon-taglib/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-taglib</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Taglib</name>
diff --git a/blocks/cocoon-template/cocoon-template-impl/pom.xml b/blocks/cocoon-template/cocoon-template-impl/pom.xml
index d52f81d..27eba18 100644
--- a/blocks/cocoon-template/cocoon-template-impl/pom.xml
+++ b/blocks/cocoon-template/cocoon-template-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-template</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-template-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Template Framework Block Implementation</name>
   <url>http://cocoon.apache.org/${docs.m.template.relPath}</url>
@@ -48,22 +48,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-util</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--
           Test dependencies
@@ -72,14 +72,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/blocks/cocoon-template/cocoon-template-sample/pom.xml b/blocks/cocoon-template/cocoon-template-sample/pom.xml
index ea47248..762730d 100644
--- a/blocks/cocoon-template/cocoon-template-sample/pom.xml
+++ b/blocks/cocoon-template/cocoon-template-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-template</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-template-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Template Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-template/pom.xml b/blocks/cocoon-template/pom.xml
index 6059b61..d041f03 100644
--- a/blocks/cocoon-template/pom.xml
+++ b/blocks/cocoon-template/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-template</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Template</name>
diff --git a/blocks/cocoon-tour/cocoon-tour-impl/pom.xml b/blocks/cocoon-tour/cocoon-tour-impl/pom.xml
index c362087..003733a 100644
--- a/blocks/cocoon-tour/cocoon-tour-impl/pom.xml
+++ b/blocks/cocoon-tour/cocoon-tour-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-tour</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-tour-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Tour Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-tour/cocoon-tour-sample/pom.xml b/blocks/cocoon-tour/cocoon-tour-sample/pom.xml
index 3f38b50..9397d17 100644
--- a/blocks/cocoon-tour/cocoon-tour-sample/pom.xml
+++ b/blocks/cocoon-tour/cocoon-tour-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-tour</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-tour-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Tour Block Samples</name>
 
@@ -35,22 +35,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-tour-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-slop-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-tour/pom.xml b/blocks/cocoon-tour/pom.xml
index 1d9afbc..0efd680 100644
--- a/blocks/cocoon-tour/pom.xml
+++ b/blocks/cocoon-tour/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-tour</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Tour Block [modules]</name>
diff --git a/blocks/cocoon-validation/cocoon-validation-impl/pom.xml b/blocks/cocoon-validation/cocoon-validation-impl/pom.xml
index f5a93dd..9977d01 100644
--- a/blocks/cocoon-validation/cocoon-validation-impl/pom.xml
+++ b/blocks/cocoon-validation/cocoon-validation-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-validation</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-validation-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Validation Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>thaiopensource</groupId>
diff --git a/blocks/cocoon-validation/cocoon-validation-sample/pom.xml b/blocks/cocoon-validation/cocoon-validation-sample/pom.xml
index 32632e9..f4ce8bf 100644
--- a/blocks/cocoon-validation/cocoon-validation-sample/pom.xml
+++ b/blocks/cocoon-validation/cocoon-validation-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-validation</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-validation-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Validation Block Sample</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-validation-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-validation/pom.xml b/blocks/cocoon-validation/pom.xml
index 96d1442..dae7194 100644
--- a/blocks/cocoon-validation/pom.xml
+++ b/blocks/cocoon-validation/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-validation</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Validation Block [modules]</name>
diff --git a/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml b/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
index b7add48..ee079dd 100644
--- a/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
+++ b/blocks/cocoon-velocity/cocoon-velocity-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-velocity</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-velocity-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Velocity Block Implementation</name>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>rhino</groupId>
diff --git a/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml b/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml
index 6a0c66c..2ace926 100644
--- a/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml
+++ b/blocks/cocoon-velocity/cocoon-velocity-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-velocity</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-velocity-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Velocity Block Samples</name>
 
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-velocity-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-velocity/pom.xml b/blocks/cocoon-velocity/pom.xml
index 8a50089..698d297 100644
--- a/blocks/cocoon-velocity/pom.xml
+++ b/blocks/cocoon-velocity/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-velocity</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Velocity Block [modules]</name>
diff --git a/blocks/cocoon-web3/cocoon-web3-impl/pom.xml b/blocks/cocoon-web3/cocoon-web3-impl/pom.xml
index 98237ac..c2ebe4e 100644
--- a/blocks/cocoon-web3/cocoon-web3-impl/pom.xml
+++ b/blocks/cocoon-web3/cocoon-web3-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-web3</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-web3-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Web3 Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-web3-mocks</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-web3/cocoon-web3-mocks/pom.xml b/blocks/cocoon-web3/cocoon-web3-mocks/pom.xml
index 9e24253..a13abe1 100644
--- a/blocks/cocoon-web3/cocoon-web3-mocks/pom.xml
+++ b/blocks/cocoon-web3/cocoon-web3-mocks/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-web3</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-web3-mocks</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Web3 Block Mocks</name>
 
diff --git a/blocks/cocoon-web3/cocoon-web3-sample/pom.xml b/blocks/cocoon-web3/cocoon-web3-sample/pom.xml
index ad74569..6e5ab88 100644
--- a/blocks/cocoon-web3/cocoon-web3-sample/pom.xml
+++ b/blocks/cocoon-web3/cocoon-web3-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-web3</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-web3-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Web3 Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-web3-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-web3/pom.xml b/blocks/cocoon-web3/pom.xml
index bb4e70c..197837c 100644
--- a/blocks/cocoon-web3/pom.xml
+++ b/blocks/cocoon-web3/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-web3</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Web3 Block [modules]</name>
diff --git a/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml b/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
index c83b4b3..70f2cbb 100644
--- a/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
+++ b/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-webdav</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-webdav-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Webdav Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-repository-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>slide</groupId>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
diff --git a/blocks/cocoon-webdav/cocoon-webdav-sample/pom.xml b/blocks/cocoon-webdav/cocoon-webdav-sample/pom.xml
index 63171b4..beef6d8 100644
--- a/blocks/cocoon-webdav/cocoon-webdav-sample/pom.xml
+++ b/blocks/cocoon-webdav/cocoon-webdav-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-webdav</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-webdav-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Webdav Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-webdav-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-webdav/pom.xml b/blocks/cocoon-webdav/pom.xml
index 5e697a7..7d2aceb 100644
--- a/blocks/cocoon-webdav/pom.xml
+++ b/blocks/cocoon-webdav/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-webdav</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Webdav Block [modules]</name>
diff --git a/blocks/cocoon-welcome/pom.xml b/blocks/cocoon-welcome/pom.xml
index 527c5bc..53a68c1 100644
--- a/blocks/cocoon-welcome/pom.xml
+++ b/blocks/cocoon-welcome/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-welcome</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Welcome (Samples)</name>
 
@@ -55,17 +55,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml b/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
index c3ae565..2b0ac88 100644
--- a/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
+++ b/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xsp</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xsp-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon XSP Block Implementation</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml b/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
index 1b3e71a..04f9e27 100644
--- a/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
+++ b/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xsp</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xsp-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon XSP Block Samples</name>
 
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-samples-style-default</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/blocks/cocoon-xsp/pom.xml b/blocks/cocoon-xsp/pom.xml
index 3efff87..fed7f60 100644
--- a/blocks/cocoon-xsp/pom.xml
+++ b/blocks/cocoon-xsp/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xsp</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon XSP</name>
diff --git a/blocks/pom.xml b/blocks/pom.xml
index 943019b..c4a86ec 100644
--- a/blocks/pom.xml
+++ b/blocks/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-blocks-modules</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Blocks [modules]</name>
diff --git a/commons/legal/pom.xml b/commons/legal/pom.xml
index e55b875..053da3f 100644
--- a/commons/legal/pom.xml
+++ b/commons/legal/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-commons</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-licenses</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Licenses</name>
 
diff --git a/commons/pom.xml b/commons/pom.xml
index 67922a9..e303724 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-commons</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Commons [modules]</name>
diff --git a/core/cocoon-block-deployment/pom.xml b/core/cocoon-block-deployment/pom.xml
index f373200..d626fd5 100644
--- a/core/cocoon-block-deployment/pom.xml
+++ b/core/cocoon-block-deployment/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-block-deployment</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Block Deployment</name>
   <description>Deployment utilities for Cocoon Blocks.</description>
diff --git a/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml b/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
index 4a26dbd..5c6edc1 100644
--- a/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
+++ b/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-fw</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-blocks-fw-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Blocks Framework Implementation</name>
   <description>${project.name}</description>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
diff --git a/core/cocoon-blocks-fw/pom.xml b/core/cocoon-blocks-fw/pom.xml
index bb46a14..1876b3e 100644
--- a/core/cocoon-blocks-fw/pom.xml
+++ b/core/cocoon-blocks-fw/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-blocks-fw</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Blocks Framework</name>
diff --git a/core/cocoon-configuration-api/pom.xml b/core/cocoon-configuration-api/pom.xml
index b86df44..a16c67e 100644
--- a/core/cocoon-configuration-api/pom.xml
+++ b/core/cocoon-configuration-api/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-configuration-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Configuration API</name>
   <description>
diff --git a/core/cocoon-container/pom.xml b/core/cocoon-container/pom.xml
index a20e018..3f1c0e0 100644
--- a/core/cocoon-container/pom.xml
+++ b/core/cocoon-container/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-container</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Container</name>
   <description>
diff --git a/core/cocoon-core/pom.xml b/core/cocoon-core/pom.xml
index aa34d27..51870e7 100644
--- a/core/cocoon-core/pom.xml
+++ b/core/cocoon-core/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-core</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Core</name>
   <description>
@@ -119,54 +119,54 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-block-deployment</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- Cocoon Core -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-resolver</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-util</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--  excalibur -->
     <dependency>
@@ -227,14 +227,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
@@ -262,13 +262,13 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-store-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml b/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml
index fb08b42..2ddf12f 100644
--- a/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml
+++ b/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-expression-language</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-expression-language-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Expression Language API</name>
   <description>
diff --git a/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml b/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
index 6b357f8..63c836d 100644
--- a/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
+++ b/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-expression-language</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-expression-language-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Expression Language Implementation.</name>
   <description>
@@ -51,17 +51,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-util</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
diff --git a/core/cocoon-expression-language/pom.xml b/core/cocoon-expression-language/pom.xml
index c5499c7..90d015c 100644
--- a/core/cocoon-expression-language/pom.xml
+++ b/core/cocoon-expression-language/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-expression-language</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Expression Language</name>
diff --git a/core/cocoon-jnet/pom.xml b/core/cocoon-jnet/pom.xml
index 7f60e75..be281dd 100644
--- a/core/cocoon-jnet/pom.xml
+++ b/core/cocoon-jnet/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-jnet</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon JNet</name>
   <description>Dynamically register URLStreamHandler factories with your JVM.</description>
@@ -88,14 +88,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
diff --git a/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml b/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
index 29b6f54..daf442a 100644
--- a/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
+++ b/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-pipeline</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-pipeline-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Pipeline API</name>
   <description>
diff --git a/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml b/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
index 4fd378a..ebafcdf 100644
--- a/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
+++ b/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-pipeline</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-pipeline-components</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Pipeline Components</name>
   <description>
@@ -53,22 +53,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -79,14 +79,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml b/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
index 5dea803..706aeb3 100644
--- a/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
+++ b/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-pipeline</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-pipeline-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Pipeline Implementation</name>
   <description>
@@ -68,27 +68,27 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- Excalibur -->
     <dependency>
diff --git a/core/cocoon-pipeline/pom.xml b/core/cocoon-pipeline/pom.xml
index 37a9026..2bbc080 100644
--- a/core/cocoon-pipeline/pom.xml
+++ b/core/cocoon-pipeline/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-pipeline</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Expression Language</name>
diff --git a/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml b/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
index 0e3d72a..2f72635 100644
--- a/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
+++ b/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-servlet-service</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-servlet-service-components-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Servlet Service Components Sample Blocks</name>
 
@@ -82,12 +82,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml b/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
index 28783ca..30638b9 100644
--- a/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
+++ b/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-servlet-service</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-servlet-service-components</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Servlet Service Components</name>
   <description>Components for the servlet service framework that depends on pipeline and sitemap APIs.</description>
@@ -91,22 +91,22 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jnet</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-linkrewriter-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -126,14 +126,14 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/core/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml b/core/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
index 0df0139..07d9a17 100644
--- a/core/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
+++ b/core/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
@@ -27,11 +27,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-servlet-service</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-servlet-service-impl-sample</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Servlet Service Implementation Sample Blocks</name>
 
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml b/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
index e6c6938..fd01de1 100644
--- a/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
+++ b/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-servlet-service</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-servlet-service-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Servlet Service Implementation</name>
   <description>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- Spring Framework -->
     <dependency>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jnet</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- commons -->
     <dependency>
diff --git a/core/cocoon-servlet-service/pom.xml b/core/cocoon-servlet-service/pom.xml
index 27173a5..aee26af 100644
--- a/core/cocoon-servlet-service/pom.xml
+++ b/core/cocoon-servlet-service/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-servlet-service</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Servlet Service</name>
diff --git a/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml b/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
index 170faa3..e8e5b86 100644
--- a/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
+++ b/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-sitemap</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-sitemap-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Sitemap API</name>
   <description>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- Excalibur -->
     <dependency>
diff --git a/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml b/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
index 31f2140..1fd9b3c 100644
--- a/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
+++ b/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-sitemap</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-sitemap-components</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Sitemap Components</name>
   <description>
@@ -52,12 +52,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml b/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
index 1635235..f08e293 100644
--- a/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
+++ b/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-sitemap</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-sitemap-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Sitemap Implementation</name>
   <description>
@@ -68,37 +68,37 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-sitemap-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-expression-language-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- Excalibur -->
     <dependency>
diff --git a/core/cocoon-sitemap/pom.xml b/core/cocoon-sitemap/pom.xml
index e9e583b..b4f0132 100644
--- a/core/cocoon-sitemap/pom.xml
+++ b/core/cocoon-sitemap/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-sitemap</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Sitemap</name>
diff --git a/core/cocoon-spring-configurator/pom.xml b/core/cocoon-spring-configurator/pom.xml
index 71ebe84..cfd3d7a 100644
--- a/core/cocoon-spring-configurator/pom.xml
+++ b/core/cocoon-spring-configurator/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-spring-configurator</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Spring Configurator</name>
   <description>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
diff --git a/core/cocoon-store/cocoon-store-impl/pom.xml b/core/cocoon-store/cocoon-store-impl/pom.xml
index daf312f..95bb307 100644
--- a/core/cocoon-store/cocoon-store-impl/pom.xml
+++ b/core/cocoon-store/cocoon-store-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-store</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-store-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Store Implementation</name>
   <description>
@@ -52,17 +52,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--  Commons -->
     <dependency>
diff --git a/core/cocoon-store/pom.xml b/core/cocoon-store/pom.xml
index e73e62a..3e5596f 100644
--- a/core/cocoon-store/pom.xml
+++ b/core/cocoon-store/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-store</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Store</name>
diff --git a/core/cocoon-thread/cocoon-thread-api/pom.xml b/core/cocoon-thread/cocoon-thread-api/pom.xml
index 5e90142..52c2856 100644
--- a/core/cocoon-thread/cocoon-thread-api/pom.xml
+++ b/core/cocoon-thread/cocoon-thread-api/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-thread</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-thread-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Thread API</name>
   <description>
diff --git a/core/cocoon-thread/cocoon-thread-impl/pom.xml b/core/cocoon-thread/cocoon-thread-impl/pom.xml
index eca1951..07520cb 100644
--- a/core/cocoon-thread/cocoon-thread-impl/pom.xml
+++ b/core/cocoon-thread/cocoon-thread-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-thread</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-thread-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Thread Implementation</name>
   <description>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-thread-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--  Commons logging -->
     <dependency>
diff --git a/core/cocoon-thread/pom.xml b/core/cocoon-thread/pom.xml
index 323a931..42b2d2e 100644
--- a/core/cocoon-thread/pom.xml
+++ b/core/cocoon-thread/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-thread</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Thread</name>
diff --git a/core/cocoon-util/pom.xml b/core/cocoon-util/pom.xml
index 79bbc27..15d5734 100644
--- a/core/cocoon-util/pom.xml
+++ b/core/cocoon-util/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-util</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Util</name>
   <description>
diff --git a/core/cocoon-webapp/pom.xml b/core/cocoon-webapp/pom.xml
index ce825f4..1749f3d 100644
--- a/core/cocoon-webapp/pom.xml
+++ b/core/cocoon-webapp/pom.xml
@@ -27,11 +27,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-webapp</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>Cocoon Webapp</name>
@@ -75,78 +75,78 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Cocoon Welcome Page -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-welcome</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Cocoon Core Samples -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-additional-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Cocoon Sample Blocks -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Integration Tests -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-it</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Integration Test Framework -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-it-fw</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -225,37 +225,37 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-apples-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-asciiart-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-auth-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-authentication-fw-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-axis-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-batik-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-bsf-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
           <groupId>org.apache.cocoon</groupId>
@@ -270,12 +270,12 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-cron-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-databases-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!--<dependency>
           <groupId>org.apache.cocoon</groupId>
@@ -285,7 +285,7 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-eventcache-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
           <groupId>org.apache.cocoon</groupId>
@@ -302,7 +302,7 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-fop-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!-- Disabled because classloading conflicts prevent it from running
              at the same time as the "legacy" FOP block.
@@ -315,7 +315,7 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-html-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!--dependency>
           <groupId>org.apache.cocoon</groupId>
@@ -325,7 +325,7 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-itext-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!-- Java flow was excluded from building because org.apache.commons:javaflow:jar:1.0-SNAPSHOT is not available anywhere -->
         <!--
@@ -338,7 +338,7 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-jcr-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!--<dependency>
           <groupId>org.apache.cocoon</groupId>
@@ -348,32 +348,32 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-jsp-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-linkrewriter-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-lucene-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-mail-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-midi-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-naming-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!-- Breaks currently cocoon-webapp
         <dependency>
@@ -385,47 +385,47 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-petstore-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-poi-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-portal-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-profiler-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-proxy-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-qdox-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-querybean-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-scratchpad-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-session-fw-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!-- Breaks currently cocoon-webapp
         <dependency>
@@ -437,12 +437,12 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-slop-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-stx-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!-- Breaks currently cocoon-webapp
         <dependency>
@@ -454,27 +454,27 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-tour-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-validation-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-velocity-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-web3-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-webdav-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
         <!--<dependency>
           <groupId>org.apache.cocoon</groupId>
@@ -484,7 +484,7 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-xsp-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/core/cocoon-xml/cocoon-xml-api/pom.xml b/core/cocoon-xml/cocoon-xml-api/pom.xml
index 5369905..39e461f 100644
--- a/core/cocoon-xml/cocoon-xml-api/pom.xml
+++ b/core/cocoon-xml/cocoon-xml-api/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xml</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xml-api</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon XML API</name>
   <description>
diff --git a/core/cocoon-xml/cocoon-xml-impl/pom.xml b/core/cocoon-xml/cocoon-xml-impl/pom.xml
index 1f75b44..98676f7 100644
--- a/core/cocoon-xml/cocoon-xml-impl/pom.xml
+++ b/core/cocoon-xml/cocoon-xml-impl/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xml</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xml-impl</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon XML Implementation</name>
   <description>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-api</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/core/cocoon-xml/cocoon-xml-resolver/pom.xml b/core/cocoon-xml/cocoon-xml-resolver/pom.xml
index 30afc3b..7be9a5e 100644
--- a/core/cocoon-xml/cocoon-xml-resolver/pom.xml
+++ b/core/cocoon-xml/cocoon-xml-resolver/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xml</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xml-resolver</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon XML Resolver</name>
   <description>
@@ -65,17 +65,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-block-deployment</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/core/cocoon-xml/cocoon-xml-util/pom.xml b/core/cocoon-xml/cocoon-xml-util/pom.xml
index acd0541..a5e42b6 100644
--- a/core/cocoon-xml/cocoon-xml-util/pom.xml
+++ b/core/cocoon-xml/cocoon-xml-util/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-xml</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xml-util</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon XML Utilities</name>
   <description>
diff --git a/core/cocoon-xml/pom.xml b/core/cocoon-xml/pom.xml
index dc299c3..4aae4c3 100644
--- a/core/cocoon-xml/pom.xml
+++ b/core/cocoon-xml/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-core-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-xml</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon XML</name>
diff --git a/core/pom.xml b/core/pom.xml
index fce5cb0..8af406e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-core-modules</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Core [modules]</name>
diff --git a/dists/cocoon-dist-publishing/pom.xml b/dists/cocoon-dist-publishing/pom.xml
index 15962e9..c6a9186 100644
--- a/dists/cocoon-dist-publishing/pom.xml
+++ b/dists/cocoon-dist-publishing/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-dists-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-dist-publishing</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>Core Publishing Distribution</name>
@@ -62,19 +62,19 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-webapp</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>war</type>
     </dependency>
 
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-fop-impl</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/dists/cocoon-dist-samples/pom.xml b/dists/cocoon-dist-samples/pom.xml
index 5034dd7..62dccf7 100644
--- a/dists/cocoon-dist-samples/pom.xml
+++ b/dists/cocoon-dist-samples/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-dists-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-dist-samples</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>Cocoon Samples Distribution</name>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-webapp</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
       <type>war</type>
     </dependency>
 
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core-main-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!--dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -108,33 +108,33 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-fop-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
     <!-- Many of old samples require XSP -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-sample</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
@@ -145,12 +145,12 @@
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-databases-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>    
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-portal-sample</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </dependency>    
       </dependencies>
     </profile>
diff --git a/dists/pom.xml b/dists/pom.xml
index 45bf4b5..4f63ea8 100644
--- a/dists/pom.xml
+++ b/dists/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-dists-modules</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Distributions [modules]</name>
diff --git a/pom.xml b/pom.xml
index 399b373..e5634f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Cocoon</name>
@@ -42,9 +42,9 @@
   </organization>
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.3/cocoon/cocoon-2.3.0</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2.3/cocoon/cocoon-2.3.0</developerConnection>
-    <url>https://svn.apache.org/viewvc/cocoon/tags/cocoon-2.3/cocoon/cocoon-2.3.0</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk</developerConnection>
+    <url>https://svn.apache.org/viewvc/cocoon/trunk</url>
   </scm>
 
   <developers>
@@ -2580,7 +2580,7 @@
         <plugin>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-it-fw</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/tools/archetypes/cocoon-22-archetype-block-plain/pom.xml b/tools/archetypes/cocoon-22-archetype-block-plain/pom.xml
index 5a4dec1..fb0be02 100644
--- a/tools/archetypes/cocoon-22-archetype-block-plain/pom.xml
+++ b/tools/archetypes/cocoon-22-archetype-block-plain/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-archetype</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-22-archetype-block-plain</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon 2.2 Archetype: Block (plain)</name>
 
diff --git a/tools/archetypes/cocoon-22-archetype-block/pom.xml b/tools/archetypes/cocoon-22-archetype-block/pom.xml
index 3b29674..0f255cc 100644
--- a/tools/archetypes/cocoon-22-archetype-block/pom.xml
+++ b/tools/archetypes/cocoon-22-archetype-block/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-archetype</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-22-archetype-block</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon 2.2 Archetype: Block </name>
 
diff --git a/tools/archetypes/cocoon-22-archetype-webapp/pom.xml b/tools/archetypes/cocoon-22-archetype-webapp/pom.xml
index 5605a6d..dad05dc 100644
--- a/tools/archetypes/cocoon-22-archetype-webapp/pom.xml
+++ b/tools/archetypes/cocoon-22-archetype-webapp/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-archetype</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-22-archetype-webapp</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon 2.2 Archetype: Web Application</name>
 
diff --git a/tools/archetypes/pom.xml b/tools/archetypes/pom.xml
index df81bf9..dc573f1 100644
--- a/tools/archetypes/pom.xml
+++ b/tools/archetypes/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-tools-modules</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-archetype</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon 2.2 Archetype: Block </name>
diff --git a/tools/cocoon-it-fw/pom.xml b/tools/cocoon-it-fw/pom.xml
index 7ca2642..fded74f 100644
--- a/tools/cocoon-it-fw/pom.xml
+++ b/tools/cocoon-it-fw/pom.xml
@@ -24,11 +24,11 @@
   <parent>
     <artifactId>cocoon-tools-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-it-fw</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Cocoon Integration Test Framework [maven-plugin]</name>
diff --git a/tools/cocoon-maven-docs-cleaner-plugin/pom.xml b/tools/cocoon-maven-docs-cleaner-plugin/pom.xml
index d7c6aae..48147e4 100644
--- a/tools/cocoon-maven-docs-cleaner-plugin/pom.xml
+++ b/tools/cocoon-maven-docs-cleaner-plugin/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <artifactId>cocoon-tools-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-maven-docs-cleaner-plugin</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Cocoon Maven Javadocs Script Report</name>
diff --git a/tools/cocoon-maven-javadocs-script-report/pom.xml b/tools/cocoon-maven-javadocs-script-report/pom.xml
index 96045d0..6c68bc5 100644
--- a/tools/cocoon-maven-javadocs-script-report/pom.xml
+++ b/tools/cocoon-maven-javadocs-script-report/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <artifactId>cocoon-tools-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-maven-javadocs-script-report</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Cocoon Maven Javadocs Script Report</name>
diff --git a/tools/cocoon-maven-reports/pom.xml b/tools/cocoon-maven-reports/pom.xml
index 3f5d9e2..3a70811 100644
--- a/tools/cocoon-maven-reports/pom.xml
+++ b/tools/cocoon-maven-reports/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <artifactId>cocoon-tools-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-maven-reports</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
 
   <name>Cocoon Maven Reports</name>
   
diff --git a/tools/pom.xml b/tools/pom.xml
index 5238d6c..dcde973 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>cocoon-tools-modules</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cocoon Tools [modules]</name>