You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/05/03 18:07:55 UTC
[5/5] flink git commit: [FLINK-6312] [build] Update curator version
to 2.12.0
[FLINK-6312] [build] Update curator version to 2.12.0
The updated curator version includes a bugfix for a potential block
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/aadfe45a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/aadfe45a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/aadfe45a
Branch: refs/heads/master
Commit: aadfe45a880d0f71f23c7a742ff5264e8dc14bf8
Parents: 821ec80
Author: WangTaoTheTonic <wa...@huawei.com>
Authored: Mon Apr 17 14:55:27 2017 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed May 3 19:17:23 2017 +0200
----------------------------------------------------------------------
flink-contrib/flink-storm-examples/pom.xml | 4 ++++
.../checkpoint/ZooKeeperCompletedCheckpointStoreTest.java | 8 ++++----
pom.xml | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/aadfe45a/flink-contrib/flink-storm-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml
index b9da214..d042dde 100644
--- a/flink-contrib/flink-storm-examples/pom.xml
+++ b/flink-contrib/flink-storm-examples/pom.xml
@@ -84,6 +84,10 @@ under the License.
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ </exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/aadfe45a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
index 8fc0f02..0d22dc6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreTest.java
@@ -22,7 +22,7 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.BackgroundCallback;
import org.apache.curator.framework.api.CuratorEvent;
import org.apache.curator.framework.api.CuratorEventType;
-import org.apache.curator.framework.api.Pathable;
+import org.apache.curator.framework.api.ErrorListenerPathable;
import org.apache.curator.utils.EnsurePath;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.runtime.concurrent.Executors;
@@ -128,12 +128,12 @@ public class ZooKeeperCompletedCheckpointStoreTest extends TestLogger {
.delete()
.deletingChildrenIfNeeded()
.inBackground(any(BackgroundCallback.class), any(Executor.class))
- ).thenAnswer(new Answer<Pathable<Void>>() {
+ ).thenAnswer(new Answer<ErrorListenerPathable<Void>>() {
@Override
- public Pathable<Void> answer(InvocationOnMock invocation) throws Throwable {
+ public ErrorListenerPathable<Void> answer(InvocationOnMock invocation) throws Throwable {
final BackgroundCallback callback = (BackgroundCallback) invocation.getArguments()[0];
- Pathable<Void> result = mock(Pathable.class);
+ ErrorListenerPathable<Void> result = mock(ErrorListenerPathable.class);
when(result.forPath(anyString())).thenAnswer(new Answer<Void>() {
@Override
http://git-wip-us.apache.org/repos/asf/flink/blob/aadfe45a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f822198..71ad779 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@ under the License.
<chill.version>0.7.4</chill.version>
<asm.version>5.0.4</asm.version>
<zookeeper.version>3.4.6</zookeeper.version>
- <curator.version>2.8.0</curator.version>
+ <curator.version>2.12.0</curator.version>
<jackson.version>2.7.4</jackson.version>
<metrics.version>3.1.0</metrics.version>
<junit.version>4.12</junit.version>