diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4d7fbb703..1431355fb 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,23 +22,23 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Shindig Distribution assembly</name>
   <description>Assembles the Java code base into a deployment package.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/assembly
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/assembly
     </connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/assembly
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/assembly
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/assembly</url>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/assembly</url>
   </scm>
 
   <build>
diff --git a/extras/pom.xml b/extras/pom.xml
index 770e41657..e13e8e05f 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-extras</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Extra Modules</name>
   <description>Provides extra, deprecated or extended functionality. The items here have unstable APIs and could change at any time.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/extras</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/extras</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/extras</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/extras</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/extras</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/extras</url>
   </scm>
 
   <build>
diff --git a/features/pom.xml b/features/pom.xml
index 9ff3cb77d..5a886a645 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-features</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Features</name>
@@ -37,9 +37,9 @@
   </description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/features</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/features</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/features</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/features</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/features</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/features</url>
   </scm>
 
   <pluginRepositories>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 2f3027269..b3dd609e3 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-common</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Common Code</name>
   <description>Common java code for Shindig</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/common</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/common</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/common</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/common</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/common</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/common</url>
   </scm>
 
   <build>
diff --git a/java/gadgets/pom.xml b/java/gadgets/pom.xml
index c5043f408..3d973f0ff 100644
--- a/java/gadgets/pom.xml
+++ b/java/gadgets/pom.xml
@@ -22,12 +22,12 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-gadgets</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Gadget Renderer</name>
@@ -35,9 +35,9 @@
     all javascript required by the OpenSocial specification.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/gadgets</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/gadgets</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/gadgets</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/gadgets</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/gadgets</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/gadgets</url>
   </scm>
 
   <build>
diff --git a/java/sample-container/pom.xml b/java/sample-container/pom.xml
index 9a8e42ae1..05922e6ef 100644
--- a/java/sample-container/pom.xml
+++ b/java/sample-container/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-sample-container</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Sample Container</name>
   <description>Default Shindig Sample Container module</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/sample-container</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/sample-container</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/server</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
   </scm>
 
   <dependencies>
diff --git a/java/sample-maven-archetype/pom.xml b/java/sample-maven-archetype/pom.xml
index 957fa4ae9..130212095 100644
--- a/java/sample-maven-archetype/pom.xml
+++ b/java/sample-maven-archetype/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>sample-maven-archetype</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>Apache Shindig Sample Web App Maven Archetype</name>
diff --git a/java/server-dependencies/pom.xml b/java/server-dependencies/pom.xml
index 359bb878c..e88fd72f6 100644
--- a/java/server-dependencies/pom.xml
+++ b/java/server-dependencies/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-server-dependencies</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Shindig Web App Dependencies</name>
   <description>Default server war dependencies</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/server-dependencies</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/server-dependencies</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/server-dependencies</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server-dependencies</url>
   </scm>
 
   <dependencies>
diff --git a/java/server-resources/pom.xml b/java/server-resources/pom.xml
index 206fb86f1..4442d4a17 100644
--- a/java/server-resources/pom.xml
+++ b/java/server-resources/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-server-resources</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>Apache Shindig Web App Resources</name>
   <description>Shallow Default server war containing only the configuration and javascript for the gadget rendering and the social api.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/server-resources</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/server-resources</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/server-resources</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server-resources</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server-resources</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server-resources</url>
   </scm>
 
   <build>
diff --git a/java/server/pom.xml b/java/server/pom.xml
index d34672584..7f8dfbf86 100644
--- a/java/server/pom.xml
+++ b/java/server/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-server</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>Apache Shindig Web App</name>
   <description>Default server war containing both the gadget rendering code and the social api code.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/server</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/server</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/server</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
   </scm>
 
   <build>
diff --git a/java/social-api/pom.xml b/java/social-api/pom.xml
index 1220de869..f4c8ec7a3 100644
--- a/java/social-api/pom.xml
+++ b/java/social-api/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-social-api</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Social API</name>
   <description>Serves OpenSocial Data and the RESTful APIs.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/social-api</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/social-api</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/social-api</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/social-api</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/social-api</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/social-api</url>
   </scm>
 
   <build>
diff --git a/java/uber/pom.xml b/java/uber/pom.xml
index 60fad5eb8..abe7a778b 100644
--- a/java/uber/pom.xml
+++ b/java/uber/pom.xml
@@ -22,21 +22,21 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>shindig-uber</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Apache Shindig Uber Jar</name>
   <description>Uber Jar contains Shindig and dependencies</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/uber</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1/java/uber</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1/java/uber</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/uber</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/uber</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/uber</url>
   </scm>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 4ab21e0ac..3078a24c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.shindig</groupId>
   <artifactId>shindig-project</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Shindig Project</name>
@@ -60,9 +60,9 @@
   <!-- S C M                                                                  -->
   <!-- ====================================================================== -->
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.1</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.5.1</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk</url>
   </scm>
 
   <!-- ====================================================================== -->
@@ -1508,63 +1508,63 @@
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-features</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-common</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-gadgets</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-sample-container</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-server-resources</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-server-dependencies</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-server</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-social-api</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-extras</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <classifier>${shindig.jdk.classifier}</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.shindig</groupId>
         <artifactId>shindig-common</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>