You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ja...@apache.org on 2020/03/31 02:15:15 UTC
[flink] 01/13: [FLINK-14338][flink-table] Update flink table POM
and NOTICE file Calcite dependency to 1.22.0
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit e9315155fb8ae916bc4f0bd3173c249698d6a588
Author: yuzhao.cyz <yu...@gmail.com>
AuthorDate: Tue Mar 17 18:59:45 2020 +0800
[FLINK-14338][flink-table] Update flink table POM and NOTICE file Calcite dependency to 1.22.0
This closes #11340
---
flink-table/flink-sql-parser/pom.xml | 34 ++++++++--
flink-table/flink-table-planner-blink/pom.xml | 70 ++++++++++----------
.../src/main/resources/META-INF/NOTICE | 6 +-
flink-table/flink-table-planner/pom.xml | 74 +++++++++++-----------
.../src/main/resources/META-INF/NOTICE | 6 +-
flink-table/flink-table-runtime-blink/pom.xml | 6 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
flink-table/pom.xml | 26 +++++++-
8 files changed, 133 insertions(+), 91 deletions(-)
diff --git a/flink-table/flink-sql-parser/pom.xml b/flink-table/flink-sql-parser/pom.xml
index 7658301..87bbf21 100644
--- a/flink-table/flink-sql-parser/pom.xml
+++ b/flink-table/flink-sql-parser/pom.xml
@@ -39,17 +39,23 @@ under the License.
<dependencies>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<!-- When updating the Calcite version, make sure to update the dependency exclusions -->
<version>${calcite.version}</version>
<exclusions>
<!--
- "mvn dependency:tree" as of Calcite 1.21:
+ "mvn dependency:tree" as of Calcite 1.22.0:
- [INFO] +- org.apache.calcite:calcite-core:jar:1.21.0:compile
- [INFO] | +- org.apache.calcite.avatica:avatica-core:jar:1.15.0:compile
- [INFO] | \- com.google.guava:guava:jar:19.0:compile
+ [INFO] +- org.apache.calcite:calcite-core:jar:1.22.0:compile
+ [INFO] | +- org.apache.calcite.avatica:avatica-core:jar:1.16.0:compile
+ [INFO] | +- org.apiguardian:apiguardian-api:jar:1.1.0:compile
Dependencies that are not needed for how we use Calcite right now.
-->
@@ -58,6 +64,14 @@ under the License.
<artifactId>avatica-metrics</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
@@ -141,6 +155,10 @@ under the License.
<version>${calcite.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-server</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
@@ -156,6 +174,14 @@ under the License.
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <!-- Because Calcite tests use Junit5 and we extend from its SqlParserTest,
+ add this dependency to make Junit4 tests compatible with Junit5 environment. -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.5.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/flink-table/flink-table-planner-blink/pom.xml b/flink-table/flink-table-planner-blink/pom.xml
index 6dbf516..b61f7d1 100644
--- a/flink-table/flink-table-planner-blink/pom.xml
+++ b/flink-table/flink-table-planner-blink/pom.xml
@@ -39,30 +39,22 @@ under the License.
<packaging>jar</packaging>
- <dependencyManagement>
- <dependencies>
- <!-- Common dependency of calcite-core and flink-* -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>19.0</version>
- </dependency>
- <!-- Common dependency of calcite-core and flink-table-runtime-blink -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>commons-compiler</artifactId>
- <version>${janino.version}</version>
- </dependency>
- <!-- Common dependency of calcite-core and flink-table-runtime-blink -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <version>${janino.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
+ <!-- Mainly used for calcite-core, it would be relocated
+ to org.apache.flink.calcite.shaded by the shade plugin -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ </dependency>
+ <!-- Used for code generation -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ </dependency>
<!-- core dependencies -->
@@ -128,12 +120,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- Used for code generation -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-cep_${scala.binary.version}</artifactId>
@@ -149,22 +135,30 @@ under the License.
<version>${calcite.version}</version>
<exclusions>
<!--
- "mvn dependency:tree" as of Calcite 1.21:
+ "mvn dependency:tree" as of Calcite 1.22.0:
- [INFO] +- org.apache.calcite:calcite-core:jar:1.21.0:compile
- [INFO] | +- commons-codec:commons-codec:jar:1.10:compile
- [INFO] | +- org.apache.calcite:calcite-linq4j:jar:1.21.0:compile
- [INFO] | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
- [INFO] | +- com.fasterxml.jackson.core:jackson-core:jar:2.10.1:compile
+ [INFO] +- org.apache.calcite:calcite-core:jar:1.22.0:compile
+ [INFO] | +- org.apache.calcite:calcite-linq4j:jar:1.22.0:compile
[INFO] | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.10.1:compile
- [INFO] | +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.1:compile
- [INFO] | +- com.google.guava:guava:jar:19.0:compile
- [INFO] | \- com.jayway.jsonpath:json-path:jar:2.4.0:compile
+ [INFO] | +- org.apiguardian:apiguardian-api:jar:1.1.0:compile
+ [INFO] | +- com.fasterxml.jackson.core:jackson-core:jar:2.10.1:runtime
+ [INFO] | +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.1:runtime
+ [INFO] | +- com.jayway.jsonpath:json-path:jar:2.4.0:runtime
+ [INFO] | | \- net.minidev:json-smart:jar:2.3:runtime
+ [INFO] | | \- net.minidev:accessors-smart:jar:1.2:runtime
+ [INFO] | | \- org.ow2.asm:asm:jar:5.0.4:runtime
+ [INFO] | +- commons-codec:commons-codec:jar:1.10:runtime
+ [INFO] | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
+ [INFO] | \- commons-io:commons-io:jar:2.4:compile
Dependencies that are not needed for how we use Calcite right now.
-->
<exclusion>
<groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-metrics</artifactId>
</exclusion>
<exclusion>
diff --git a/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE
index 9770943..381d6d5 100644
--- a/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE
+++ b/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE
@@ -12,9 +12,9 @@ This project bundles the following dependencies under the Apache Software Licens
- com.fasterxml.jackson.core:jackson-databind:2.10.1
- com.jayway.jsonpath:json-path:2.4.0
- joda-time:joda-time:2.5
-- org.apache.calcite:calcite-core:1.21.0
-- org.apache.calcite:calcite-linq4j:1.21.0
-- org.apache.calcite.avatica:avatica-core:1.15.0
+- org.apache.calcite:calcite-core:1.22.0
+- org.apache.calcite:calcite-linq4j:1.22.0
+- org.apache.calcite.avatica:avatica-core:1.16.0
- commons-codec:commons-codec:1.10
This project bundles the following dependencies under the BSD license.
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index 7dabdf3..bd54093 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -37,30 +37,22 @@ 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 of calcite-core and janino -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>commons-compiler</artifactId>
- <version>${janino.version}</version>
- </dependency>
- <!-- Common dependency of calcite-core and flink-table-planner -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <version>${janino.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
+ <!-- Mainly used for calcite-core, it would be relocated
+ to org.apache.flink.calcite.shaded by the shade plugin -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ </dependency>
+ <!-- Used for code generation -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ </dependency>
<!-- core dependencies -->
@@ -91,6 +83,10 @@ under the License.
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -121,12 +117,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- Used for code generation -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- </dependency>
-
<!-- Used for translation of table programs -->
<dependency>
<groupId>org.apache.calcite</groupId>
@@ -135,23 +125,31 @@ under the License.
<version>${calcite.version}</version>
<exclusions>
<!--
- "mvn dependency:tree" as of Calcite 1.21:
+ "mvn dependency:tree" as of Calcite 1.22.0:
- [INFO] +- org.apache.calcite:calcite-core:jar:1.21.0:compile
- [INFO] | +- commons-codec:commons-codec:jar:1.10:compile
- [INFO] | +- org.apache.calcite.avatica:avatica-core:jar:1.15.0:compile
- [INFO] | +- org.apache.calcite:calcite-linq4j:jar:1.21.0:compile
- [INFO] | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
- [INFO] | +- com.fasterxml.jackson.core:jackson-core:jar:2.10.1:compile
+ [INFO] +- org.apache.calcite:calcite-core:jar:1.22.0:compile
+ [INFO] | +- org.apache.calcite:calcite-linq4j:jar:1.22.0:compile
[INFO] | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.10.1:compile
+ [INFO] | +- org.apache.calcite.avatica:avatica-core:jar:1.16.0:compile
+ [INFO] | +- org.apiguardian:apiguardian-api:jar:1.1.0:compile
+ [INFO] | +- com.fasterxml.jackson.core:jackson-core:jar:2.10.1:compile
[INFO] | +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.1:compile
- [INFO] | +- com.google.guava:guava:jar:19.0:compile
- [INFO] | \- com.jayway.jsonpath:json-path:jar:2.4.0:compile
+ [INFO] | +- com.jayway.jsonpath:json-path:jar:2.4.0:runtime
+ [INFO] | | \- net.minidev:json-smart:jar:2.3:runtime
+ [INFO] | | \- net.minidev:accessors-smart:jar:1.2:runtime
+ [INFO] | | \- org.ow2.asm:asm:jar:5.0.4:runtime
+ [INFO] | +- commons-codec:commons-codec:jar:1.10:runtime
+ [INFO] | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
+ [INFO] | \- commons-io:commons-io:jar:2.4:compile
Dependencies that are not needed for how we use Calcite right now.
-->
<exclusion>
<groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-metrics</artifactId>
</exclusion>
<exclusion>
diff --git a/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
index 1227b0b..dbe6a3e 100644
--- a/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
+++ b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
@@ -12,9 +12,9 @@ This project bundles the following dependencies under the Apache Software Licens
- com.fasterxml.jackson.core:jackson-databind:2.10.1
- com.jayway.jsonpath:json-path:2.4.0
- joda-time:joda-time:2.5
-- org.apache.calcite:calcite-core:1.21.0
-- org.apache.calcite:calcite-linq4j:1.21.0
-- org.apache.calcite.avatica:avatica-core:1.15.0
+- org.apache.calcite:calcite-core:1.22.0
+- org.apache.calcite:calcite-linq4j:1.22.0
+- org.apache.calcite.avatica:avatica-core:1.16.0
- commons-codec:commons-codec:1.10
This project bundles the following dependencies under the BSD license.
diff --git a/flink-table/flink-table-runtime-blink/pom.xml b/flink-table/flink-table-runtime-blink/pom.xml
index 81e3324..e8ed8af 100644
--- a/flink-table/flink-table-runtime-blink/pom.xml
+++ b/flink-table/flink-table-runtime-blink/pom.xml
@@ -78,7 +78,7 @@ under the License.
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-core</artifactId>
<!-- When updating the Calcite version, make sure to update the version and dependency exclusions -->
- <version>1.15.0</version>
+ <version>1.16.0</version>
<exclusions>
<!--
@@ -87,9 +87,9 @@ under the License.
We exclude all the dependencies of Avatica because currently we only use
TimeUnit, TimeUnitRange and SqlDateTimeUtils which only dependent JDK.
- "mvn dependency:tree" as of Avatica 1.15:
+ "mvn dependency:tree" as of Avatica 1.16:
- [INFO] +- org.apache.calcite.avatica:avatica-core:jar:1.15.0:compile
+ [INFO] +- org.apache.calcite.avatica:avatica-core:jar:1.16.0:compile
-->
<exclusion>
diff --git a/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE
index 3aac7ec..7ca8549 100644
--- a/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE
+++ b/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE
@@ -6,4 +6,4 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- org.apache.calcite.avatica:avatica-core:1.13.0
+- org.apache.calcite.avatica:avatica-core:1.16.0
diff --git a/flink-table/pom.xml b/flink-table/pom.xml
index 5bf84f9..717b59f 100644
--- a/flink-table/pom.xml
+++ b/flink-table/pom.xml
@@ -47,9 +47,33 @@ under the License.
<module>flink-sql-parser</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Common dependency of calcite-core and flink-test-utils -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <!-- Common dependency of calcite-core and janino -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>commons-compiler</artifactId>
+ <version>${janino.version}</version>
+ </dependency>
+ <!-- Common dependency of calcite-core and flink-table-planner-* -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <version>${janino.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<properties>
<!-- When updating Janino, make sure that Calcite supports it as well. -->
<janino.version>3.0.9</janino.version>
- <calcite.version>1.21.0</calcite.version>
+ <calcite.version>1.22.0</calcite.version>
+ <guava.version>19.0</guava.version>
</properties>
</project>