This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new b362d2e54 Ref #547: Remove common from Debezium sub-components (#556)
b362d2e54 is described below
commit b362d2e549e7863f43b5ce6943a1a1c56ca25d77
Author: Nicolas Filotto <[email protected]>
AuthorDate: Tue Dec 10 14:41:29 2024 +0100
Ref #547: Remove common from Debezium sub-components (#556)
## Motivation
We have a split package issue fixed in Camel so that we can remove the
workaround.
## Modifications:
* Remove `camel-debezium-common` from all the wrappers
* Re-add `camel-debezium-common` to the feature of the same name
---
components/camel-debezium/camel-debezium-db2/pom.xml | 14 --------------
components/camel-debezium/camel-debezium-mongodb/pom.xml | 14 --------------
components/camel-debezium/camel-debezium-mysql/pom.xml | 14 --------------
components/camel-debezium/camel-debezium-oracle/pom.xml | 14 --------------
components/camel-debezium/camel-debezium-postgres/pom.xml | 14 --------------
components/camel-debezium/camel-debezium-sqlserver/pom.xml | 14 --------------
features/src/main/feature/camel-features.xml | 3 +--
7 files changed, 1 insertion(+), 86 deletions(-)
diff --git a/components/camel-debezium/camel-debezium-db2/pom.xml
b/components/camel-debezium/camel-debezium-db2/pom.xml
index 8957227b5..4013ef1ee 100644
--- a/components/camel-debezium/camel-debezium-db2/pom.xml
+++ b/components/camel-debezium/camel-debezium-db2/pom.xml
@@ -53,18 +53,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Must be removed once the split package issue is fixed in Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-debezium-common</artifactId>
- <version>${camel-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -81,8 +69,6 @@
<configuration>
<artifactSet>
<includes>
- <!-- Must be removed once the split
package issue is fixed in Camel -->
-
<include>org.apache.camel:camel-debezium-common</include>
<include>org.apache.camel:camel-debezium-db2</include>
</includes>
</artifactSet>
diff --git a/components/camel-debezium/camel-debezium-mongodb/pom.xml
b/components/camel-debezium/camel-debezium-mongodb/pom.xml
index 78ed73408..fa2046af1 100644
--- a/components/camel-debezium/camel-debezium-mongodb/pom.xml
+++ b/components/camel-debezium/camel-debezium-mongodb/pom.xml
@@ -53,18 +53,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Must be removed once the split package issue is fixed in Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-debezium-common</artifactId>
- <version>${camel-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -81,8 +69,6 @@
<configuration>
<artifactSet>
<includes>
- <!-- Must be removed once the split
package issue is fixed in Camel -->
-
<include>org.apache.camel:camel-debezium-common</include>
<include>org.apache.camel:camel-debezium-mongodb</include>
</includes>
</artifactSet>
diff --git a/components/camel-debezium/camel-debezium-mysql/pom.xml
b/components/camel-debezium/camel-debezium-mysql/pom.xml
index 378044b7b..3d4554992 100644
--- a/components/camel-debezium/camel-debezium-mysql/pom.xml
+++ b/components/camel-debezium/camel-debezium-mysql/pom.xml
@@ -53,18 +53,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Must be removed once the split package issue is fixed in Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-debezium-common</artifactId>
- <version>${camel-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -81,8 +69,6 @@
<configuration>
<artifactSet>
<includes>
- <!-- Must be removed once the split
package issue is fixed in Camel -->
-
<include>org.apache.camel:camel-debezium-common</include>
<include>org.apache.camel:camel-debezium-mysql</include>
</includes>
</artifactSet>
diff --git a/components/camel-debezium/camel-debezium-oracle/pom.xml
b/components/camel-debezium/camel-debezium-oracle/pom.xml
index 03de13753..3f01a24fe 100644
--- a/components/camel-debezium/camel-debezium-oracle/pom.xml
+++ b/components/camel-debezium/camel-debezium-oracle/pom.xml
@@ -53,18 +53,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Must be removed once the split package issue is fixed in Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-debezium-common</artifactId>
- <version>${camel-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -81,8 +69,6 @@
<configuration>
<artifactSet>
<includes>
- <!-- Must be removed once the split
package issue is fixed in Camel -->
-
<include>org.apache.camel:camel-debezium-common</include>
<include>org.apache.camel:camel-debezium-oracle</include>
</includes>
</artifactSet>
diff --git a/components/camel-debezium/camel-debezium-postgres/pom.xml
b/components/camel-debezium/camel-debezium-postgres/pom.xml
index fec5d7c65..1fe3915fb 100644
--- a/components/camel-debezium/camel-debezium-postgres/pom.xml
+++ b/components/camel-debezium/camel-debezium-postgres/pom.xml
@@ -53,18 +53,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Must be removed once the split package issue is fixed in Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-debezium-common</artifactId>
- <version>${camel-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -81,8 +69,6 @@
<configuration>
<artifactSet>
<includes>
- <!-- Must be removed once the split
package issue is fixed in Camel -->
-
<include>org.apache.camel:camel-debezium-common</include>
<include>org.apache.camel:camel-debezium-postgres</include>
</includes>
</artifactSet>
diff --git a/components/camel-debezium/camel-debezium-sqlserver/pom.xml
b/components/camel-debezium/camel-debezium-sqlserver/pom.xml
index 8452a90d3..0c626708e 100644
--- a/components/camel-debezium/camel-debezium-sqlserver/pom.xml
+++ b/components/camel-debezium/camel-debezium-sqlserver/pom.xml
@@ -53,18 +53,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Must be removed once the split package issue is fixed in Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-debezium-common</artifactId>
- <version>${camel-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
@@ -81,8 +69,6 @@
<configuration>
<artifactSet>
<includes>
- <!-- Must be removed once the split
package issue is fixed in Camel -->
-
<include>org.apache.camel:camel-debezium-common</include>
<include>org.apache.camel:camel-debezium-sqlserver</include>
</includes>
</artifactSet>
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index c243ea1f6..d6762129b 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -951,8 +951,7 @@
<bundle
dependency='true'>wrap:mvn:io.debezium/debezium-embedded/${debezium-version}</bundle>
<bundle
dependency='true'>wrap:mvn:io.debezium/debezium-core/${debezium-version}$DynamicImport-Package=io.debezium.connector.*&${spi-consumer}</bundle>
<bundle>wrap:mvn:io.debezium/debezium-storage-file/${debezium-version}</bundle>
- <!-- Uncomment when the split package issue is fixed in Camel -->
-
<!--<bundle>mvn:org.apache.camel.karaf/camel-debezium-common/${project.version}</bundle>-->
+
<bundle>mvn:org.apache.camel.karaf/camel-debezium-common/${project.version}</bundle>
</feature>
<feature name='camel-debezium-db2' version='${project.version}'
start-level='50'>
<feature
version='${camel-osgi-version-range}'>camel-debezium-common</feature>
