You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2017/10/27 11:16:27 UTC
flink git commit: [FLINK-6173] [table] Clean-up flink-table jar and
dependencies
Repository: flink
Updated Branches:
refs/heads/release-1.3 0891a6f5a -> c3289c9d9
[FLINK-6173] [table] Clean-up flink-table jar and dependencies
This closes #4837.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c3289c9d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c3289c9d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c3289c9d
Branch: refs/heads/release-1.3
Commit: c3289c9d982292975caded4c45926e9653ce5b63
Parents: 0891a6f
Author: twalthr <tw...@apache.org>
Authored: Wed Oct 11 12:26:07 2017 +0200
Committer: Fabian Hueske <fh...@apache.org>
Committed: Fri Oct 27 10:06:37 2017 +0200
----------------------------------------------------------------------
flink-examples/flink-examples-table/pom.xml | 14 +--
flink-libraries/flink-table/pom.xml | 109 ++++++++++++++++-------
2 files changed, 82 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c3289c9d/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 98e7305..6b13c7c 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -39,14 +39,12 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-table_2.10</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_2.10</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
@@ -93,19 +91,13 @@ under the License.
<filter>
<artifact>*:*</artifact>
<includes>
+ <include>org/apache/calcite/**</include>
+ <include>org/apache/flink/calcite/shaded/**</include>
+ <include>org/apache/flink/table/**</include>
<include>org.codehaus.commons.compiler.properties</include>
<include>org/codehaus/janino/**</include>
<include>org/codehaus/commons/**</include>
- <include>org/apache/calcite/**</include>
- <include>org/apache/flink/table/**</include>
- <include>org/apache/flink/shaded/calcite/com/google/common/**</include>
- <include>org/apache/flink/shaded/calcite/org/eigenbase/util/property/**</include>
</includes>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
</filter>
</filters>
</configuration>
http://git-wip-us.apache.org/repos/asf/flink/blob/c3289c9d/flink-libraries/flink-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index 7ee69a7..760e45d 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -44,6 +44,18 @@ under the License.
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.0.7</version>
@@ -86,29 +98,30 @@ under the License.
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.10</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</exclusion>
</exclusions>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.10</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
<!-- test dependencies -->
@@ -198,13 +211,23 @@ under the License.
<filter>
<artifact>*:*</artifact>
<excludes>
+ <!-- excluded all these files for a clean flink-table jar -->
<exclude>org-apache-calcite-jdbc.properties</exclude>
+ <exclude>common.proto</exclude>
+ <exclude>requests.proto</exclude>
+ <exclude>responses.proto</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>
+ <exclude>META-INF/services/**</exclude>
+ <exclude>properties.dtd</exclude>
+ <exclude>PropertyList-1.0.dtd</exclude>
+ <exclude>digesterRules.xml</exclude>
+ <!-- not relocated for now, because it is needed by Calcite -->
+ <!--<exclude>org.codehaus.commons.compiler.properties</exclude>-->
</excludes>
</filter>
</filters>
@@ -212,30 +235,56 @@ under the License.
<includes combine.children="append">
<include>org.apache.calcite:*</include>
<include>org.apache.calcite.avatica:*</include>
+
+ <!-- Calcite's dependencies -->
+ <include>com.google.guava:guava</include>
<include>net.hydromatic:*</include>
- <include>org.reflections:*</include>
+
+ <!-- flink-table dependencies -->
+ <include>commons-configuration:*</include>
+ <include>commons-lang:*</include>
+ <include>commons-codec:*</include>
+ <include>org.apache.commons:commons-lang3:*</include>
<include>org.codehaus.janino:*</include>
- </includes>
+ <include>org.reflections:*</include>
+ <include>joda-time:*</include>
+ </includes>
</artifactSet>
<relocations>
- <!-- We currently don't relocate slf4j as we have "logger not found"
- warnings otherwise during runtime -->
+ <!-- Calcite is not relocated for now, because we expose it at some locations such as CalciteConfig -->
<!--<relocation>
- <pattern>org.slf4j</pattern>
- <shadedPattern>org.apache.flink.shaded.calcite.org.slf4j</shadedPattern>
+ <pattern>org.apache.calcite</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.calcite</shadedPattern>
</relocation>-->
+
+ <!-- Calcite's dependencies -->
<relocation>
- <pattern>com.fasterxml.jackson</pattern>
- <shadedPattern>org.apache.flink.shaded.calcite.com.fasterxml.jackson</shadedPattern>
+ <pattern>com.google</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.com.google</shadedPattern>
</relocation>
<relocation>
- <pattern>com.google</pattern>
- <shadedPattern>org.apache.flink.shaded.calcite.com.google</shadedPattern>
+ <pattern>org.pentaho</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.pentaho</shadedPattern>
</relocation>
+
+ <!-- flink-table dependencies -->
<relocation>
- <pattern>org.eigenbase</pattern>
- <shadedPattern>org.apache.flink.shaded.calcite.org.eigenbase</shadedPattern>
+ <pattern>org.apache.commons</pattern>
+ <shadedPattern>org.apache.flink.table.shaded.org.apache.commons</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.reflections</pattern>
+ <shadedPattern>org.apache.flink.table.shaded.org.reflections</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.joda.time</pattern>
+ <shadedPattern>org.apache.flink.table.shaded.org.joda.time</shadedPattern>
+ </relocation>
+ <!-- not relocated for now, because we need to change the contents of the properties field otherwise -->
+ <!--<relocation>
+ <pattern>org.codehaus</pattern>
+ <shadedPattern>org.apache.flink.table.shaded.org.codehaus</shadedPattern>
+ </relocation>-->
</relocations>
</configuration>
</execution>