You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ku...@apache.org on 2019/07/11 13:37:48 UTC
[flink] branch master updated (b0bf838 -> 5547d1b)
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from b0bf838 [FLINK-13209][table-api] Revert TableEnvironment#sql and move ddl support to sqlUpdate
new 64d5d69 [hotfix] reallocate commons-codec in flink planner & blink planner
new 5547d1b [FLINK-13208][table-planner][table-planner-blink] Update Notice files after adding commons-codec to table package.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-table/flink-table-planner-blink/pom.xml | 18 ++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 7 ++++---
flink-table/flink-table-planner/pom.xml | 4 ++++
.../src/main/resources/META-INF/NOTICE | 7 ++++---
4 files changed, 30 insertions(+), 6 deletions(-)
[flink] 02/02: [FLINK-13208][table-planner][table-planner-blink]
Update Notice files after adding commons-codec to table package.
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5547d1bc0b20fdf733e83a7d81ca1117c990fe6b
Author: Kurt Young <yk...@gmail.com>
AuthorDate: Thu Jul 11 17:04:24 2019 +0800
[FLINK-13208][table-planner][table-planner-blink] Update Notice files after adding commons-codec to table package.
This closes #13208
---
.../flink-table-planner-blink/src/main/resources/META-INF/NOTICE | 7 ++++---
flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
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 a87ebf7..131460d 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,10 @@ This project bundles the following dependencies under the Apache Software Licens
- 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.19.0
-- org.apache.calcite:calcite-linq4j:1.19.0
-- org.apache.calcite.avatica:avatica-core:1.13.0
+- org.apache.calcite:calcite-core:1.20.0
+- org.apache.calcite:calcite-linq4j:1.20.0
+- org.apache.calcite.avatica:avatica-core:1.15.0
+- commons-codec:commons-codec:1.10
This project bundles the following dependencies under the BSD license.
See bundled license files for details
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 7848d5d..31d8cff 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,10 @@ This project bundles the following dependencies under the Apache Software Licens
- 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
+- org.apache.calcite:calcite-core:1.20.0
+- org.apache.calcite:calcite-linq4j:1.20.0
+- org.apache.calcite.avatica:avatica-core:1.15.0
+- commons-codec:commons-codec:1.10
This project bundles the following dependencies under the BSD license.
See bundled license files for details
[flink] 01/02: [hotfix] reallocate commons-codec in flink planner &
blink planner
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kurt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 64d5d6987a6d6f56300ec42b86eac48c5185df15
Author: Kurt Young <yk...@gmail.com>
AuthorDate: Thu Jul 11 17:03:01 2019 +0800
[hotfix] reallocate commons-codec in flink planner & blink planner
---
flink-table/flink-table-planner-blink/pom.xml | 18 ++++++++++++++++++
flink-table/flink-table-planner/pom.xml | 4 ++++
2 files changed, 22 insertions(+)
diff --git a/flink-table/flink-table-planner-blink/pom.xml b/flink-table/flink-table-planner-blink/pom.xml
index 16cb2da..9f5946a 100644
--- a/flink-table/flink-table-planner-blink/pom.xml
+++ b/flink-table/flink-table-planner-blink/pom.xml
@@ -328,6 +328,12 @@ under the License.
</includes>
</artifactSet>
<relocations>
+ <!-- Calcite is not relocated for now, because we expose it at some locations such as CalciteConfig -->
+ <!--<relocation>
+ <pattern>org.apache.calcite</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.calcite</shadedPattern>
+ </relocation>-->
+
<!-- Calcite's dependencies -->
<relocation>
<pattern>com.google</pattern>
@@ -341,6 +347,18 @@ under the License.
<pattern>com.fasterxml</pattern>
<shadedPattern>org.apache.flink.calcite.shaded.com.fasterxml</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.codec</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.codec</shadedPattern>
+ </relocation>
+
+ <!-- flink-table-planner dependencies -->
+ <!-- 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>
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index 9a0f447..450c989 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -364,6 +364,10 @@ under the License.
<pattern>com.fasterxml</pattern>
<shadedPattern>org.apache.flink.calcite.shaded.com.fasterxml</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.codec</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.codec</shadedPattern>
+ </relocation>
<!-- flink-table-planner dependencies -->
<relocation>