[FLINK-10076][table-planner-blink] Upgrade Calcite dependency to 1.18

static-max · Mar 14, 2019 · 0c062a3 · 0c062a3
1 parent 93a2c79
commit 0c062a3
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 36 deletions.
diff --git a/flink-table/flink-table-planner-blink/pom.xml b/flink-table/flink-table-planner-blink/pom.xml
@@ -59,6 +59,22 @@ under the License.
  <artifactId>janino</artifactId>
  <version>${janino.version}</version>
  </dependency>
+ <!-- Common dependencies within calcite-core -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.9.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.9.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.6</version>
+ </dependency>
  </dependencies>
  </dependencyManagement>
 
@@ -98,36 +114,34 @@ under the License.
  <scope>provided</scope>
  </dependency>
 
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-jackson</artifactId>
- <scope>provided</scope>
- </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.17.0</version>
+ <version>1.18.0</version>
  <exclusions>
- <!-- Dependencies that are not needed for how we use Calcite right now -->
+ <!--
+
+ Dependencies that are not needed for how we use Calcite right now.
+
+ "mvn dependency:tree" as of Calcite 1.18:
+
+ [INFO] +- org.apache.calcite:calcite-core:jar:1.18.0:compile
+ [INFO] | +- org.apache.calcite.avatica:avatica-core:jar:1.13.0:compile
+ [INFO] | +- org.apache.calcite:calcite-linq4j:jar:1.18.0:compile
+ [INFO] | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
+ [INFO] | +- com.fasterxml.jackson.core:jackson-core:jar:2.9.6:compile
+ [INFO] | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.9.6:compile
+ [INFO] | +- com.fasterxml.jackson.core:jackson-databind:jar:2.9.6:compile
+ [INFO] | +- com.google.guava:guava:jar:19.0:compile
+ [INFO] | \- com.jayway.jsonpath:json-path:jar:2.4.0:compile
+
+ -->
  <exclusion>
  <groupId>org.apache.calcite.avatica</groupId>
  <artifactId>avatica-metrics</artifactId>
  </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
  <exclusion>
  <groupId>com.google.protobuf</groupId>
  <artifactId>protobuf-java</artifactId>
@@ -141,13 +155,25 @@ under the License.
  <artifactId>httpcore</artifactId>
  </exclusion>
  <exclusion>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
  </exclusion>
  <exclusion>
  <groupId>com.esri.geometry</groupId>
  <artifactId>esri-geometry-api</artifactId>
  </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.yahoo.datasketches</groupId>
+ <artifactId>sketches-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>aggdesigner-algorithm</artifactId>
+ </exclusion>
  </exclusions>
  </dependency>
  </dependencies>
@@ -189,6 +215,7 @@ under the License.
  <execution>
  <id>shade-flink</id>
  <configuration>
+ <shadeTestJar>false</shadeTestJar>
  <filters>
  <filter>
  <artifact>*:*</artifact>
@@ -198,16 +225,11 @@ under the License.
  <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/java.sql.Driver</exclude>
- <exclude>properties.dtd</exclude>
- <exclude>PropertyList-1.0.dtd</exclude>
- <exclude>digesterRules.xml</exclude>
  </excludes>
  </filter>
  </filters>
@@ -218,7 +240,10 @@ under the License.
 
  <!-- Calcite's dependencies -->
  <include>com.google.guava:guava</include>
- <include>net.hydromatic:*</include>
+ <include>com.jayway.jsonpath:json-path</include>
+ <include>com.fasterxml.jackson.core:jackson-core</include>
+ <include>com.fasterxml.jackson.core:jackson-databind</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations</include>
 
  <!-- flink-table-runtime-blink dependencies -->
  <include>org.codehaus.janino:*</include>
@@ -231,8 +256,12 @@ under the License.
  <shadedPattern>org.apache.flink.calcite.shaded.com.google</shadedPattern>
  </relocation>
  <relocation>
- <pattern>org.pentaho</pattern>
- <shadedPattern>org.apache.flink.calcite.shaded.org.pentaho</shadedPattern>
+ <pattern>com.jayway</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.com.jayway</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.com.fasterxml</shadedPattern>
  </relocation>
  </relocations>
  </configuration>

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
@@ -7,13 +7,17 @@ The Apache Software Foundation (http:https://www.apache.org/).
 This project bundles the following dependencies under the Apache Software License 2.0. (http:https://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - com.google.guava:guava:19.0
-- net.hydromatic:aggdesigner-algorithm:6.0
-- org.apache.calcite:calcite-core:1.17.0
-- org.apache.calcite:calcite-linq4j:1.17.0
-- org.apache.calcite.avatica:avatica-core:1.12.0
+- com.fasterxml.jackson.core:jackson-annotations:2.9.6
+- com.fasterxml.jackson.core:jackson-core:2.9.6
+- com.fasterxml.jackson.core:jackson-databind:2.9.6
+- com.jayway.jsonpath:json-path:2.4.0
+- joda-time:joda-time:2.5
+- org.apache.calcite:calcite-core:1.18.0
+- org.apache.calcite:calcite-linq4j:1.18.0
+- org.apache.calcite.avatica:avatica-core:1.13.0
 
 This project bundles the following dependencies under the BSD license.
 See bundled license files for details
 
-- org.codehaus.janino:janino:3.0.7
-- org.codehaus.janino:commons-compiler:3.0.7
+- org.codehaus.janino:janino:3.0.9
+- org.codehaus.janino:commons-compiler:3.0.9