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/24 04:56:32 UTC
[1/5] curator git commit: back to 4.0.0-SNAPSHOT
Repository: curator
Updated Branches:
refs/heads/CURATOR-427 [created] 15eb063fa
back to 4.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/abe2babd
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/abe2babd
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/abe2babd
Branch: refs/heads/CURATOR-427
Commit: abe2babd8300380299b6afb83986ed3741f1aa46
Parents: 4194c07
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 14:13:05 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 14:13:05 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 | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index e824b58..68a819a 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 5fb2b91..a21433a 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 6d90764..cd6ad75 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 6b01716..5d0edf8 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-test-zk34/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index aea4133..f7efa58 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 9d42ea8..d1e0808 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-x-async/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml
index 5fc6569..8609a71 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index d4d8b6e..79b1eb5 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 55909b6..9cc0bd0 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.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/abe2babd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f73b54..5b23840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSNOT</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
[4/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/8d52ecbc
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8d52ecbc
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8d52ecbc
Branch: refs/heads/CURATOR-427
Commit: 8d52ecbc5ae712a891c3567a0f12818aad3edddb
Parents: 0cc62d6
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 14:15:57 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 14:15:57 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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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/8d52ecbc/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>
[5/5] curator git commit: Removed Classic connection handling as it's
old, hard to maintain,
forces us to run tests twice and isn't even what users expect.
Posted by ra...@apache.org.
Removed Classic connection handling as it's old, hard to maintain, forces us to run tests twice and isn't even what users expect.
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/15eb063f
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/15eb063f
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/15eb063f
Branch: refs/heads/CURATOR-427
Commit: 15eb063fa22569e797f850fb8d60a0949f52fbf5
Parents: 8d52ecb
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 23:56:20 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 23:56:20 2017 -0500
----------------------------------------------------------------------
.../apache/curator/CuratorZookeeperClient.java | 8 +-
.../ClassicConnectionHandlingPolicy.java | 88 --------------------
.../StandardConnectionHandlingPolicy.java | 3 -
.../java/org/apache/curator/TestEnsurePath.java | 6 +-
.../framework/CuratorFrameworkFactory.java | 7 +-
.../imps/ClassicInternalConnectionHandler.java | 70 ----------------
.../framework/imps/CuratorFrameworkImpl.java | 3 +-
.../imps/TestEnabledSessionExpiredState.java | 6 --
.../curator/framework/imps/TestFramework.java | 10 +--
.../curator/framework/schema/TestSchema.java | 6 --
...estResetConnectionWithBackgroundFailure.java | 5 --
.../recipes/cache/BaseTestTreeCache.java | 2 +-
.../framework/recipes/cache/TestTreeCache.java | 2 +
.../apache/curator/test/BaseClassForTests.java | 27 +-----
14 files changed, 16 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
index 7549c29..b7bb33a 100644
--- a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
+++ b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
@@ -20,8 +20,8 @@
package org.apache.curator;
import com.google.common.base.Preconditions;
-import org.apache.curator.connection.ClassicConnectionHandlingPolicy;
import org.apache.curator.connection.ConnectionHandlingPolicy;
+import org.apache.curator.connection.StandardConnectionHandlingPolicy;
import org.apache.curator.drivers.OperationTrace;
import org.apache.curator.drivers.TracerDriver;
import org.apache.curator.ensemble.EnsembleProvider;
@@ -66,7 +66,7 @@ public class CuratorZookeeperClient implements Closeable
*/
public CuratorZookeeperClient(String connectString, int sessionTimeoutMs, int connectionTimeoutMs, Watcher watcher, RetryPolicy retryPolicy)
{
- this(new DefaultZookeeperFactory(), new FixedEnsembleProvider(connectString), sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new ClassicConnectionHandlingPolicy());
+ this(new DefaultZookeeperFactory(), new FixedEnsembleProvider(connectString), sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new StandardConnectionHandlingPolicy());
}
/**
@@ -78,7 +78,7 @@ public class CuratorZookeeperClient implements Closeable
*/
public CuratorZookeeperClient(EnsembleProvider ensembleProvider, int sessionTimeoutMs, int connectionTimeoutMs, Watcher watcher, RetryPolicy retryPolicy)
{
- this(new DefaultZookeeperFactory(), ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new ClassicConnectionHandlingPolicy());
+ this(new DefaultZookeeperFactory(), ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, false, new StandardConnectionHandlingPolicy());
}
/**
@@ -95,7 +95,7 @@ public class CuratorZookeeperClient implements Closeable
*/
public CuratorZookeeperClient(ZookeeperFactory zookeeperFactory, EnsembleProvider ensembleProvider, int sessionTimeoutMs, int connectionTimeoutMs, Watcher watcher, RetryPolicy retryPolicy, boolean canBeReadOnly)
{
- this(zookeeperFactory, ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, canBeReadOnly, new ClassicConnectionHandlingPolicy());
+ this(zookeeperFactory, ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, retryPolicy, canBeReadOnly, new StandardConnectionHandlingPolicy());
}
/**
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java b/curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java
deleted file mode 100644
index fe24b42..0000000
--- a/curator-client/src/main/java/org/apache/curator/connection/ClassicConnectionHandlingPolicy.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * 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.connection;
-
-import org.apache.curator.CuratorZookeeperClient;
-import org.apache.curator.RetryLoop;
-import org.apache.curator.utils.ThreadUtils;
-import java.util.concurrent.Callable;
-
-/**
- * Emulates the pre 3.0.0 Curator connection handling
- */
-public class ClassicConnectionHandlingPolicy implements ConnectionHandlingPolicy
-{
- @Override
- public int getSimulatedSessionExpirationPercent()
- {
- return 0;
- }
-
- @Override
- public <T> T callWithRetry(CuratorZookeeperClient client, Callable<T> proc) throws Exception
- {
- T result = null;
- RetryLoop retryLoop = client.newRetryLoop();
- while ( retryLoop.shouldContinue() )
- {
- try
- {
- client.internalBlockUntilConnectedOrTimedOut();
- result = proc.call();
- retryLoop.markComplete();
- }
- catch ( Exception e )
- {
- ThreadUtils.checkInterrupted(e);
- retryLoop.takeException(e);
- }
- }
-
- return result;
- }
-
- @Override
- public CheckTimeoutsResult checkTimeouts(Callable<String> hasNewConnectionString, long connectionStartMs, int sessionTimeoutMs, int connectionTimeoutMs) throws Exception
- {
- CheckTimeoutsResult result = CheckTimeoutsResult.NOP;
- int minTimeout = Math.min(sessionTimeoutMs, connectionTimeoutMs);
- long elapsed = System.currentTimeMillis() - connectionStartMs;
- if ( elapsed >= minTimeout )
- {
- if ( hasNewConnectionString.call() != null )
- {
- result = CheckTimeoutsResult.NEW_CONNECTION_STRING;
- }
- else
- {
- int maxTimeout = Math.max(sessionTimeoutMs, connectionTimeoutMs);
- if ( elapsed > maxTimeout )
- {
- result = CheckTimeoutsResult.RESET_CONNECTION;
- }
- else
- {
- result = CheckTimeoutsResult.CONNECTION_TIMEOUT;
- }
- }
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java b/curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java
index 8f7a438..41b342c 100644
--- a/curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java
+++ b/curator-client/src/main/java/org/apache/curator/connection/StandardConnectionHandlingPolicy.java
@@ -22,8 +22,6 @@ import com.google.common.base.Preconditions;
import org.apache.curator.CuratorZookeeperClient;
import org.apache.curator.RetryLoop;
import org.apache.curator.utils.ThreadUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.concurrent.Callable;
/**
@@ -33,7 +31,6 @@ import java.util.concurrent.Callable;
*/
public class StandardConnectionHandlingPolicy implements ConnectionHandlingPolicy
{
- private final Logger log = LoggerFactory.getLogger(getClass());
private final int expirationPercent;
public StandardConnectionHandlingPolicy()
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-client/src/test/java/org/apache/curator/TestEnsurePath.java
----------------------------------------------------------------------
diff --git a/curator-client/src/test/java/org/apache/curator/TestEnsurePath.java b/curator-client/src/test/java/org/apache/curator/TestEnsurePath.java
index 59c30ac..ba37d60 100644
--- a/curator-client/src/test/java/org/apache/curator/TestEnsurePath.java
+++ b/curator-client/src/test/java/org/apache/curator/TestEnsurePath.java
@@ -32,7 +32,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import org.apache.curator.connection.ClassicConnectionHandlingPolicy;
+import org.apache.curator.connection.StandardConnectionHandlingPolicy;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.utils.EnsurePath;
import org.apache.zookeeper.ZooKeeper;
@@ -52,7 +52,7 @@ public class TestEnsurePath
CuratorZookeeperClient curator = mock(CuratorZookeeperClient.class);
RetryPolicy retryPolicy = new RetryOneTime(1);
RetryLoop retryLoop = new RetryLoop(retryPolicy, null);
- when(curator.getConnectionHandlingPolicy()).thenReturn(new ClassicConnectionHandlingPolicy());
+ when(curator.getConnectionHandlingPolicy()).thenReturn(new StandardConnectionHandlingPolicy());
when(curator.getZooKeeper()).thenReturn(client);
when(curator.getRetryPolicy()).thenReturn(retryPolicy);
when(curator.newRetryLoop()).thenReturn(retryLoop);
@@ -78,7 +78,7 @@ public class TestEnsurePath
RetryPolicy retryPolicy = new RetryOneTime(1);
RetryLoop retryLoop = new RetryLoop(retryPolicy, null);
final CuratorZookeeperClient curator = mock(CuratorZookeeperClient.class);
- when(curator.getConnectionHandlingPolicy()).thenReturn(new ClassicConnectionHandlingPolicy());
+ when(curator.getConnectionHandlingPolicy()).thenReturn(new StandardConnectionHandlingPolicy());
when(curator.getZooKeeper()).thenReturn(client);
when(curator.getRetryPolicy()).thenReturn(retryPolicy);
when(curator.newRetryLoop()).thenReturn(retryLoop);
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
index 18011aa..a617198 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
@@ -21,7 +21,6 @@ package org.apache.curator.framework;
import com.google.common.collect.ImmutableList;
import org.apache.curator.RetryPolicy;
-import org.apache.curator.connection.ClassicConnectionHandlingPolicy;
import org.apache.curator.connection.ConnectionHandlingPolicy;
import org.apache.curator.connection.StandardConnectionHandlingPolicy;
import org.apache.curator.ensemble.EnsembleProvider;
@@ -145,7 +144,7 @@ public class CuratorFrameworkFactory
private boolean canBeReadOnly = false;
private boolean useContainerParentsIfAvailable = true;
private ConnectionStateErrorPolicy connectionStateErrorPolicy = new StandardConnectionStateErrorPolicy();
- private ConnectionHandlingPolicy connectionHandlingPolicy = Boolean.getBoolean("curator-use-classic-connection-handling") ? new ClassicConnectionHandlingPolicy() : new StandardConnectionHandlingPolicy();
+ private ConnectionHandlingPolicy connectionHandlingPolicy = new StandardConnectionHandlingPolicy();
private SchemaSet schemaSet = SchemaSet.getDefaultSchemaSet();
private boolean zk34CompatibilityMode = isZK34();
@@ -408,9 +407,7 @@ public class CuratorFrameworkFactory
* </p>
* <p>
* <strong>IMPORTANT: </strong> StandardConnectionHandlingPolicy has different behavior than the connection
- * policy handling prior to version 3.0.0. You can specify that the connection handling be the method
- * prior to 3.0.0 by passing in an instance of {@link ClassicConnectionHandlingPolicy} here or by
- * setting the command line value "curator-use-classic-connection-handling" to true (e.g. <tt>-Dcurator-use-classic-connection-handling=true</tt>).
+ * policy handling prior to version 3.0.0.
* </p>
* <p>
* Major differences from the older behavior are:
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-framework/src/main/java/org/apache/curator/framework/imps/ClassicInternalConnectionHandler.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/ClassicInternalConnectionHandler.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/ClassicInternalConnectionHandler.java
deleted file mode 100644
index 90a8a24..0000000
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/ClassicInternalConnectionHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 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.framework.imps;
-
-import org.apache.curator.framework.state.ConnectionState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class ClassicInternalConnectionHandler implements InternalConnectionHandler
-{
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Override
- public void checkNewConnection(CuratorFrameworkImpl client)
- {
- // NOP
- }
-
- @Override
- public void suspendConnection(CuratorFrameworkImpl client)
- {
- if ( client.setToSuspended() )
- {
- doSyncForSuspendedConnection(client, client.getZookeeperClient().getInstanceIndex());
- }
- }
-
- private void doSyncForSuspendedConnection(final CuratorFrameworkImpl client, final long instanceIndex)
- {
- // we appear to have disconnected, force a new ZK event and see if we can connect to another server
- final BackgroundOperation<String> operation = new BackgroundSyncImpl(client, null);
- OperationAndData.ErrorCallback<String> errorCallback = new OperationAndData.ErrorCallback<String>()
- {
- @Override
- public void retriesExhausted(OperationAndData<String> operationAndData)
- {
- // if instanceIndex != newInstanceIndex, the ZooKeeper instance was reset/reallocated
- // so the pending background sync is no longer valid.
- // if instanceIndex is -1, this is the second try to sync - punt and mark the connection lost
- if ( (instanceIndex < 0) || (instanceIndex == client.getZookeeperClient().getInstanceIndex()) )
- {
- client.addStateChange(ConnectionState.LOST);
- }
- else
- {
- log.debug("suspendConnection() failure ignored as the ZooKeeper instance was reset. Retrying.");
- // send -1 to signal that if it happens again, punt and mark the connection lost
- doSyncForSuspendedConnection(client, -1);
- }
- }
- };
- client.performBackgroundOperation(new OperationAndData<String>(operation, "/", null, errorCallback, null, null));
- }
-}
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
index d58c56b..7488793 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
@@ -132,8 +132,7 @@ public class CuratorFrameworkImpl implements CuratorFramework
builder.getConnectionHandlingPolicy()
);
- boolean isClassic = (builder.getConnectionHandlingPolicy().getSimulatedSessionExpirationPercent() == 0);
- internalConnectionHandler = isClassic ? new ClassicInternalConnectionHandler() : new StandardInternalConnectionHandler();
+ internalConnectionHandler = new StandardInternalConnectionHandler();
listeners = new ListenerContainer<CuratorListener>();
unhandledErrorListeners = new ListenerContainer<UnhandledErrorListener>();
backgroundOperations = new DelayQueue<OperationAndData<?>>();
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-framework/src/test/java/org/apache/curator/framework/imps/TestEnabledSessionExpiredState.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestEnabledSessionExpiredState.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestEnabledSessionExpiredState.java
index f1bbc3b..e61ee9f 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestEnabledSessionExpiredState.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestEnabledSessionExpiredState.java
@@ -174,10 +174,4 @@ public class TestEnabledSessionExpiredState extends BaseClassForTests
Assert.assertNull(states.poll(timing.multiple(.5).milliseconds(), TimeUnit.MILLISECONDS)); // there should be no other events
}
-
- @Override
- protected boolean enabledSessionExpiredStateAware()
- {
- return true;
- }
}
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
index a1d6f51..0539dbf 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java
@@ -75,15 +75,11 @@ public class TestFramework extends BaseClassForTests
@Test
public void testSessionLossWithLongTimeout() throws Exception
{
-
final Timing timing = new Timing();
- //Change this to TRUE and the test will pass.
- System.setProperty("curator-use-classic-connection-handling", Boolean.FALSE.toString());
-
+
try(final CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), timing.forWaiting().milliseconds(),
timing.connection(), new RetryOneTime(1)))
{
-
final CountDownLatch connectedLatch = new CountDownLatch(1);
final CountDownLatch lostLatch = new CountDownLatch(1);
final CountDownLatch restartedLatch = new CountDownLatch(1);
@@ -119,10 +115,6 @@ public class TestFramework extends BaseClassForTests
server.restart();
Assert.assertTrue(timing.awaitLatch(restartedLatch));
}
- finally
- {
- System.clearProperty("curator-use-classic-connection-handling");
- }
}
@Test
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-framework/src/test/java/org/apache/curator/framework/schema/TestSchema.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/schema/TestSchema.java b/curator-framework/src/test/java/org/apache/curator/framework/schema/TestSchema.java
index 6fb946e..cd8e977 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/schema/TestSchema.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/schema/TestSchema.java
@@ -299,12 +299,6 @@ public class TestSchema extends BaseClassForTests
}
}
- @Override
- protected boolean enabledSessionExpiredStateAware()
- {
- return true;
- }
-
private CuratorFramework newClient(SchemaSet schemaSet)
{
return CuratorFrameworkFactory.builder()
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
index bfc9cf4..852d9aa 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java
@@ -86,11 +86,6 @@ public class TestResetConnectionWithBackgroundFailure extends BaseClassForTests
client.getConnectionStateListenable().addListener(listener1);
log.debug("Starting ZK server");
server.restart();
- if ( Boolean.getBoolean("curator-use-classic-connection-handling") )
- {
- Assert.assertEquals(listenerSequence.poll(forWaiting.milliseconds(), TimeUnit.MILLISECONDS), ConnectionState.SUSPENDED);
- Assert.assertEquals(listenerSequence.poll(forWaiting.milliseconds(), TimeUnit.MILLISECONDS), ConnectionState.LOST);
- }
Assert.assertEquals(listenerSequence.poll(forWaiting.milliseconds(), TimeUnit.MILLISECONDS), ConnectionState.CONNECTED);
log.debug("Stopping ZK server");
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/BaseTestTreeCache.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/BaseTestTreeCache.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/BaseTestTreeCache.java
index 70ddcd5..b984624 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/BaseTestTreeCache.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/BaseTestTreeCache.java
@@ -40,7 +40,7 @@ public class BaseTestTreeCache extends BaseClassForTests
{
CuratorFramework client;
TreeCache cache;
- private final AtomicBoolean hadBackgroundException = new AtomicBoolean(false);
+ protected final AtomicBoolean hadBackgroundException = new AtomicBoolean(false);
private final BlockingQueue<TreeCacheEvent> events = new LinkedBlockingQueue<TreeCacheEvent>();
private final Timing timing = new Timing();
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index a53627a..ebaf43e 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -23,12 +23,14 @@ import com.google.common.collect.ImmutableSet;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.UnhandledErrorListener;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent.Type;
+import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.test.compatibility.KillSession2;
import org.apache.curator.utils.CloseableUtils;
import org.apache.zookeeper.CreateMode;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
public class TestTreeCache extends BaseTestTreeCache
http://git-wip-us.apache.org/repos/asf/curator/blob/15eb063f/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
----------------------------------------------------------------------
diff --git a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
index 1c87be4..52446df 100644
--- a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
+++ b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
@@ -25,7 +25,6 @@ import org.testng.IInvokedMethod;
import org.testng.IInvokedMethodListener2;
import org.testng.IRetryAnalyzer;
import org.testng.ITestContext;
-import org.testng.ITestNGMethod;
import org.testng.ITestResult;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -86,7 +85,7 @@ public class BaseClassForTests
@BeforeSuite(alwaysRun = true)
public void beforeSuite(ITestContext context)
{
- context.getSuite().addListener(new MethodListener(log, enabledSessionExpiredStateAware()));
+ context.getSuite().addListener(new MethodListener(log));
}
@BeforeMethod
@@ -135,11 +134,6 @@ public class BaseClassForTests
}
}
- protected boolean enabledSessionExpiredStateAware()
- {
- return false;
- }
-
private static class RetryContext
{
final AtomicBoolean isRetrying = new AtomicBoolean(false);
@@ -182,14 +176,12 @@ public class BaseClassForTests
private static class MethodListener implements IInvokedMethodListener2
{
private final Logger log;
- private final boolean sessionExpiredStateAware;
private static final String ATTRIBUTE_NAME = "__curator";
- MethodListener(Logger log, boolean sessionExpiredStateAware)
+ MethodListener(Logger log)
{
this.log = log;
- this.sessionExpiredStateAware = sessionExpiredStateAware;
}
@Override
@@ -215,12 +207,6 @@ public class BaseClassForTests
retryContext = new RetryContext();
context.setAttribute(ATTRIBUTE_NAME, retryContext);
}
-
- if ( !sessionExpiredStateAware )
- {
- System.setProperty("curator-use-classic-connection-handling", Boolean.toString(retryContext.runVersion.get() > 0));
- log.info("curator-use-classic-connection-handling: " + Boolean.toString(retryContext.runVersion.get() > 0));
- }
}
else if ( method.isTestMethod() )
{
@@ -235,14 +221,6 @@ public class BaseClassForTests
@Override
public void afterInvocation(IInvokedMethod method, ITestResult testResult, ITestContext context)
{
- if ( method.getTestMethod().isBeforeSuiteConfiguration() && !sessionExpiredStateAware )
- {
- for ( ITestNGMethod testMethod : context.getAllTestMethods() )
- {
- testMethod.setInvocationCount(2);
- }
- }
-
if ( method.isTestMethod() )
{
RetryContext retryContext = (RetryContext)context.getAttribute(ATTRIBUTE_NAME);
@@ -252,7 +230,6 @@ public class BaseClassForTests
}
else
{
- System.clearProperty("curator-use-classic-connection-handling");
if ( testResult.isSuccess() || (testResult.getStatus() == ITestResult.FAILURE) )
{
retryContext.isRetrying.set(false);
[2/5] curator git commit: doh back to 4.0.0-SNAPSHOT
Posted by ra...@apache.org.
doh back to 4.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ac0b4892
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ac0b4892
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ac0b4892
Branch: refs/heads/CURATOR-427
Commit: ac0b489287256dd2413789957ed7c9a8478061ab
Parents: abe2bab
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 14:14:01 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 14:14:01 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 | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 68a819a..4b210da 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index a21433a..c092603 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index cd6ad75..3ae9f54 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 5d0edf8..b217cf6 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-test-zk34/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index f7efa58..6fb1808 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index d1e0808..8f3f1e1 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-x-async/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml
index 8609a71..ceae835 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index 79b1eb5..b77ef41 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index 9cc0bd0..f6d89ff 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-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/ac0b4892/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b23840..1e8eb4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>4.0.0-SNAPSNOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
[3/5] curator git commit: [maven-release-plugin] prepare release
apache-curator-4.0.0
Posted by ra...@apache.org.
[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/0cc62d64
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0cc62d64
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0cc62d64
Branch: refs/heads/CURATOR-427
Commit: 0cc62d64442e088bcaf9a8c43c14b28be12c87af
Parents: ac0b489
Author: randgalt <ra...@apache.org>
Authored: Sun Jul 23 14:15:46 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jul 23 14:15:46 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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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/0cc62d64/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>