Repository: flink Updated Branches: refs/heads/master d66e95c61 -> 114da93f6
[FLINK-7994][mesos] Remove effectively unused curator dependency This closes #4954. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/114da93f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/114da93f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/114da93f Branch: refs/heads/master Commit: 114da93f67cd15baa74d31c9363c9117d1aff43b Parents: d66e95c Author: zentol <[email protected]> Authored: Mon Nov 6 13:01:16 2017 +0100 Committer: zentol <[email protected]> Committed: Mon Nov 6 15:20:06 2017 +0100 ---------------------------------------------------------------------- flink-mesos/pom.xml | 7 ---- .../apache/flink/mesos/util/ZooKeeperUtils.java | 44 -------------------- 2 files changed, 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/114da93f/flink-mesos/pom.xml ---------------------------------------------------------------------- diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml index 1f28a08..d4a0dcc 100644 --- a/flink-mesos/pom.xml +++ b/flink-mesos/pom.xml @@ -56,13 +56,6 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-curator</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.flink</groupId> <artifactId>flink-shaded-jackson</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/114da93f/flink-mesos/src/main/java/org/apache/flink/mesos/util/ZooKeeperUtils.java ---------------------------------------------------------------------- diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/util/ZooKeeperUtils.java b/flink-mesos/src/main/java/org/apache/flink/mesos/util/ZooKeeperUtils.java deleted file mode 100644 index 4211642..0000000 --- a/flink-mesos/src/main/java/org/apache/flink/mesos/util/ZooKeeperUtils.java +++ /dev/null @@ -1,44 +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.flink.mesos.util; - -import org.apache.flink.configuration.Configuration; - -import org.apache.curator.framework.CuratorFramework; - -/** - * Utilities for Zookeeper. - */ -public class ZooKeeperUtils { - - /** - * Starts a {@link CuratorFramework} instance and connects it to the given ZooKeeper - * quorum. - * - * @param configuration {@link Configuration} object containing the configuration values - * @return {@link CuratorFramework} instance - */ - @SuppressWarnings("unchecked") - public static CuratorFramework startCuratorFramework(Configuration configuration) { - - // using late-binding as a workaround for shaded curator dependency of flink-runtime - Object client = org.apache.flink.runtime.util.ZooKeeperUtils.startCuratorFramework(configuration); - return (CuratorFramework) client; - } -}
