You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/03/09 22:28:43 UTC

[1/5] curator git commit: [maven-release-plugin] prepare release apache-curator-2.12.0

Repository: curator
Updated Branches:
  refs/heads/CURATOR-3.0 87a145ca3 -> 7d44baee3


[maven-release-plugin] prepare release apache-curator-2.12.0


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2b68d13f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2b68d13f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2b68d13f

Branch: refs/heads/CURATOR-3.0
Commit: 2b68d13f6d1e57e019ee19f96f047361c8b88516
Parents: e2aef81
Author: Cam McKenzie <ca...@apache.org>
Authored: Wed Mar 1 14:01:01 2017 +1100
Committer: Cam McKenzie <ca...@apache.org>
Committed: Wed Mar 1 14:01:01 2017 +1100

----------------------------------------------------------------------
 curator-client/pom.xml             | 4 ++--
 curator-examples/pom.xml           | 2 +-
 curator-framework/pom.xml          | 4 ++--
 curator-recipes/pom.xml            | 4 ++--
 curator-test/pom.xml               | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml        | 4 ++--
 curator-x-rpc/pom.xml              | 4 ++--
 pom.xml                            | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 784989c..7ac500f 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-client</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
     <packaging>bundle</packaging>
 
     <name>Curator Client</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 13b8f20..9d329d4 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-examples</artifactId>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index f0ec6ba..7db6774 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-framework</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
     <packaging>bundle</packaging>
 
     <name>Curator Framework</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index c3e095e..9b072d4 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-recipes</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
     <packaging>bundle</packaging>
 
     <name>Curator Recipes</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 4cac12b..bb0c7b9 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-test</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
 
     <name>Curator Testing</name>
     <description>Unit testing utilities.</description>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index 29ec68d..c7bfbb0 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-x-discovery-server</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
     <packaging>bundle</packaging>
 
     <name>Curator Service Discovery Server</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 8024351..59afd55 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
 
     <artifactId>curator-x-discovery</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
     <packaging>bundle</packaging>
 
     <name>Curator Service Discovery</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/curator-x-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/pom.xml b/curator-x-rpc/pom.xml
index 7f297ff..c4fc9f9 100644
--- a/curator-x-rpc/pom.xml
+++ b/curator-x-rpc/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>apache-curator</artifactId>
         <groupId>org.apache.curator</groupId>
-        <version>2.11.2-SNAPSHOT</version>
+        <version>2.12.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>curator-x-rpc</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
 
     <name>Curator RPC Proxy</name>
     <description>A proxy that bridges non-java environments with the Curator framework and recipes</description>

http://git-wip-us.apache.org/repos/asf/curator/blob/2b68d13f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35a58bf..f7f8792 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.curator</groupId>
     <artifactId>apache-curator</artifactId>
-    <version>2.11.2-SNAPSHOT</version>
+    <version>2.12.0</version>
     <packaging>pom</packaging>
 
     <name>Apache Curator</name>
@@ -98,7 +98,7 @@
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git
         </developerConnection>
-        <tag>apache-curator-2.8.0</tag>
+        <tag>apache-curator-2.12.0</tag>
     </scm>
 
     <issueManagement>


[3/5] curator git commit: log authorisation error when writing node with PersistentData

Posted by ra...@apache.org.
log authorisation error when writing node with PersistentData


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/08102b0f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/08102b0f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/08102b0f

Branch: refs/heads/CURATOR-3.0
Commit: 08102b0f09f1b1ac79699d121bca8076853f4e44
Parents: caf6406
Author: szekizoli <sz...@gmail.com>
Authored: Mon Mar 6 13:56:37 2017 +0800
Committer: szekizoli <sz...@gmail.com>
Committed: Mon Mar 6 13:56:37 2017 +0800

----------------------------------------------------------------------
 .../framework/recipes/nodes/PersistentNode.java |  7 ++-
 .../nodes/TestPersistentEphemeralNode.java      | 52 +++++++++++++++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/08102b0f/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
index 1f655ed..18ecf81 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
@@ -117,6 +117,9 @@ public class PersistentNode implements Closeable
             {
                 //Update is ok, mark initialisation as complete if required.
                 initialisationComplete();
+            } else if ( event.getResultCode() == KeeperException.Code.NOAUTH.intValue() ) {
+                log.warn("Client does not have authorisation to write node at path {}", event.getPath());
+                authFailure.set(true);
             }
         }
     };
@@ -213,7 +216,7 @@ public class PersistentNode implements Closeable
         }
         else if ( event.getResultCode() == KeeperException.Code.NOAUTH.intValue() )
         {
-            log.warn("Client does not have authorisation to write node at path {}", event.getPath());
+            log.warn("Client does not have authorisation to create node at path {}", event.getPath());
             authFailure.set(true);
             return;
         }
