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/07/23 19:11:19 UTC
[1/4] curator git commit: [maven-release-plugin] prepare release
apache-curator-4.0.0
Repository: curator
Updated Branches:
refs/heads/master 171a20066 -> 4194c07aa
[maven-release-plugin] prepare release apache-curator-4.0.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4d160aaa
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4d160aaa
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4d160aaa
Branch: refs/heads/master
Commit: 4d160aaa7d0ef5dedac0f0b1972160089e07be1d
Parents: 171a200
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 07:11:36 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 07:11:36 2017 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
curator-test-zk34/pom.xml | 2 +-
curator-test/pom.xml | 4 ++--
curator-x-async/pom.xml | 2 +-
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
pom.xml | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 4b210da..58c69aa 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index c092603..d583d1e 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 3ae9f54..27acf00 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index b217cf6..d9b4469 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-test-zk34/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index 6fb1808..58ca0da 100644
--- a/curator-test-zk34/pom.xml
+++ b/curator-test-zk34/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 8f3f1e1..d3280d5 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-x-async/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml
index ceae835..795c2f7 100644
--- a/curator-x-async/pom.xml
+++ b/curator-x-async/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index b77ef41..b9785a1 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index f6d89ff..9d11183 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>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/4d160aaa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1e8eb4f..107dc6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
@@ -97,7 +97,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-3.2.0</tag>
+ <tag>apache-curator-4.0.0</tag>
</scm>
<issueManagement>
[2/4] 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/2b5aa1c3
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2b5aa1c3
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2b5aa1c3
Branch: refs/heads/master
Commit: 2b5aa1c31016ea01f5ac8162c13c2b8e73b0b8bc
Parents: 4d160aa
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 07:11:47 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 07:11:47 2017 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
curator-test-zk34/pom.xml | 2 +-
curator-test/pom.xml | 4 ++--
curator-x-async/pom.xml | 2 +-
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
pom.xml | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 58c69aa..e824b58 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index d583d1e..5fb2b91 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 27acf00..6d90764 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index d9b4469..6b01716 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-test-zk34/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index 58ca0da..aea4133 100644
--- a/curator-test-zk34/pom.xml
+++ b/curator-test-zk34/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index d3280d5..9d42ea8 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-x-async/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml
index 795c2f7..5fc6569 100644
--- a/curator-x-async/pom.xml
+++ b/curator-x-async/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index b9785a1..d4d8b6e 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 9d11183..55909b6 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>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/2b5aa1c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 107dc6f..1f73b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
@@ -97,7 +97,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-4.0.0</tag>
+ <tag>apache-curator-3.2.0</tag>
</scm>
<issueManagement>
[4/4] curator git commit: Merge branch 'CURATOR-426'
Posted by ra...@apache.org.
Merge branch 'CURATOR-426'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4194c07a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4194c07a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4194c07a
Branch: refs/heads/master
Commit: 4194c07aa72c2c05f1c11cabc1af25e0c5c3fedd
Parents: 2b5aa1c c05b6ca
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 14:11:10 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 14:11:10 2017 -0500
----------------------------------------------------------------------
.../org/apache/curator/test/KillSession.java | 67 ++++++++++++++++++++
1 file changed, 67 insertions(+)
----------------------------------------------------------------------
[3/4] curator git commit: ressurected old KillSession.java for
backward compatibilty
Posted by ra...@apache.org.
ressurected old KillSession.java for backward compatibilty
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c05b6ca6
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c05b6ca6
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c05b6ca6
Branch: refs/heads/master
Commit: c05b6ca646f756d2670243e09f3605c786dbdc75
Parents: 171a200
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 14:10:57 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 14:10:57 2017 -0500
----------------------------------------------------------------------
.../org/apache/curator/test/KillSession.java | 67 ++++++++++++++++++++
1 file changed, 67 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/c05b6ca6/curator-test/src/main/java/org/apache/curator/test/KillSession.java
----------------------------------------------------------------------
diff --git a/curator-test/src/main/java/org/apache/curator/test/KillSession.java b/curator-test/src/main/java/org/apache/curator/test/KillSession.java
new file mode 100644
index 0000000..ce2b7e6
--- /dev/null
+++ b/curator-test/src/main/java/org/apache/curator/test/KillSession.java
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.curator.test;
+
+import org.apache.zookeeper.ZooKeeper;
+
+/**
+ * <p>
+ * Utility to simulate a ZK session dying.
+ * </p>
+ */
+public class KillSession
+{
+ /**
+ * Kill the given ZK session
+ *
+ * @param client the client to kill
+ * @since 3.0.0
+ */
+ public static void kill(ZooKeeper client)
+ {
+ client.getTestable().injectSessionExpiration();
+ }
+
+ /**
+ * Kill the given ZK session
+ *
+ * @param client the client to kill
+ * @param connectString server connection string
+ * @throws Exception errors
+ * @deprecated use {@link #kill(ZooKeeper)} instead
+ */
+ public static void kill(ZooKeeper client, String connectString) throws Exception
+ {
+ kill(client);
+ }
+
+ /**
+ * Kill the given ZK session
+ *
+ * @param client the client to kill
+ * @param connectString server connection string
+ * @param maxMs max time ms to wait for kill
+ * @throws Exception errors
+ * @deprecated use {@link #kill(ZooKeeper)} instead
+ */
+ public static void kill(ZooKeeper client, String connectString, int maxMs) throws Exception
+ {
+ kill(client);
+ }
+}