Repository: flink Updated Branches: refs/heads/master fff04bfbe -> bb972b85a
[FLINK-6247] [table] Put flink-table.jar with all dependencies into ./opt folder. This closes #3666. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/69905e19 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/69905e19 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/69905e19 Branch: refs/heads/master Commit: 69905e19c636a05992443a647ba4142af5a40a01 Parents: fff04bf Author: sunjincheng121 <sunjincheng...@gmail.com> Authored: Fri Mar 31 16:31:18 2017 +0800 Committer: Fabian Hueske <fhue...@apache.org> Committed: Thu Apr 27 17:03:59 2017 +0200 ---------------------------------------------------------------------- .../flink-connector-kafka-0.10/pom.xml | 9 ++++++++ flink-connectors/flink-hbase/pom.xml | 22 ++++++++++++++++++++ flink-dist/pom.xml | 7 +++++++ flink-dist/src/main/assemblies/opt.xml | 8 +++++++ flink-examples/flink-examples-table/pom.xml | 9 ++++++++ flink-libraries/flink-table/pom.xml | 10 +++++++-- 6 files changed, 63 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/69905e19/flink-connectors/flink-connector-kafka-0.10/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml index ab60946..9fb0e61 100644 --- a/flink-connectors/flink-connector-kafka-0.10/pom.xml +++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml @@ -56,6 +56,15 @@ under the License. </exclusions> </dependency> + <!-- streaming-java dependencies --> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-streaming-java_2.10</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <!-- Add Kafka 0.10.x as a dependency --> <dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/69905e19/flink-connectors/flink-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml index 00c08ef..4fc0556 100644 --- a/flink-connectors/flink-hbase/pom.xml +++ b/flink-connectors/flink-hbase/pom.xml @@ -76,6 +76,8 @@ under the License. <scope>provided</scope> </dependency> + <!-- flink-java dependencies --> + <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-java</artifactId> @@ -83,6 +85,25 @@ under the License. <scope>provided</scope> </dependency> + <!-- flink-scala dependencies --> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-scala_2.10</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- streaming-scala dependencies --> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-streaming-scala_2.10</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- table dependencies --> <dependency> <groupId>org.apache.flink</groupId> @@ -93,6 +114,7 @@ under the License. won't depend on flink-table. --> <optional>true</optional> </dependency> + <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-shaded-hadoop2</artifactId> http://git-wip-us.apache.org/repos/asf/flink/blob/69905e19/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 76df09e..a700870 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -239,6 +239,13 @@ under the License. <version>${project.version}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-table_2.10</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> <!-- end optional Flink libraries --> </dependencies> http://git-wip-us.apache.org/repos/asf/flink/blob/69905e19/flink-dist/src/main/assemblies/opt.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml index 3622ece..0282315 100644 --- a/flink-dist/src/main/assemblies/opt.xml +++ b/flink-dist/src/main/assemblies/opt.xml @@ -59,6 +59,14 @@ <fileMode>0644</fileMode> </file> + <!-- TableAPI--> + <file> + <source>../flink-libraries/flink-table/target/flink-table_2.10-${project.version}.jar</source> + <outputDirectory>opt/</outputDirectory> + <destName>flink-table_2.10-${project.version}.jar</destName> + <fileMode>0644</fileMode> + </file> + <!-- ML --> <file> <source>../flink-libraries/flink-ml/target/flink-ml_2.10-${project.version}-jar-with-dependencies.jar</source> http://git-wip-us.apache.org/repos/asf/flink/blob/69905e19/flink-examples/flink-examples-table/pom.xml ---------------------------------------------------------------------- diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml index de050d7..684d883 100644 --- a/flink-examples/flink-examples-table/pom.xml +++ b/flink-examples/flink-examples-table/pom.xml @@ -34,10 +34,19 @@ under the License. <packaging>jar</packaging> <dependencies> + <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-table_2.10</artifactId> <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-streaming-scala_2.10</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flink/blob/69905e19/flink-libraries/flink-table/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml index 49eb451..c7440ab 100644 --- a/flink-libraries/flink-table/pom.xml +++ b/flink-libraries/flink-table/pom.xml @@ -40,6 +40,7 @@ under the License. <groupId>org.apache.flink</groupId> <artifactId>flink-streaming-scala_2.10</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> @@ -195,13 +196,17 @@ under the License. <configuration> <filters> <filter> + <artifact>*:*</artifact> <excludes> - <exclude>org-apache-calcite-jdbc.properties</exclude> + <exclude>org-apache-calcite-jdbc.properties</exclude> <exclude>mozilla/**</exclude> <exclude>codegen/**</exclude> <exclude>google/**</exclude> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> </excludes> - </filter> + </filter> </filters> <artifactSet> <includes combine.children="append"> @@ -209,6 +214,7 @@ under the License. <include>org.apache.calcite.avatica:*</include> <include>net.hydromatic:*</include> <include>org.reflections:*</include> + <include>org.codehaus.janino:*</include> </includes> </artifactSet> <relocations>
