Repository: flink Updated Branches: refs/heads/master 79058edb6 -> 360f02b1f
[FLINK-3247] Remove * exclude from quickstarts This closes #1573 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/360f02b1 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/360f02b1 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/360f02b1 Branch: refs/heads/master Commit: 360f02b1f1f5ae4e9c3b3c43a9af033b66ecdcef Parents: cb1a5ec Author: Robert Metzger <rmetz...@apache.org> Authored: Tue Feb 2 12:04:26 2016 +0100 Committer: Robert Metzger <rmetz...@apache.org> Committed: Tue Feb 2 15:38:46 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/archetype-resources/pom.xml | 7 +++++-- .../src/main/resources/archetype-resources/pom.xml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/360f02b1/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 eb8bee1..bd1e723 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 @@ -112,7 +112,9 @@ 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-*</exclude> + <exclude>org.apache.flink:flink-shaded-hadoop1</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> <exclude>org.apache.flink:flink-java</exclude> <exclude>org.apache.flink:flink-scala_2.10</exclude> @@ -184,7 +186,8 @@ under the License. <filter> <artifact>org.apache.flink:*</artifact> <excludes> - <exclude>org/apache/flink/shaded/**</exclude> + <!-- exclude shaded google but include shaded curator --> + <exclude>org/apache/flink/shaded/com/**</exclude> <exclude>web-docs/**</exclude> </excludes> </filter> http://git-wip-us.apache.org/repos/asf/flink/blob/360f02b1/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 e575181..df98b95 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 @@ -116,7 +116,9 @@ 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-*</exclude> + <exclude>org.apache.flink:flink-shaded-hadoop1</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> <exclude>org.apache.flink:flink-java</exclude> <exclude>org.apache.flink:flink-scala_2.10</exclude> @@ -187,7 +189,8 @@ under the License. <filter> <artifact>org.apache.flink:*</artifact> <excludes> - <exclude>org/apache/flink/shaded/**</exclude> + <!-- exclude shaded google but include shaded curator --> + <exclude>org/apache/flink/shaded/com/**</exclude> <exclude>web-docs/**</exclude> </excludes> </filter>
