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 2016/08/09 11:02:41 UTC
flink git commit: [FLINK-4334] [quickstarts] Correctly exclude
hadoop1 in quickstart POMs
Repository: flink
Updated Branches:
refs/heads/release-1.1 19de8ec01 -> fc5b58d29
[FLINK-4334] [quickstarts] Correctly exclude hadoop1 in quickstart POMs
This closes #2341
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/fc5b58d2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/fc5b58d2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/fc5b58d2
Branch: refs/heads/release-1.1
Commit: fc5b58d29486d9a7e0053a508274a46de97c73aa
Parents: 19de8ec
Author: Shannon Carey <re...@gmail.com>
Authored: Mon Aug 8 15:04:23 2016 -0500
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Aug 9 12:51:30 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/fc5b58d2/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 81d0ae8..11b177b 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
@@ -166,7 +166,7 @@ under the License.
Everything else will be packaged into the fat-jar
-->
<exclude>org.apache.flink:flink-annotations</exclude>
- <exclude>org.apache.flink:flink-shaded-hadoop1</exclude>
+ <exclude>org.apache.flink:flink-shaded-hadoop1_2.10</exclude>
<exclude>org.apache.flink:flink-shaded-hadoop2</exclude>
<exclude>org.apache.flink:flink-shaded-curator-recipes</exclude>
<exclude>org.apache.flink:flink-core</exclude>
http://git-wip-us.apache.org/repos/asf/flink/blob/fc5b58d2/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 1c4c67b..2dd5f43 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
@@ -170,7 +170,7 @@ under the License.
Everything else will be packaged into the fat-jar
-->
<exclude>org.apache.flink:flink-annotations</exclude>
- <exclude>org.apache.flink:flink-shaded-hadoop1</exclude>
+ <exclude>org.apache.flink:flink-shaded-hadoop1_2.10</exclude>
<exclude>org.apache.flink:flink-shaded-hadoop2</exclude>
<exclude>org.apache.flink:flink-shaded-curator-recipes</exclude>
<exclude>org.apache.flink:flink-core</exclude>