From 05fb9f24c5cfc70c3f30b5535e56904b685c3f44 Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Mon, 6 Feb 2023 13:00:05 -0500
Subject: [PATCH] DBZ-5758 Relocated common artifacts in
 debezium-quarkus-outbox-common module

---
 .../deployment}/pom.xml                       |  4 +--
 .../DebeziumOutboxCommonConfig.java           |  0
 .../deployment/OutboxCommonProcessor.java     |  0
 .../OutboxEventEntityBuildItem.java           |  0
 .../deployment/OutboxEventHbmWriter.java      |  0
 debezium-quarkus-outbox-common/pom.xml        | 34 +++++++++++++++++++
 .../runtime}/pom.xml                          |  4 +--
 .../outbox/quarkus/ExportedEvent.java         |  0
 .../quarkus/internal/AbstractEventWriter.java |  0
 .../AdditionalJaxbMappingProducerImpl.java    |  0
 .../DebeziumOutboxCommonRuntimeConfig.java    |  0
 .../quarkus/internal/DebeziumTextMap.java     |  0
 .../internal/JsonNodeAttributeConverter.java  |  0
 .../quarkus/internal/OutboxConstants.java     |  0
 debezium-quarkus-outbox-reactive/pom.xml      | 12 +++++--
 debezium-quarkus-outbox/pom.xml               | 12 +++++--
 pom.xml                                       |  1 +
 17 files changed, 59 insertions(+), 8 deletions(-)
 rename {debezium-quarkus-outbox/deployment-common => debezium-quarkus-outbox-common/deployment}/pom.xml (93%)
 rename {debezium-quarkus-outbox/deployment-common => debezium-quarkus-outbox-common/deployment}/src/main/java/io/debezium/outbox/quarkus/deployment/DebeziumOutboxCommonConfig.java (100%)
 rename {debezium-quarkus-outbox/deployment-common => debezium-quarkus-outbox-common/deployment}/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java (100%)
 rename {debezium-quarkus-outbox/deployment-common => debezium-quarkus-outbox-common/deployment}/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventEntityBuildItem.java (100%)
 rename {debezium-quarkus-outbox/deployment-common => debezium-quarkus-outbox-common/deployment}/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventHbmWriter.java (100%)
 create mode 100644 debezium-quarkus-outbox-common/pom.xml
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/pom.xml (94%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/ExportedEvent.java (100%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventWriter.java (100%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java (100%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumOutboxCommonRuntimeConfig.java (100%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTextMap.java (100%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java (100%)
 rename {debezium-quarkus-outbox/runtime-common => debezium-quarkus-outbox-common/runtime}/src/main/java/io/debezium/outbox/quarkus/internal/OutboxConstants.java (100%)

diff --git a/debezium-quarkus-outbox/deployment-common/pom.xml b/debezium-quarkus-outbox-common/deployment/pom.xml
similarity index 93%
rename from debezium-quarkus-outbox/deployment-common/pom.xml
rename to debezium-quarkus-outbox-common/deployment/pom.xml
index e7ac5f553..ad3fbc77b 100644
--- a/debezium-quarkus-outbox/deployment-common/pom.xml
+++ b/debezium-quarkus-outbox-common/deployment/pom.xml
@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.debezium</groupId>
-        <artifactId>debezium-quarkus-outbox-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <artifactId>debezium-quarkus-outbox-common-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/DebeziumOutboxCommonConfig.java b/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/DebeziumOutboxCommonConfig.java
similarity index 100%
rename from debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/DebeziumOutboxCommonConfig.java
rename to debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/DebeziumOutboxCommonConfig.java
diff --git a/debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java b/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java
similarity index 100%
rename from debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java
rename to debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java
diff --git a/debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventEntityBuildItem.java b/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventEntityBuildItem.java
similarity index 100%
rename from debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventEntityBuildItem.java
rename to debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventEntityBuildItem.java
diff --git a/debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventHbmWriter.java b/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventHbmWriter.java
similarity index 100%
rename from debezium-quarkus-outbox/deployment-common/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventHbmWriter.java
rename to debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxEventHbmWriter.java
diff --git a/debezium-quarkus-outbox-common/pom.xml b/debezium-quarkus-outbox-common/pom.xml
new file mode 100644
index 000000000..afb5f169b
--- /dev/null
+++ b/debezium-quarkus-outbox-common/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.debezium</groupId>
+        <artifactId>debezium-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath>../debezium-parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>debezium-quarkus-outbox-common-parent</artifactId>
+    <name>Debezium Quarkus :: Outbox :: Common</name>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom</artifactId>
+                <version>${quarkus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/debezium-quarkus-outbox/runtime-common/pom.xml b/debezium-quarkus-outbox-common/runtime/pom.xml
similarity index 94%
rename from debezium-quarkus-outbox/runtime-common/pom.xml
rename to debezium-quarkus-outbox-common/runtime/pom.xml
index 34dda9aed..42f48540a 100644
--- a/debezium-quarkus-outbox/runtime-common/pom.xml
+++ b/debezium-quarkus-outbox-common/runtime/pom.xml
@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.debezium</groupId>
-        <artifactId>debezium-quarkus-outbox-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <artifactId>debezium-quarkus-outbox-common-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/ExportedEvent.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/ExportedEvent.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/ExportedEvent.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/ExportedEvent.java
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventWriter.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventWriter.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventWriter.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventWriter.java
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumOutboxCommonRuntimeConfig.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumOutboxCommonRuntimeConfig.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumOutboxCommonRuntimeConfig.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumOutboxCommonRuntimeConfig.java
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTextMap.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTextMap.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTextMap.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTextMap.java
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java
diff --git a/debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/OutboxConstants.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/OutboxConstants.java
similarity index 100%
rename from debezium-quarkus-outbox/runtime-common/src/main/java/io/debezium/outbox/quarkus/internal/OutboxConstants.java
rename to debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/OutboxConstants.java
diff --git a/debezium-quarkus-outbox-reactive/pom.xml b/debezium-quarkus-outbox-reactive/pom.xml
index c02c40e06..1d4babb53 100644
--- a/debezium-quarkus-outbox-reactive/pom.xml
+++ b/debezium-quarkus-outbox-reactive/pom.xml
@@ -23,13 +23,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.debezium</groupId>
+                <artifactId>debezium-quarkus-outbox-deployment-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.debezium</groupId>
+                <artifactId>debezium-quarkus-outbox-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <modules>
-        <module>../debezium-quarkus-outbox/deployment-common</module>
         <module>deployment</module>
-        <module>../debezium-quarkus-outbox/runtime-common</module>
         <module>runtime</module>
         <module>integration-tests</module>
     </modules>
diff --git a/debezium-quarkus-outbox/pom.xml b/debezium-quarkus-outbox/pom.xml
index aef579168..6fef036f2 100644
--- a/debezium-quarkus-outbox/pom.xml
+++ b/debezium-quarkus-outbox/pom.xml
@@ -23,13 +23,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.debezium</groupId>
+                <artifactId>debezium-quarkus-outbox-deployment-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.debezium</groupId>
+                <artifactId>debezium-quarkus-outbox-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <modules>
-        <module>deployment-common</module>
         <module>deployment</module>
-        <module>runtime-common</module>
         <module>runtime</module>
         <module>integration-tests</module>
     </modules>
diff --git a/pom.xml b/pom.xml
index 8b8e9fab6..878b8144a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,7 @@
         <module>debezium-connector-oracle</module>
         <module>debezium-microbenchmark</module>
         <module>debezium-microbenchmark-oracle</module>
+        <module>debezium-quarkus-outbox-common</module>
         <module>debezium-quarkus-outbox</module>
         <module>debezium-quarkus-outbox-reactive</module>
         <module>debezium-scripting</module>