From a35b8dd44cee7fab130e37025683e86ce5a3bb28 Mon Sep 17 00:00:00 2001 From: wenmo <32723967+wenmo@users.noreply.github.com> Date: Wed, 20 Mar 2024 20:44:31 +0800 Subject: [PATCH] [build] Optimize pom to solve the CI error --- .../flink-sql-connector-db2-cdc/pom.xml | 4 + .../flink-cdc-source-connectors/pom.xml | 10 + flink-cdc-dist/pom.xml | 10 + flink-cdc-runtime/pom.xml | 38 +++ pom.xml | 238 +++++++++--------- 5 files changed, 181 insertions(+), 119 deletions(-) diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml index fbd908ccf..8f9960095 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/pom.xml @@ -60,6 +60,10 @@ limitations under the License. *:* + + org.codehaus.janino:* + org.apache.calcite:* + diff --git a/flink-cdc-connect/flink-cdc-source-connectors/pom.xml b/flink-cdc-connect/flink-cdc-source-connectors/pom.xml index ce0f972d0..13c9afa04 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/pom.xml +++ b/flink-cdc-connect/flink-cdc-source-connectors/pom.xml @@ -63,6 +63,16 @@ limitations under the License. org.apache.flink flink-cdc-runtime ${project.version} + + + org.codehaus.janino + janino + + + org.apache.calcite + calcite-core + + diff --git a/flink-cdc-dist/pom.xml b/flink-cdc-dist/pom.xml index 87582b4b6..dbbcd9117 100644 --- a/flink-cdc-dist/pom.xml +++ b/flink-cdc-dist/pom.xml @@ -67,6 +67,16 @@ limitations under the License. shade + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + false false false diff --git a/flink-cdc-runtime/pom.xml b/flink-cdc-runtime/pom.xml index 1e00a0da5..61a4b1f3b 100644 --- a/flink-cdc-runtime/pom.xml +++ b/flink-cdc-runtime/pom.xml @@ -34,6 +34,44 @@ limitations under the License. ${flink.version} provided + + + org.codehaus.janino + janino + + + + org.apache.calcite + calcite-core + + + org.apache.flink + flink-table-planner_2.12 + ${flink.version} + provided + + + value + org.immutables + + + value-annotations + org.immutables + + + commons-compiler + org.codehaus.janino + + + janino + org.codehaus.janino + + + flink-scala_2.12 + org.apache.flink + + + org.apache.flink flink-cdc-common diff --git a/pom.xml b/pom.xml index ef0128ee9..a2104faac 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,125 @@ limitations under the License. junit ${junit4.version} + + + + org.codehaus.janino + janino + ${janino.version} + + + + + org.apache.calcite + calcite-core + + ${calcite.version} + + + + org.apache.calcite.avatica + avatica-server + + + org.apache.calcite.avatica + avatica-metrics + + + com.google.protobuf + protobuf-java + + + com.google.uzaygezen + uzaygezen-core + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.apache.commons + commons-dbcp2 + + + org.apache.commons + commons-lang3 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.yahoo.datasketches + sketches-core + + + net.hydromatic + aggdesigner-algorithm + + + com.google.errorprone + error_prone_annotations + + + org.jetbrains + annotations + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.codehaus.janino + janino + + + org.codehaus.janino + commons-compiler + + + org.apache.httpcomponents.client5 + httpclient5 + + + org.apache.httpcomponents.core5 + httpcore5 + + + org.checkerframework + checker-qual + + + org.locationtech.jts.io + jts-io-common + + + org.locationtech.proj4j + proj4j + + + @@ -170,125 +289,6 @@ limitations under the License. true - - - org.codehaus.janino - janino - ${janino.version} - - - - - org.apache.calcite - calcite-core - - ${calcite.version} - - - - org.apache.calcite.avatica - avatica-server - - - org.apache.calcite.avatica - avatica-metrics - - - com.google.protobuf - protobuf-java - - - com.google.uzaygezen - uzaygezen-core - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.commons - commons-dbcp2 - - - org.apache.commons - commons-lang3 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.yahoo.datasketches - sketches-core - - - net.hydromatic - aggdesigner-algorithm - - - com.google.errorprone - error_prone_annotations - - - org.jetbrains - annotations - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - - - org.codehaus.janino - janino - - - org.codehaus.janino - commons-compiler - - - org.apache.httpcomponents.client5 - httpclient5 - - - org.apache.httpcomponents.core5 - httpcore5 - - - org.checkerframework - checker-qual - - - org.locationtech.jts.io - jts-io-common - - - org.locationtech.proj4j - proj4j - - - - org.hamcrest