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/11/02 19:18:15 UTC
[2/2] flink git commit: [hotfix] [build] Fix broken project
references to 'flink-shaded-curator-recipes'.
[hotfix] [build] Fix broken project references to 'flink-shaded-curator-recipes'.
The project 'flink-shaded-curator-recipes' was renamed to 'flink-shaded-curator',
but some references were not properly updated. This fixes the remaining references.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/198b74a8
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/198b74a8
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/198b74a8
Branch: refs/heads/master
Commit: 198b74a85472ceac20e25a0e8f5d1dff4afb495b
Parents: 6afd68b
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Nov 2 19:18:06 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Nov 2 19:18:06 2017 +0100
----------------------------------------------------------------------
flink-connectors/flink-connector-kafka-0.8/pom.xml | 4 ++--
flink-mesos/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
flink-runtime/pom.xml | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/198b74a8/flink-connectors/flink-connector-kafka-0.8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index b6b0336..dd7a542 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -53,7 +53,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-curator-recipes</artifactId>
+ <artifactId>flink-shaded-curator</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -199,7 +199,7 @@ under the License.
<configuration>
<artifactSet>
<includes combine.children="append">
- <include>org.apache.flink:flink-shaded-curator-recipes</include>
+ <include>org.apache.flink:flink-shaded-curator</include>
</includes>
</artifactSet>
<relocations combine.children="append">
http://git-wip-us.apache.org/repos/asf/flink/blob/198b74a8/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index 1f522fc..1f28a08 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -56,7 +56,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-curator-recipes</artifactId>
+ <artifactId>flink-shaded-curator</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/198b74a8/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index 0ca99d8..740e64a 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -198,7 +198,7 @@ under the License.
-->
<exclude>org.apache.flink:flink-annotations</exclude>
<exclude>org.apache.flink:flink-shaded-hadoop2</exclude>
- <exclude>org.apache.flink:flink-shaded-curator-recipes</exclude>
+ <exclude>org.apache.flink:flink-shaded-curator</exclude>
<exclude>org.apache.flink:flink-core</exclude>
<exclude>org.apache.flink:flink-java</exclude>
<exclude>org.apache.flink:flink-scala_${scala.binary.version}</exclude>
http://git-wip-us.apache.org/repos/asf/flink/blob/198b74a8/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index fcc0b6f..e5f6821 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -200,7 +200,7 @@ under the License.
-->
<exclude>org.apache.flink:flink-annotations</exclude>
<exclude>org.apache.flink:flink-shaded-hadoop2</exclude>
- <exclude>org.apache.flink:flink-shaded-curator-recipes</exclude>
+ <exclude>org.apache.flink:flink-shaded-curator</exclude>
<exclude>org.apache.flink:flink-core</exclude>
<exclude>org.apache.flink:flink-java</exclude>
<exclude>org.apache.flink:flink-scala_${scala.binary.version}</exclude>
http://git-wip-us.apache.org/repos/asf/flink/blob/198b74a8/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 481de6d..8e82d74 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -179,7 +179,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-curator-recipes</artifactId>
+ <artifactId>flink-shaded-curator</artifactId>
<version>${project.version}</version>
</dependency>
@@ -433,7 +433,7 @@ under the License.
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes combine.children="append">
- <include>org.apache.flink:flink-shaded-curator-recipes</include>
+ <include>org.apache.flink:flink-shaded-curator</include>
<!-- add akka, akka's netty, akka uncommon math -->
<!-- we can do this only because our own netty dependency is
already externally shaded (flink-shaded-netty) -->