DBZ-4669 Use the newer version of plugins to consolidate remaining du…

…plicates plugin versions
spieps · Jan 11, 2023 · f0a1fa8 · f0a1fa8
1 parent e5d16b1
commit f0a1fa8
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 29 deletions.
diff --git a/.github/workflows/debezium-workflow.yml b/.github/workflows/debezium-workflow.yml
@@ -259,7 +259,7 @@ jobs:
           restore-keys: |
             maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
 
-      # Since we do a complete build conditionally above, we should always either be abel to rely on the
+      # Since we do a complete build conditionally above, we should always either be able to rely on the
       # build step to have installed all needed artifacts or the artifacts that exist from a prior run
       # in order to satisfy dependencies for the format, checkstyle, and import sort checks.  If the
       # dependencies change, a new cache should be generated and a full build step executed, so this

diff --git a/debezium-api/pom.xml b/debezium-api/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-api</artifactId>

diff --git a/debezium-assembly-descriptors/pom.xml b/debezium-assembly-descriptors/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-assembly-descriptors</artifactId>

diff --git a/debezium-bom/pom.xml b/debezium-bom/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-build-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-bom</artifactId>

diff --git a/debezium-core/pom.xml b/debezium-core/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-core</artifactId>

diff --git a/debezium-core/src/main/java/io/debezium/pipeline/Sizeable.java b/debezium-core/src/main/java/io/debezium/pipeline/Sizeable.java
@@ -7,7 +7,7 @@
 
 /**
  * Calculates or estimates the size of the object
- * 
+ *
  * @author Jiri Pechanec
  *
  */

diff --git a/debezium-core/src/main/java/io/debezium/pipeline/signal/ExecuteSnapshot.java b/debezium-core/src/main/java/io/debezium/pipeline/signal/ExecuteSnapshot.java
@@ -23,7 +23,7 @@
  * The action to trigger an ad-hoc snapshot.
  * The action parameters are {@code type} of snapshot and list of {@code data-collections} on which the
  * snapshot will be executed.
- * 
+ *
  * @author Jiri Pechanec
  *
  */

diff --git a/...o/debezium/pipeline/source/snapshot/incremental/IncrementalSnapshotChangeEventSource.java b/...o/debezium/pipeline/source/snapshot/incremental/IncrementalSnapshotChangeEventSource.java
@@ -14,7 +14,7 @@
 
 /**
  * A Contract t
- * 
+ *
  * @author Jiri Pechanec
  *
  * @param <T> data collection id class

diff --git a/debezium-core/src/main/java/io/debezium/transforms/tracing/ActivateTracingSpan.java b/debezium-core/src/main/java/io/debezium/transforms/tracing/ActivateTracingSpan.java
@@ -39,9 +39,9 @@
  * The application then needs to export its tracing active span context into a database field.
  * The SMT looks for a predefined field name in the {@code after} block
  * and when found it extracts the parent span from it.
- * 
+ *
  * @see {@link EventDispatcher} for example of such implementation
- * 
+ *
  *
  * @param <R> the subtype of {@link ConnectRecord} on which this transformation will operate
  * @author Jiri Pechanec

diff --git a/debezium-core/src/main/java/io/debezium/util/Collect.java b/debezium-core/src/main/java/io/debezium/util/Collect.java
@@ -290,7 +290,7 @@ public static <T> void set(List<T> list, int index, T value, T defaultValue) {
     /**
      * Remove the content of one set from an another one.
      *
-     * @param subtrahend the main set 
+     * @param subtrahend the main set
      * @param minuend the elements to be removed
      */
     public static <T> Set<T> minus(Set<T> subtrahend, Set<T> minuend) {

diff --git a/debezium-core/src/test/java/io/debezium/junit/logging/LogInterceptor.java b/debezium-core/src/test/java/io/debezium/junit/logging/LogInterceptor.java
@@ -41,7 +41,7 @@ protected LogInterceptor() {
 
     /**
      * Provides a log interceptor based on the logger that emits the message.
-     * 
+     *
      * @param loggerName logger that emits the log message
      */
     public LogInterceptor(String loggerName) {
@@ -57,7 +57,7 @@ public LogInterceptor(String loggerName) {
 
     /**
      * Provides a log interceptor based on the logger that emits the message.
-     * 
+     *
      * @param clazz class that emits the log message
      */
     public LogInterceptor(Class<?> clazz) {

diff --git a/debezium-ddl-parser/pom.xml b/debezium-ddl-parser/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-ddl-parser</artifactId>

diff --git a/debezium-microbenchmark-oracle/pom.xml b/debezium-microbenchmark-oracle/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-microbenchmark-oracle</artifactId>

diff --git a/debezium-microbenchmark/pom.xml b/debezium-microbenchmark/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-microbenchmark</artifactId>

diff --git a/debezium-parent/pom.xml b/debezium-parent/pom.xml
@@ -15,11 +15,6 @@
     <packaging>pom</packaging>
     <properties>
 
-        <!-- Maven Plugins -->
-        <version.docker.maven.plugin>0.40.2</version.docker.maven.plugin>
-        <version.code.formatter>2.16.0</version.code.formatter>
-        <version.impsort>1.6.2</version.impsort>
-
         <!-- Dockerfiles -->
         <docker.maintainer>Debezium community</docker.maintainer>
 

diff --git a/debezium-quarkus-outbox/integration-tests/pom.xml b/debezium-quarkus-outbox/integration-tests/pom.xml
@@ -7,7 +7,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-quarkus-outbox-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>debezium-quarkus-outbox-integration-tests</artifactId>

diff --git a/debezium-quarkus-outbox/pom.xml b/debezium-quarkus-outbox/pom.xml
@@ -7,7 +7,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>debezium-quarkus-outbox-parent</artifactId>

diff --git a/debezium-quarkus-outbox/runtime/pom.xml b/debezium-quarkus-outbox/runtime/pom.xml
@@ -7,7 +7,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-quarkus-outbox-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>debezium-quarkus-outbox</artifactId>

diff --git a/debezium-scripting/debezium-scripting-languages/pom.xml b/debezium-scripting/debezium-scripting-languages/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-scripting-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-scripting-languages</artifactId>

diff --git a/debezium-scripting/debezium-scripting/pom.xml b/debezium-scripting/debezium-scripting/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-scripting-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-scripting</artifactId>

diff --git a/debezium-scripting/pom.xml b/debezium-scripting/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-scripting-parent</artifactId>

diff --git a/debezium-server/pom.xml b/debezium-server/pom.xml
@@ -4,7 +4,7 @@
         <groupId>io.debezium</groupId>
         <artifactId>debezium-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
-	<relativePath>../debezium-parent/pom.xml</relativePath>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>debezium-server</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
         <version.assembly.plugin>3.1.1</version.assembly.plugin>
         <version.war.plugin>2.5</version.war.plugin>
         <version.google.formatter.plugin>0.4</version.google.formatter.plugin>
-        <version.docker.maven.plugin>0.31.0</version.docker.maven.plugin>
+        <version.docker.maven.plugin>0.40.2</version.docker.maven.plugin>
         <version.staging.plugin>1.6.12</version.staging.plugin>
         <version.protoc.maven.plugin>3.8.0</version.protoc.maven.plugin>
         <version.javadoc.plugin>3.4.0</version.javadoc.plugin>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     /**
      * Calculates or estimates the size of the object
-     *
+     *
      * @author Jiri Pechanec
      *
      */
@@ Expand Down @@