You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2018/04/16 16:10:57 UTC
flink git commit: [FLINK-9145] [table] Clean up flink-table
dependencies
Repository: flink
Updated Branches:
refs/heads/master 71c3cd278 -> 185b904aa
[FLINK-9145] [table] Clean up flink-table dependencies
This closes #5853.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/185b904a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/185b904a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/185b904a
Branch: refs/heads/master
Commit: 185b904aa82dd99a178de0688fa67afba0edf679
Parents: 71c3cd2
Author: Timo Walther <tw...@apache.org>
Authored: Mon Apr 16 13:02:22 2018 +0200
Committer: Timo Walther <tw...@apache.org>
Committed: Mon Apr 16 18:09:41 2018 +0200
----------------------------------------------------------------------
flink-libraries/flink-sql-client/pom.xml | 17 +++++++
flink-libraries/flink-table/pom.xml | 67 ++++++++++++++++++++++++++-
2 files changed, 83 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/185b904a/flink-libraries/flink-sql-client/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/pom.xml b/flink-libraries/flink-sql-client/pom.xml
index 6bcfc13..3763bf0 100644
--- a/flink-libraries/flink-sql-client/pom.xml
+++ b/flink-libraries/flink-sql-client/pom.xml
@@ -192,6 +192,23 @@ under the License.
</execution>
</executions>
</plugin>
+
+ <!-- Enable enforcer plugin for checking dependency convergence -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/185b904a/flink-libraries/flink-table/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index d6c146a..acffb2b 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -32,6 +32,41 @@ under the License.
<packaging>jar</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Common dependency of calcite-core and flink-test-utils -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>19.0</version>
+ </dependency>
+ <!-- Common dependency among commons-configuration -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <!-- Common dependency of calcite-core and janino -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ <version>3.0.7</version>
+ </dependency>
+ <!-- Common dependency of aggdesigner-algorithm and commons-configuration -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <!-- Common dependency of calcite-core and flink-table -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <version>3.0.7</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- core dependencies -->
@@ -49,27 +84,38 @@ under the License.
<scope>provided</scope>
</dependency>
+ <!-- Used for TableType configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
+ <!-- Used for base64 encoding of UDFs -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
+ <!-- Used for code generation -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <!-- Used for code generation -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
- <version>3.0.7</version>
</dependency>
+ <!-- Used for translation of table programs -->
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
+ <!-- When updating the Calcite version, make sure to update the dependency exclusions -->
<version>1.16.0</version>
<exclusions>
+ <!-- Dependencies that are not needed for how we use Calcite right now -->
<exclusion>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-metrics</artifactId>
@@ -105,6 +151,7 @@ under the License.
</exclusions>
</dependency>
+ <!-- Used for TableType classpath discovery -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -122,6 +169,7 @@ under the License.
<scope>compile</scope>
</dependency>
+ <!-- Used for date/time formatting -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
@@ -337,6 +385,23 @@ under the License.
<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
</configuration>
</plugin>
+
+ <!-- Enable enforcer plugin for checking dependency convergence -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-convergence</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>