diff --git a/flink-connector-mysql-cdc/pom.xml b/flink-connector-mysql-cdc/pom.xml index d74c94260..b3a08befc 100644 --- a/flink-connector-mysql-cdc/pom.xml +++ b/flink-connector-mysql-cdc/pom.xml @@ -54,17 +54,11 @@ under the License. com.alibaba.ververica - flink-connector-debezium + flink-connector-test-util ${project.version} - - - kafka-log4j-appender - org.apache.kafka - - - test-jar test + io.debezium debezium-core diff --git a/flink-connector-mysql-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/mysql/MySQLSourceTest.java b/flink-connector-mysql-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/mysql/MySQLSourceTest.java index f8b8864d7..6d0517327 100644 --- a/flink-connector-mysql-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/mysql/MySQLSourceTest.java +++ b/flink-connector-mysql-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/mysql/MySQLSourceTest.java @@ -35,9 +35,9 @@ import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; import com.alibaba.ververica.cdc.connectors.mysql.utils.UniqueDatabase; +import com.alibaba.ververica.cdc.connectors.utils.TestSourceContext; import com.alibaba.ververica.cdc.debezium.DebeziumDeserializationSchema; import com.alibaba.ververica.cdc.debezium.DebeziumSourceFunction; -import com.alibaba.ververica.cdc.debezium.utils.TestSourceContext; import com.jayway.jsonpath.JsonPath; import org.apache.kafka.connect.source.SourceRecord; import org.junit.Before; @@ -56,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertDelete; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertInsert; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertUpdate; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertDelete; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertInsert; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-connector-postgres-cdc/pom.xml b/flink-connector-postgres-cdc/pom.xml index 5fbc63d72..0d2c75599 100644 --- a/flink-connector-postgres-cdc/pom.xml +++ b/flink-connector-postgres-cdc/pom.xml @@ -55,17 +55,11 @@ under the License. com.alibaba.ververica - flink-connector-debezium + flink-connector-test-util ${project.version} - - - kafka-log4j-appender - org.apache.kafka - - - test-jar test + io.debezium debezium-core diff --git a/flink-connector-postgres-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java b/flink-connector-postgres-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java index d33908c8c..87e434b43 100644 --- a/flink-connector-postgres-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java +++ b/flink-connector-postgres-cdc/src/test/java/com/alibaba/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java @@ -34,9 +34,9 @@ import org.apache.flink.streaming.util.MockStreamingRuntimeContext; import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; +import com.alibaba.ververica.cdc.connectors.utils.TestSourceContext; import com.alibaba.ververica.cdc.debezium.DebeziumDeserializationSchema; import com.alibaba.ververica.cdc.debezium.DebeziumSourceFunction; -import com.alibaba.ververica.cdc.debezium.utils.TestSourceContext; import com.jayway.jsonpath.JsonPath; import org.apache.kafka.connect.source.SourceRecord; import org.junit.Before; @@ -55,10 +55,10 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertDelete; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertInsert; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertRead; -import static com.alibaba.ververica.cdc.debezium.utils.AssertUtils.assertUpdate; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertDelete; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertInsert; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertRead; +import static com.alibaba.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-connector-test-util/pom.xml b/flink-connector-test-util/pom.xml new file mode 100644 index 000000000..29d91fce4 --- /dev/null +++ b/flink-connector-test-util/pom.xml @@ -0,0 +1,52 @@ + + + + + flink-cdc-connectors + com.alibaba.ververica + 1.0.0-SNAPSHOT + + 4.0.0 + + flink-connector-test-util + flink-connector-test-util + jar + + + + com.alibaba.ververica + flink-connector-debezium + ${project.version} + + + kafka-log4j-appender + org.apache.kafka + + + + + + org.apache.flink + flink-test-utils_${scala.binary.version} + ${flink.version} + + + + \ No newline at end of file diff --git a/flink-connector-debezium/src/test/java/com/alibaba/ververica/cdc/debezium/utils/AssertUtils.java b/flink-connector-test-util/src/main/java/com/alibaba/ververica/cdc/connectors/utils/AssertUtils.java similarity index 99% rename from flink-connector-debezium/src/test/java/com/alibaba/ververica/cdc/debezium/utils/AssertUtils.java rename to flink-connector-test-util/src/main/java/com/alibaba/ververica/cdc/connectors/utils/AssertUtils.java index 519997104..4f13382e5 100644 --- a/flink-connector-debezium/src/test/java/com/alibaba/ververica/cdc/debezium/utils/AssertUtils.java +++ b/flink-connector-test-util/src/main/java/com/alibaba/ververica/cdc/connectors/utils/AssertUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.debezium.utils; +package com.alibaba.ververica.cdc.connectors.utils; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-connector-debezium/src/test/java/com/alibaba/ververica/cdc/debezium/utils/TestSourceContext.java b/flink-connector-test-util/src/main/java/com/alibaba/ververica/cdc/connectors/utils/TestSourceContext.java similarity index 97% rename from flink-connector-debezium/src/test/java/com/alibaba/ververica/cdc/debezium/utils/TestSourceContext.java rename to flink-connector-test-util/src/main/java/com/alibaba/ververica/cdc/connectors/utils/TestSourceContext.java index da01ee958..ebd577bea 100644 --- a/flink-connector-debezium/src/test/java/com/alibaba/ververica/cdc/debezium/utils/TestSourceContext.java +++ b/flink-connector-test-util/src/main/java/com/alibaba/ververica/cdc/connectors/utils/TestSourceContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.ververica.cdc.debezium.utils; +package com.alibaba.ververica.cdc.connectors.utils; import org.apache.flink.streaming.api.functions.source.SourceFunction; import org.apache.flink.streaming.api.watermark.Watermark; diff --git a/pom.xml b/pom.xml index d3a72be21..fd5686af4 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ under the License. flink-connector-debezium + flink-connector-test-util flink-connector-mysql-cdc flink-connector-postgres-cdc flink-sql-connector-mysql-cdc @@ -48,6 +49,17 @@ under the License. + + + oss + https://oss.sonatype.org/content/repositories/snapshots/ + + + oss + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + 1.11.1 1.2.0.Final @@ -337,12 +349,128 @@ under the License. maven-jar-plugin + test-jar test-jar + + + org.apache.maven.plugins + maven-javadoc-plugin + + none + + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + + + [1.8,) + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar + + + + + + net.ju-n.maven.plugins + checksum-maven-plugin + + + + artifacts + + + + + + SHA-256 + + false + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + true + false + + -Xdoclint:none + + + + + attach-javadocs + + jar + + + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + forked-path + false + ${arguments} -Psonatype-oss-release + + + + + + + \ No newline at end of file