This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch backports-to-4.8 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 5d8a17766087bffacdb2cd1b84c46f745d877c29 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 fc5d85516..3c49c9c18 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 2eb956320..fc3279146 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 8c6d53ad1..3af22af36 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 8d9d41877..97b2c44e0 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 63bff444f..a8f2b89ee 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 dad6635be..db79ae28b 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 059d85b72..532cdb6a4 100644 --- a/features/src/main/feature/camel-features.xml +++ b/features/src/main/feature/camel-features.xml @@ -933,8 +933,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>
