Merge branch 'master' into AMORO_1457_support_compute

# Conflicts: # flink/v1.15/flink/src/main/java/com/netease/arctic/flink/FlinkSchemaUtil.java # flink/v1.15/flink/src/main/java/com/netease/arctic/flink/catalog/ArcticCatalog.java # flink/v1.15/flink/src/main/java/com/netease/arctic/flink/table/DynamicTableFactory.java # flink/v1.15/flink/src/main/java/com/netease/arctic/flink/table/descriptors/ArcticValidator.java # flink/v1.15/flink/src/main/java/com/netease/arctic/flink/write/FlinkSink.java # flink/v1.15/flink/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java
apache · Nov 6, 2023 · c634733 · c634733
2 parents d4f36e7 + a62708d
commit c634733
Show file tree

Hide file tree

Showing 232 changed files with 19 additions and 48,471 deletions.
diff --git a/flink/pom.xml b/flink/pom.xml
@@ -34,9 +34,7 @@
 
     <modules>
         <module>v1.15/flink</module>
-        <module>v1.15/flink-format</module>
         <module>v1.15/flink-runtime</module>
-        <module>v1.15/flink-1.15-iceberg-bridge</module>
         <module>v1.16/flink</module>
         <module>v1.16/flink-runtime</module>
         <module>v1.17/flink</module>

diff --git a/flink/v1.15/flink-1.15-iceberg-bridge/pom.xml b/flink/v1.15/flink-1.15-iceberg-bridge/pom.xml