@@ -323,7 +326,7 @@ public class PersistentNode implements Closeable
         this.data.set(Arrays.copyOf(data, data.length));
         if ( isActive() )
         {
-            client.setData().inBackground().forPath(getActualPath(), getData());
+            client.setData().inBackground(setDataCallback).forPath(getActualPath(), getData());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/curator/blob/08102b0f/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
index f451feb..ef8a45a 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
@@ -22,6 +22,7 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.framework.api.ACLProvider;
 import org.apache.curator.framework.api.BackgroundCallback;
 import org.apache.curator.framework.api.CuratorEvent;
 import org.apache.curator.framework.state.ConnectionState;
@@ -45,6 +46,7 @@ import org.testng.annotations.Test;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
@@ -692,7 +694,7 @@ public class TestPersistentEphemeralNode extends BaseClassForTests
     }
     
     @Test
-    public void testNoWritePermission() throws Exception
+    public void testNoCreatePermission() throws Exception
     {
         CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder();
         CuratorFramework client = builder
@@ -728,6 +730,54 @@ public class TestPersistentEphemeralNode extends BaseClassForTests
         }
     }
 
+    @Test
+    public void testNoWritePermission() throws Exception
+    {
+        final ACLProvider aclProvider = new ACLProvider() {
+            final ACL acl = new ACL(ZooDefs.Perms.READ | ZooDefs.Perms.CREATE | ZooDefs.Perms.DELETE, ZooDefs.Ids.ANYONE_ID_UNSAFE);
+            final List<ACL> aclList = Collections.singletonList(acl);
+            @Override
+            public List<ACL> getDefaultAcl() {
+                return aclList;
+            }
+
+            @Override
+            public List<ACL> getAclForPath(String path) {
+                return aclList;
+            }
+        };
+
+        CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder();
+        CuratorFramework client = builder
+                .connectString(server.getConnectString())
+                .aclProvider(aclProvider)
+                .retryPolicy(new RetryOneTime(1))
+                .build();
+
+        PersistentEphemeralNode node = null;
+        try {
+            client.start();
+
+            node = new PersistentEphemeralNode(client, PersistentEphemeralNode.Mode.EPHEMERAL, PATH,
+                    new byte[0]);
+            node.start();
+
+            assertTrue(node.waitForInitialCreate(timing.seconds(), TimeUnit.SECONDS), "Node not created");
+            assertNodeExists(client, PATH);
+            assertFalse(node.isAuthFailure(), "AuthFailure when creating node.");
+
+            byte[] NEW_DATA = "NEW_DATA".getBytes();
+            node.setData(NEW_DATA);
+            timing.sleepABit();
+            byte[] read_data = client.getData().forPath(PATH);
+            assertNotEquals(read_data, NEW_DATA, "Data matches - write went through.");
+            assertTrue(node.isAuthFailure(), "AuthFailure response not received.");
+        } finally {
+            CloseableUtils.closeQuietly(node);
+            CloseableUtils.closeQuietly(client);
+        }
+    }
+
     private void assertNodeExists(CuratorFramework curator, String path) throws Exception
     {
         assertNotNull(path);


[5/5] curator git commit: Merge branch 'master' into CURATOR-3.0

Posted by ra...@apache.org.
Merge branch 'master' into CURATOR-3.0


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7d44baee
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7d44baee
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7d44baee

Branch: refs/heads/CURATOR-3.0
Commit: 7d44baee3d87890b67fc4900f204bb5111368079
Parents: 87a145c 1571588
Author: randgalt <ra...@apache.org>
Authored: Thu Mar 9 14:28:15 2017 -0800
Committer: randgalt <ra...@apache.org>
Committed: Thu Mar 9 14:28:15 2017 -0800

----------------------------------------------------------------------
 .../framework/recipes/nodes/PersistentNode.java |  9 +++-
 .../nodes/TestPersistentEphemeralNode.java      | 52 +++++++++++++++++++-
 2 files changed, 58 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/7d44baee/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/7d44baee/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
----------------------------------------------------------------------
diff --cc curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
index 15c5f2e,ef8a45a..7d52b58
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
@@@ -23,9 -22,9 +23,10 @@@ import com.google.common.collect.Immuta
  import com.google.common.collect.Lists;
  import org.apache.curator.framework.CuratorFramework;
  import org.apache.curator.framework.CuratorFrameworkFactory;
+ import org.apache.curator.framework.api.ACLProvider;
  import org.apache.curator.framework.api.BackgroundCallback;
  import org.apache.curator.framework.api.CuratorEvent;
 +import org.apache.curator.framework.imps.TestCleanState;
  import org.apache.curator.framework.state.ConnectionState;
  import org.apache.curator.framework.state.ConnectionStateListener;
  import org.apache.curator.retry.RetryOneTime;
@@@ -49,8 -46,8 +50,9 @@@ import org.testng.annotations.Test
  import java.io.IOException;
  import java.util.Arrays;
  import java.util.Collection;
+ import java.util.Collections;
  import java.util.List;
 +import java.util.Set;
  import java.util.concurrent.CountDownLatch;
  import java.util.concurrent.Semaphore;
  import java.util.concurrent.TimeUnit;


[4/5] curator git commit: minor formatting change

Posted by ra...@apache.org.
minor formatting change


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/1571588f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/1571588f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/1571588f

Branch: refs/heads/CURATOR-3.0
Commit: 1571588f85d03326542af54e4ddd4212729e0c1f
Parents: 08102b0
Author: randgalt <ra...@apache.org>
Authored: Thu Mar 9 14:22:25 2017 -0800
Committer: randgalt <ra...@apache.org>
Committed: Thu Mar 9 14:22:25 2017 -0800

----------------------------------------------------------------------
 .../apache/curator/framework/recipes/nodes/PersistentNode.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/1571588f/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
index 18ecf81..5753a93 100644
--- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
+++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentNode.java
@@ -117,7 +117,9 @@ public class PersistentNode implements Closeable
             {
                 //Update is ok, mark initialisation as complete if required.
                 initialisationComplete();
-            } else if ( event.getResultCode() == KeeperException.Code.NOAUTH.intValue() ) {
+            } 
+            else if ( event.getResultCode() == KeeperException.Code.NOAUTH.intValue() ) 
+            {
                 log.warn("Client does not have authorisation to write node at path {}", event.getPath());
                 authFailure.set(true);
             }


[2/5] curator git commit: [maven-release-plugin] prepare for next development iteration

Posted by ra...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/caf6406e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/caf6406e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/caf6406e

Branch: refs/heads/CURATOR-3.0
Commit: caf6406e94e2c398a6c1f69a1fe7b360bc14b172
Parents: 2b68d13
Author: Cam McKenzie <ca...@apache.org>
Authored: Wed Mar 1 14:01:11 2017 +1100
Committer: Cam McKenzie <ca...@apache.org>
Committed: Wed Mar 1 14:01:11 2017 +1100

----------------------------------------------------------------------
 curator-client/pom.xml             | 4 ++--
 curator-examples/pom.xml           | 2 +-
 curator-framework/pom.xml          | 4 ++--
 curator-recipes/pom.xml            | 4 ++--
 curator-test/pom.xml               | 4 ++--
 curator-x-discovery-server/pom.xml | 4 ++--
 curator-x-discovery/pom.xml        | 4 ++--
 curator-x-rpc/pom.xml              | 4 ++--
 pom.xml                            | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 7ac500f..cfb721e 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-client</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Curator Client</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 9d329d4..92f43db 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-examples</artifactId>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 7db6774..9080308 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-framework</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Curator Framework</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 9b072d4..d381571 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-recipes</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Curator Recipes</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index bb0c7b9..74fd37d 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-test</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
 
     <name>Curator Testing</name>
     <description>Unit testing utilities.</description>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index c7bfbb0..34ce893 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-x-discovery-server</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Curator Service Discovery Server</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 59afd55..924813b 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.curator</groupId>
         <artifactId>apache-curator</artifactId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>curator-x-discovery</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Curator Service Discovery</name>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/curator-x-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/pom.xml b/curator-x-rpc/pom.xml
index c4fc9f9..76114a2 100644
--- a/curator-x-rpc/pom.xml
+++ b/curator-x-rpc/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>apache-curator</artifactId>
         <groupId>org.apache.curator</groupId>
-        <version>2.12.0</version>
+        <version>2.12.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>curator-x-rpc</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
 
     <name>Curator RPC Proxy</name>
     <description>A proxy that bridges non-java environments with the Curator framework and recipes</description>

http://git-wip-us.apache.org/repos/asf/curator/blob/caf6406e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f7f8792..e26f5e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.curator</groupId>
     <artifactId>apache-curator</artifactId>
-    <version>2.12.0</version>
+    <version>2.12.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Apache Curator</name>
@@ -98,7 +98,7 @@
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git
         </developerConnection>
-        <tag>apache-curator-2.12.0</tag>
+        <tag>apache-curator-2.8.0</tag>
     </scm>
 
     <issueManagement>