From 123d9ef4eb7056676b0a3e95db110fe59b5b33d0 Mon Sep 17 00:00:00 2001 From: Jiri Pechanec Date: Thu, 11 Mar 2021 13:23:24 +0100 Subject: [PATCH] DBZ-3213 Refactor Maven structure to deploy support modules --- debezium-api/pom.xml | 2 +- debezium-assembly-descriptors/pom.xml | 2 +- debezium-connector-mongodb/pom.xml | 2 +- debezium-connector-mysql/pom.xml | 2 +- debezium-connector-oracle/pom.xml | 2 +- debezium-connector-postgres/pom.xml | 2 +- debezium-connector-sqlserver/pom.xml | 2 +- debezium-core/pom.xml | 2 +- debezium-ddl-parser/pom.xml | 2 +- debezium-embedded/pom.xml | 2 +- debezium-microbenchmark-oracle/pom.xml | 4 +- debezium-microbenchmark/pom.xml | 2 +- debezium-parent/pom.xml | 743 ++++++++++++++++++ .../integration-tests/pom.xml | 2 +- debezium-quarkus-outbox/pom.xml | 2 +- debezium-quarkus-outbox/runtime/pom.xml | 2 +- debezium-scripting/pom.xml | 2 +- debezium-server/pom.xml | 2 +- debezium-testing/pom.xml | 2 +- pom.xml | 695 +--------------- support/checkstyle/pom.xml | 69 +- .../java/io/debezium/checkstyle/Header.java | 12 +- .../io/debezium/checkstyle/IllegalImport.java | 5 +- .../io/debezium/checkstyle/JavaDocUtil.java | 13 +- .../io/debezium/checkstyle/UnusedImports.java | 25 +- support/ide-configs/pom.xml | 33 +- support/revapi/pom.xml | 33 +- 27 files changed, 814 insertions(+), 852 deletions(-) create mode 100644 debezium-parent/pom.xml diff --git a/debezium-api/pom.xml b/debezium-api/pom.xml index c8ecb77106a..cd4ba97f3d3 100644 --- a/debezium-api/pom.xml +++ b/debezium-api/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-api diff --git a/debezium-assembly-descriptors/pom.xml b/debezium-assembly-descriptors/pom.xml index 7fcdebe5c59..e6b0628ddfb 100644 --- a/debezium-assembly-descriptors/pom.xml +++ b/debezium-assembly-descriptors/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-assembly-descriptors diff --git a/debezium-connector-mongodb/pom.xml b/debezium-connector-mongodb/pom.xml index 7b2885036d5..6ff426f6ef4 100644 --- a/debezium-connector-mongodb/pom.xml +++ b/debezium-connector-mongodb/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-connector-mongodb diff --git a/debezium-connector-mysql/pom.xml b/debezium-connector-mysql/pom.xml index 471cda8febb..0b81835d579 100644 --- a/debezium-connector-mysql/pom.xml +++ b/debezium-connector-mysql/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-connector-mysql diff --git a/debezium-connector-oracle/pom.xml b/debezium-connector-oracle/pom.xml index cf130516ae2..0895f0ae4ca 100644 --- a/debezium-connector-oracle/pom.xml +++ b/debezium-connector-oracle/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../ + ../debezium-parent/pom.xml 4.0.0 debezium-connector-oracle diff --git a/debezium-connector-postgres/pom.xml b/debezium-connector-postgres/pom.xml index 46f0d6395ba..d8f788b8a41 100644 --- a/debezium-connector-postgres/pom.xml +++ b/debezium-connector-postgres/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../ + ../debezium-parent/pom.xml 4.0.0 debezium-connector-postgres diff --git a/debezium-connector-sqlserver/pom.xml b/debezium-connector-sqlserver/pom.xml index b18ddac5eae..15245e70b36 100644 --- a/debezium-connector-sqlserver/pom.xml +++ b/debezium-connector-sqlserver/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../ + ../debezium-parent/pom.xml 4.0.0 debezium-connector-sqlserver diff --git a/debezium-core/pom.xml b/debezium-core/pom.xml index e3fb9704ea4..d539e2635a8 100644 --- a/debezium-core/pom.xml +++ b/debezium-core/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-core diff --git a/debezium-ddl-parser/pom.xml b/debezium-ddl-parser/pom.xml index e107eb5e5a1..bda91ae16c2 100644 --- a/debezium-ddl-parser/pom.xml +++ b/debezium-ddl-parser/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-ddl-parser diff --git a/debezium-embedded/pom.xml b/debezium-embedded/pom.xml index 7ba5b183484..fbd9276fbcb 100644 --- a/debezium-embedded/pom.xml +++ b/debezium-embedded/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-embedded diff --git a/debezium-microbenchmark-oracle/pom.xml b/debezium-microbenchmark-oracle/pom.xml index e2c787647b7..e9adfc4bab8 100644 --- a/debezium-microbenchmark-oracle/pom.xml +++ b/debezium-microbenchmark-oracle/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../ + ../debezium-parent/pom.xml 4.0.0 debezium-microbenchmark-oracle @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/debezium-microbenchmark/pom.xml b/debezium-microbenchmark/pom.xml index 36700907320..75d608c490f 100644 --- a/debezium-microbenchmark/pom.xml +++ b/debezium-microbenchmark/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-microbenchmark diff --git a/debezium-parent/pom.xml b/debezium-parent/pom.xml new file mode 100644 index 00000000000..33b92be526e --- /dev/null +++ b/debezium-parent/pom.xml @@ -0,0 +1,743 @@ + + + + + io.debezium + debezium + 1.5.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + debezium-parent + Debezium Parent POM + Parent POM for all modules and conectors + pom + + + 2.6.1 + 2.12 + 4.2.0 + 3.5.8 + 2.10.2 + 1.7.30 + 1.2.17 + 4.1.50.Final + + 5.5.1 + + + 42.2.14 + 5.7 + 8.0.21 + 0.25.0 + 3.6 + 4.2.1 + 7.2.2.jre8 + 12.2.0.1 + + + 3.8.0 + + + 4.7.2 + + + 1.12.0.Final + + + 0.33.0 + + + 4.8.1 + + + 3.0.7 + 20.0.0 + + + 4.13.1 + 1.4 + 1.21 + 3.0.0 + 4.0.1 + 1.15.1 + 2.4.0 + + + 3.8.1 + 3.1.0 + 3.1.1 + 3.1.1 + 3.0.0-M2 + + 3.0.2 + 3.1.0 + 3.1.1 + 2.5 + 0.4 + 0.31.0 + 1.6.8 + 3.8.0 + 3.1.1 + 2.11.0 + 3.0.0-M3 + 3.1.1 + 2.5.3 + 1.3.2 + ${version.surefire.plugin} + 8.32 + 0.11.5 + 1.0.8 + 0.21.0 + 1.9.1 + + + Debezium community + + + true + + + false + + + false + + + format + sort + + + + + + + + + + + + connector-distribution + + + true + + + true + + + + + + + + com.fasterxml.jackson.core + jackson-core + ${version.jackson} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${version.jackson} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${version.jackson} + + + com.fasterxml.jackson.core + jackson-databind + ${version.jackson} + true + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${version.jackson} + true + + + + + org.apache.kafka + connect-api + ${version.kafka} + + + org.apache.kafka + connect-runtime + ${version.kafka} + + + org.apache.kafka + connect-json + ${version.kafka} + + + org.apache.kafka + connect-file + ${version.kafka} + + + org.apache.kafka + connect-transforms + ${version.kafka} + + + + + org.apache.kafka + kafka_${version.kafka.scala} + ${version.kafka} + + + org.apache.kafka + kafka-clients + ${version.kafka} + + + org.apache.zookeeper + zookeeper + ${version.zookeeper} + + + org.apache.kafka + kafka_${version.kafka.scala} + ${version.kafka} + test + + + org.apache.curator + curator-test + ${version.curator} + + + io.confluent + kafka-connect-avro-converter + ${version.confluent.platform} + + + + org.antlr + antlr4-runtime + ${antlr.version} + + + + + + org.postgresql + postgresql + ${version.postgresql.driver} + + + + + com.google.protobuf + protobuf-java + ${version.com.google.protobuf} + + + + + mysql + mysql-connector-java + ${version.mysql.driver} + + + com.zendesk + mysql-binlog-connector-java + ${version.mysql.binlog} + + + mil.nga + wkb + 1.0.2 + + + + + org.mongodb + mongodb-driver-sync + ${version.mongo.driver} + + + + + com.microsoft.sqlserver + mssql-jdbc + ${version.sqlserver.driver} + + + + + org.slf4j + slf4j-api + ${version.org.slf4j} + + + org.slf4j + slf4j-log4j12 + ${version.org.slf4j} + + + log4j + log4j + ${version.log4j} + + + + + org.codehaus.groovy + groovy + ${version.groovy} + + + org.codehaus.groovy + groovy-json + ${version.groovy} + + + org.codehaus.groovy + groovy-jsr223 + ${version.groovy} + + + org.graalvm.js + js + ${version.graalvm.js} + + + org.graalvm.js + js-scriptengine + ${version.graalvm.js} + + + + + org.testcontainers + testcontainers-bom + ${version.testcontainers} + pom + import + + + com.squareup.okhttp3 + okhttp + ${version.okhttp} + + + + + junit + junit + ${version.junit} + + + org.easytesting + fest-assert + ${version.fest} + + + org.openjdk.jmh + jmh-core + ${version.jmh} + + + org.openjdk.jmh + jmh-generator-annprocess + ${version.jmh} + + + org.mockito + mockito-core + ${version.mockito} + + + org.awaitility + awaitility + ${version.awaitility} + + + com.jayway.jsonpath + json-path + ${version.jsonpath} + + + + + io.debezium + debezium-api + ${project.version} + + + io.debezium + debezium-core + ${project.version} + + + io.debezium + debezium-scripting + ${project.version} + + + io.debezium + debezium-embedded + ${project.version} + + + io.debezium + debezium-connector-jdbc + ${project.version} + + + io.debezium + debezium-connector-postgres + ${project.version} + + + io.debezium + debezium-connector-postgres-test + ${project.version} + + + io.debezium + debezium-connector-mysql + ${project.version} + + + io.debezium + debezium-ddl-parser + ${project.version} + + + io.debezium + debezium-connector-mongodb + ${project.version} + + + io.debezium + debezium-connector-sqlserver + ${project.version} + + + + + io.debezium + debezium-core + ${project.version} + test-jar + + + io.debezium + debezium-embedded + ${project.version} + test-jar + + + io.debezium + debezium-connector-mysql + ${project.version} + test-jar + + + javax.xml.bind + jaxb-api + 2.3.1 + + + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${version.failsafe.plugin} + + ${debug.argline} ${modules.argline} ${test.argline} + ${useSystemClassLoader} + + + + com.googlecode.maven-java-formatter-plugin + maven-java-formatter-plugin + ${version.google.formatter.plugin} + + + io.fabric8 + docker-maven-plugin + ${version.docker.maven.plugin} + + + com.github.os72 + protoc-jar-maven-plugin + ${version.protoc.maven.plugin} + + + net.revelc.code.formatter + formatter-maven-plugin + ${version.code.formatter} + + + io.debezium + debezium-ide-configs + ${project.version} + + + + /eclipse/debezium-formatter.xml + ${format.skip} + + + + net.revelc.code + impsort-maven-plugin + ${version.impsort} + + java.,javax.,org.,com.,io. + * + false + ${format.skip} + true + + + + org.jboss.jandex + jandex-maven-plugin + ${version.jandex} + + + org.revapi + revapi-maven-plugin + ${version.revapi.plugin} + + + io.debezium + debezium-revapi + ${project.version} + + + org.revapi + revapi-java + ${version.revapi-java.plugin} + + + + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + process-sources + + ${format.formatter.goal} + + + + + + net.revelc.code + impsort-maven-plugin + + true + + + + sort-imports + + ${format.imports.goal} + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar-no-fork + + + + attach-test-sources + + test-jar-no-fork + + + + + + com.googlecode.maven-java-formatter-plugin + maven-java-formatter-plugin + + ${project.basedir}/support/eclipse-formatting.xml + LF + + + + + org.apache.maven.plugins + maven-jar-plugin + + + test-jar + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + java.io.tmpdir + ${project.build.directory} + + + skipLongRunningTests + ${skipLongRunningTests} + + + dbz.test.data.dir + ${project.build.directory}/data + + + -Djava.awt.headless=true ${debug.argline} ${modules.argline} + + false + true + ${forkCount} + ${reuseForks} + ${useSystemClassLoader} + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + io.debezium + debezium-checkstyle + ${project.version} + + + + checkstyle.xml + checkstyle-suppressions.xml + checkstyle.suppressions.file + true + true + false + error + true + + ${project.build.sourceDirectory} + ${project.build.testSourceDirectory} + + + + + check-style + verify + + checkstyle + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + parse-version + + + parse-version + + validate + + + + + org.revapi + revapi-maven-plugin + + false + + \d+\.\d+\.\d+\.Final + xml + + + + revapi/revapi-configuration.xml + + + + revapi/debezium-api-changes.xml + + + analysisConfiguration/version-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} + + + + + + + + check + + + + + + + + + + debug + + + debug + true + + + + + -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=1044 + + + + diff --git a/debezium-quarkus-outbox/integration-tests/pom.xml b/debezium-quarkus-outbox/integration-tests/pom.xml index 96fcbd9fbb5..622642205b7 100644 --- a/debezium-quarkus-outbox/integration-tests/pom.xml +++ b/debezium-quarkus-outbox/integration-tests/pom.xml @@ -7,7 +7,7 @@ io.debezium debezium-quarkus-outbox-parent 1.5.0-SNAPSHOT - ../pom.xml + ../pom.xml debezium-quarkus-outbox-integration-tests diff --git a/debezium-quarkus-outbox/pom.xml b/debezium-quarkus-outbox/pom.xml index b2e83d5c701..77e01652ac8 100644 --- a/debezium-quarkus-outbox/pom.xml +++ b/debezium-quarkus-outbox/pom.xml @@ -7,7 +7,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml debezium-quarkus-outbox-parent diff --git a/debezium-quarkus-outbox/runtime/pom.xml b/debezium-quarkus-outbox/runtime/pom.xml index a13620b0780..a907db04575 100644 --- a/debezium-quarkus-outbox/runtime/pom.xml +++ b/debezium-quarkus-outbox/runtime/pom.xml @@ -7,7 +7,7 @@ io.debezium debezium-quarkus-outbox-parent 1.5.0-SNAPSHOT - ../pom.xml + ../pom.xml debezium-quarkus-outbox diff --git a/debezium-scripting/pom.xml b/debezium-scripting/pom.xml index d3bc7607f9e..94ca1c23028 100644 --- a/debezium-scripting/pom.xml +++ b/debezium-scripting/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-scripting diff --git a/debezium-server/pom.xml b/debezium-server/pom.xml index b18ef533730..f3d5ddf8d7f 100644 --- a/debezium-server/pom.xml +++ b/debezium-server/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-server diff --git a/debezium-testing/pom.xml b/debezium-testing/pom.xml index 4ae3bf148b5..c5e502a4334 100644 --- a/debezium-testing/pom.xml +++ b/debezium-testing/pom.xml @@ -4,7 +4,7 @@ io.debezium debezium-parent 1.5.0-SNAPSHOT - ../pom.xml + ../debezium-parent/pom.xml 4.0.0 debezium-testing diff --git a/pom.xml b/pom.xml index e7f50c3e153..07dd56c4d94 100644 --- a/pom.xml +++ b/pom.xml @@ -9,9 +9,9 @@ 4.0.0 io.debezium - debezium-parent + debezium 1.5.0-SNAPSHOT - Debezium Parent POM + Debezium POM Debezium is an open source change data capture platform pom https://debezium.io @@ -55,56 +55,6 @@ 1.8 8 - - 2.6.1 - 2.12 - 4.2.0 - 3.5.8 - 2.10.2 - 1.7.30 - 1.2.17 - 4.1.50.Final - - 5.5.1 - - - 42.2.14 - 5.7 - 8.0.21 - 0.25.0 - 3.6 - 4.2.1 - 7.2.2.jre8 - 12.2.0.1 - - - 3.8.0 - - - 4.7.2 - - - 1.12.0.Final - - - 0.33.0 - - - 4.8.1 - - - 3.0.7 - 20.0.0 - - - 4.13.1 - 1.4 - 1.21 - 3.0.0 - 4.0.1 - 1.15.1 - 2.4.0 - 3.8.1 3.1.0 @@ -133,45 +83,12 @@ 0.21.0 1.9.1 - - Debezium community - - - true - - - false - - - false - - - format - sort - - - - - - - - - - - - connector-distribution - - - true - - - true - https://s01.oss.sonatype.org/ + debezium-parent support/checkstyle support/ide-configs support/revapi @@ -229,330 +146,6 @@ - - - - - com.fasterxml.jackson.core - jackson-core - ${version.jackson} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${version.jackson} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${version.jackson} - - - com.fasterxml.jackson.core - jackson-databind - ${version.jackson} - true - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${version.jackson} - true - - - - - org.apache.kafka - connect-api - ${version.kafka} - - - org.apache.kafka - connect-runtime - ${version.kafka} - - - org.apache.kafka - connect-json - ${version.kafka} - - - org.apache.kafka - connect-file - ${version.kafka} - - - org.apache.kafka - connect-transforms - ${version.kafka} - - - - - org.apache.kafka - kafka_${version.kafka.scala} - ${version.kafka} - - - org.apache.kafka - kafka-clients - ${version.kafka} - - - org.apache.zookeeper - zookeeper - ${version.zookeeper} - - - org.apache.kafka - kafka_${version.kafka.scala} - ${version.kafka} - test - - - org.apache.curator - curator-test - ${version.curator} - - - io.confluent - kafka-connect-avro-converter - ${version.confluent.platform} - - - - org.antlr - antlr4-runtime - ${antlr.version} - - - - - - org.postgresql - postgresql - ${version.postgresql.driver} - - - - - com.google.protobuf - protobuf-java - ${version.com.google.protobuf} - - - - - mysql - mysql-connector-java - ${version.mysql.driver} - - - com.zendesk - mysql-binlog-connector-java - ${version.mysql.binlog} - - - mil.nga - wkb - 1.0.2 - - - - - org.mongodb - mongodb-driver-sync - ${version.mongo.driver} - - - - - com.microsoft.sqlserver - mssql-jdbc - ${version.sqlserver.driver} - - - - - org.slf4j - slf4j-api - ${version.org.slf4j} - - - org.slf4j - slf4j-log4j12 - ${version.org.slf4j} - - - log4j - log4j - ${version.log4j} - - - - - org.codehaus.groovy - groovy - ${version.groovy} - - - org.codehaus.groovy - groovy-json - ${version.groovy} - - - org.codehaus.groovy - groovy-jsr223 - ${version.groovy} - - - org.graalvm.js - js - ${version.graalvm.js} - - - org.graalvm.js - js-scriptengine - ${version.graalvm.js} - - - - - org.testcontainers - testcontainers-bom - ${version.testcontainers} - pom - import - - - com.squareup.okhttp3 - okhttp - ${version.okhttp} - - - - - junit - junit - ${version.junit} - - - org.easytesting - fest-assert - ${version.fest} - - - org.openjdk.jmh - jmh-core - ${version.jmh} - - - org.openjdk.jmh - jmh-generator-annprocess - ${version.jmh} - - - org.mockito - mockito-core - ${version.mockito} - - - org.awaitility - awaitility - ${version.awaitility} - - - com.jayway.jsonpath - json-path - ${version.jsonpath} - - - - - io.debezium - debezium-api - ${project.version} - - - io.debezium - debezium-core - ${project.version} - - - io.debezium - debezium-scripting - ${project.version} - - - io.debezium - debezium-embedded - ${project.version} - - - io.debezium - debezium-connector-jdbc - ${project.version} - - - io.debezium - debezium-connector-postgres - ${project.version} - - - io.debezium - debezium-connector-postgres-test - ${project.version} - - - io.debezium - debezium-connector-mysql - ${project.version} - - - io.debezium - debezium-ddl-parser - ${project.version} - - - io.debezium - debezium-connector-mongodb - ${project.version} - - - io.debezium - debezium-connector-sqlserver - ${project.version} - - - - - io.debezium - debezium-core - ${project.version} - test-jar - - - io.debezium - debezium-embedded - ${project.version} - test-jar - - - io.debezium - debezium-connector-mysql - ${project.version} - test-jar - - - javax.xml.bind - jaxb-api - 2.3.1 - - - - - - @@ -621,80 +214,6 @@ maven-gpg-plugin ${version.gpg.plugin} - - org.apache.maven.plugins - maven-failsafe-plugin - ${version.failsafe.plugin} - - ${debug.argline} ${modules.argline} ${test.argline} - ${useSystemClassLoader} - - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - ${version.google.formatter.plugin} - - - io.fabric8 - docker-maven-plugin - ${version.docker.maven.plugin} - - - com.github.os72 - protoc-jar-maven-plugin - ${version.protoc.maven.plugin} - - - net.revelc.code.formatter - formatter-maven-plugin - ${version.code.formatter} - - - io.debezium - debezium-ide-configs - ${project.version} - - - - /eclipse/debezium-formatter.xml - ${format.skip} - - - - net.revelc.code - impsort-maven-plugin - ${version.impsort} - - java.,javax.,org.,com.,io. - * - false - ${format.skip} - true - - - - org.jboss.jandex - jandex-maven-plugin - ${version.jandex} - - - org.revapi - revapi-maven-plugin - ${version.revapi.plugin} - - - io.debezium - debezium-revapi - ${project.version} - - - org.revapi - revapi-java - ${version.revapi-java.plugin} - - - org.codehaus.mojo build-helper-maven-plugin @@ -703,52 +222,6 @@ - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - ${format.formatter.goal} - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - sort-imports - - ${format.imports.goal} - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar-no-fork - - - - attach-test-sources - - test-jar-no-fork - - - - org.apache.maven.plugins maven-release-plugin @@ -783,14 +256,6 @@ ${project.build.sourceEncoding} - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - - ${project.basedir}/support/eclipse-formatting.xml - LF - - org.apache.maven.plugins maven-enforcer-plugin @@ -810,168 +275,14 @@ - - - org.apache.maven.plugins - maven-jar-plugin - - - test-jar - - test-jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - java.io.tmpdir - ${project.build.directory} - - - skipLongRunningTests - ${skipLongRunningTests} - - - dbz.test.data.dir - ${project.build.directory}/data - - - -Djava.awt.headless=true ${debug.argline} ${modules.argline} - - false - true - ${forkCount} - ${reuseForks} - ${useSystemClassLoader} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - io.debezium - debezium-checkstyle - ${project.version} - - - - checkstyle.xml - checkstyle-suppressions.xml - checkstyle.suppressions.file - true - true - false - error - true - - ${project.build.sourceDirectory} - ${project.build.testSourceDirectory} - - - - - check-style - verify - - checkstyle - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - parse-version - - - parse-version - - validate - - - - - org.revapi - revapi-maven-plugin - - false - - \d+\.\d+\.\d+\.Final - xml - - - - revapi/revapi-configuration.xml - - - - revapi/debezium-api-changes.xml - - - analysisConfiguration/version-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} - - - - - - - - check - - - - - - - debug - - - debug - true - - - - - -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=1044 - - - assembly false - - - release diff --git a/support/checkstyle/pom.xml b/support/checkstyle/pom.xml index 0f80d6944c6..66c58233752 100644 --- a/support/checkstyle/pom.xml +++ b/support/checkstyle/pom.xml @@ -1,77 +1,17 @@ - org.jboss - jboss-parent - 36 - + io.debezium + debezium + 1.5.0-SNAPSHOT + ../../pom.xml 4.0.0 - io.debezium debezium-checkstyle - 1.5.0-SNAPSHOT Debezium Checkstyle Rules Contains the definitions for the Debezium commons code style and conventions - - - UTF-8 - - 3.0.0-M2 - 3.0.2 - 3.1.0 - 3.1.1 - 3.8.1 - 8.32 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.compiler.plugin} - - false - false - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${version.checkstyle.plugin} - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - - 3.0.5 - - - - - - - com.puppycrawl.tools @@ -85,4 +25,5 @@ + diff --git a/support/checkstyle/src/main/java/io/debezium/checkstyle/Header.java b/support/checkstyle/src/main/java/io/debezium/checkstyle/Header.java index 8ea4b2dee1b..f369c8ba055 100644 --- a/support/checkstyle/src/main/java/io/debezium/checkstyle/Header.java +++ b/support/checkstyle/src/main/java/io/debezium/checkstyle/Header.java @@ -71,12 +71,16 @@ public void setHeaderFile(String aFileName) { protected boolean isExcluded(File file) { // See whether this file is excluded ... String filename = file.getAbsolutePath().replace(File.separator, "/"); - if (filename.startsWith(workingDirPath)) filename = filename.substring(workingDirPathLength); + if (filename.startsWith(workingDirPath)) { + filename = filename.substring(workingDirPathLength); + } filename = filename.replaceAll(".*/src/(main|test)/(java|resources)/", ""); // First try one of the explicit class names ... for (String excludedFileName : excludedFileSet) { - if (filename.endsWith(excludedFileName)) return true; + if (filename.endsWith(excludedFileName)) { + return true; + } } // Next try to evaluate the pattern ... @@ -88,7 +92,9 @@ protected boolean isExcluded(File file) { @Override protected void processFiltered(File aFile, FileText fileText) { - if (isExcluded(aFile)) return; + if (isExcluded(aFile)) { + return; + } super.processFiltered(aFile, fileText); } } diff --git a/support/checkstyle/src/main/java/io/debezium/checkstyle/IllegalImport.java b/support/checkstyle/src/main/java/io/debezium/checkstyle/IllegalImport.java index a95c9f73940..c760e654294 100644 --- a/support/checkstyle/src/main/java/io/debezium/checkstyle/IllegalImport.java +++ b/support/checkstyle/src/main/java/io/debezium/checkstyle/IllegalImport.java @@ -42,7 +42,7 @@ public void setMessage(String message) { @Override public int[] getDefaultTokens() { - return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT}; + return new int[]{ TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT }; } @Override @@ -63,7 +63,8 @@ public void visitToken(DetailAST aAST) { final FullIdent imp; if (aAST.getType() == TokenTypes.IMPORT) { imp = FullIdent.createFullIdentBelow(aAST); - } else { + } + else { // handle case of static imports of method names imp = FullIdent.createFullIdent(aAST.getFirstChild().getNextSibling()); } diff --git a/support/checkstyle/src/main/java/io/debezium/checkstyle/JavaDocUtil.java b/support/checkstyle/src/main/java/io/debezium/checkstyle/JavaDocUtil.java index 0c36b24b6af..4d54d751d70 100644 --- a/support/checkstyle/src/main/java/io/debezium/checkstyle/JavaDocUtil.java +++ b/support/checkstyle/src/main/java/io/debezium/checkstyle/JavaDocUtil.java @@ -51,7 +51,8 @@ public static JavadocTags getJavadocTags(TextBlock aCmt, JavadocTagType aTagType } if (JavadocTagInfo.isValidName(tagName)) { tags.add(new JavadocTag(line, col, tagName, content.trim())); - } else { + } + else { invalidTags.add(new InvalidJavadocTag(line, col, tagName)); } } @@ -65,13 +66,14 @@ else if (aTagType.equals(JavadocTagType.ALL) || aTagType.equals(JavadocTagType.I if (!commentMatcher.find()) { commentContents = s; // No leading asterisks, still valid commentOffset = 0; - } else { + } + else { commentContents = commentMatcher.group(1); commentOffset = commentMatcher.start(1) - 1; } final Pattern tagPattern = CommonUtil.createPattern(".*?\\{@(\\p{Alpha}+)\\s+([^\\}]*)"); // The last '}' may - // appear on the next - // line ... + // appear on the next + // line ... final Matcher tagMatcher = tagPattern.matcher(commentContents); while (tagMatcher.find()) { if (tagMatcher.groupCount() == 2) { @@ -84,7 +86,8 @@ else if (aTagType.equals(JavadocTagType.ALL) || aTagType.equals(JavadocTagType.I } if (JavadocTagInfo.isValidName(tagName)) { tags.add(new JavadocTag(line, col, tagName, tagValue)); - } else { + } + else { invalidTags.add(new InvalidJavadocTag(line, col, tagName)); } } diff --git a/support/checkstyle/src/main/java/io/debezium/checkstyle/UnusedImports.java b/support/checkstyle/src/main/java/io/debezium/checkstyle/UnusedImports.java index f8f5d2801f6..5f2d4f0310f 100644 --- a/support/checkstyle/src/main/java/io/debezium/checkstyle/UnusedImports.java +++ b/support/checkstyle/src/main/java/io/debezium/checkstyle/UnusedImports.java @@ -4,6 +4,7 @@ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ package io.debezium.checkstyle; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -33,7 +34,7 @@ */ public class UnusedImports extends UnusedImportsCheck { - private static final String[] DEBUG_CLASSNAMES = {};// {"ModeShapeSingleUseTest"}; + private static final String[] DEBUG_CLASSNAMES = {}; private static final Set DEBUG_CLASSNAMES_SET = new HashSet<>(Arrays.asList(DEBUG_CLASSNAMES)); /** @@ -94,7 +95,9 @@ public void visitToken(DetailAST aAST) { } if (aAST.getType() == TokenTypes.IDENT) { super.visitToken(aAST); - if (collect) processIdent(aAST); + if (collect) { + processIdent(aAST); + } } else if (aAST.getType() == TokenTypes.IMPORT) { super.visitToken(aAST); @@ -121,12 +124,12 @@ else if (aAST.getType() == TokenTypes.STATIC_IMPORT) { protected void processIdent(DetailAST aAST) { final int parentType = aAST.getParent().getType(); if (((parentType != TokenTypes.DOT) && (parentType != TokenTypes.METHOD_DEF)) - || ((parentType == TokenTypes.DOT) && (aAST.getNextSibling() != null))) { + || ((parentType == TokenTypes.DOT) && (aAST.getNextSibling() != null))) { referenced.add(aAST.getText()); } } - protected void processJavaDocLinkParameters( DetailAST aAST ) { + protected void processJavaDocLinkParameters(DetailAST aAST) { final FileContents contents = getFileContents(); final int lineNo = aAST.getLineNo(); final TextBlock cmt = contents.getJavadocBefore(lineNo); @@ -159,7 +162,8 @@ protected void processJavaDocTag(JavadocTag tag) { String methodCall = matcher.group(2); processClassOrMethodReference(methodCall); } - } else if (tag.isParamTag()) { + } + else if (tag.isParamTag()) { String paramText = tag.getFirstArg(); print("Found parameter text: ", paramText); // Find the links to classe @@ -169,7 +173,8 @@ protected void processJavaDocTag(JavadocTag tag) { String linkValue = paramsMatcher.group(1); processClassOrMethodReference(linkValue); } - } else if (tag.isReturnTag()) { + } + else if (tag.isReturnTag()) { String returnText = tag.getFirstArg(); print("Found return text: ", returnText); // Find the links to classe @@ -198,7 +203,9 @@ protected void processClassOrMethodReference(String text) { if (params != null) { print("Found params: ", params); for (String param : params.split(",")) { - if ("...".equals(param)) continue; + if ("...".equals(param)) { + continue; + } param = param.replace("...", "").trim(); print("Found param: ", param); referenced.add(param); @@ -232,7 +239,7 @@ private void processStaticImport(DetailAST aAST) { } @Override - public void finishTree( DetailAST aRootAST ) { + public void finishTree(DetailAST aRootAST) { // loop over all the imports to see if referenced. for (final FullIdent imp : imports) { if (!referenced.contains(CommonUtil.baseClassName(imp.getText()))) { @@ -243,7 +250,7 @@ public void finishTree( DetailAST aRootAST ) { } } - private void print( Object... messages ) { + private void print(Object... messages) { if (print) { // CHECKSTYLE IGNORE check FOR NEXT 4 LINES for (Object msg : messages) { diff --git a/support/ide-configs/pom.xml b/support/ide-configs/pom.xml index a0df350c2c4..6045338791b 100644 --- a/support/ide-configs/pom.xml +++ b/support/ide-configs/pom.xml @@ -1,40 +1,15 @@ - org.jboss - jboss-parent - 35 - + io.debezium + debezium + 1.5.0-SNAPSHOT + ../../pom.xml 4.0.0 - io.debezium debezium-ide-configs - 1.5.0-SNAPSHOT Debezium IDE Formatting Rules Contains the definitions for the Debezium commons code style and conventions applicable in formatter and IDEs - - - UTF-8 - - 3.0.2 - 3.8.1 - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - diff --git a/support/revapi/pom.xml b/support/revapi/pom.xml index f65d30a9332..04656105c2f 100644 --- a/support/revapi/pom.xml +++ b/support/revapi/pom.xml @@ -1,40 +1,15 @@ - org.jboss - jboss-parent - 35 - + io.debezium + debezium + 1.5.0-SNAPSHOT + ../../pom.xml 4.0.0 - io.debezium debezium-revapi - 1.5.0-SNAPSHOT Debezium Revapi Rules Contains the configuration of the Revapi API checker and the list of the API changes in the Debezium APIs. - - - UTF-8 - - 3.0.2 - 3.8.1 - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - -