You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2024/12/11 12:28:39 UTC
(camel-karaf) branch camel-karaf-4.8.x updated (f75c3633d -> 887e377d2)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch camel-karaf-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from f75c3633d Ref #551: Upgrade to Camel 4.8.2 (#557)
new d2a1b5835 Ref #553: fix usage of routeBuilder in blueprint (#554)
new 887e377d2 Ref #547: Remove common from Debezium sub-components (#556)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/blueprint/BlueprintContainerBeanRepository.java | 4 ++--
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 +--
8 files changed, 3 insertions(+), 88 deletions(-)
(camel-karaf) 02/02: Ref #547: Remove common from Debezium sub-components (#556)
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-karaf-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 887e377d231f0a4574d3b8fad70d5a0dbcc58a7c
Author: Nicolas Filotto <es...@users.noreply.github.com>
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>
(camel-karaf) 01/02: Ref #553: fix usage of routeBuilder in blueprint (#554)
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-karaf-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit d2a1b5835a5c09f3481868a432fdb4fb2d49eddc
Author: François de Parscau <11...@users.noreply.github.com>
AuthorDate: Mon Dec 9 19:03:39 2024 +0100
Ref #553: fix usage of routeBuilder in blueprint (#554)
---
.../org/apache/camel/blueprint/BlueprintContainerBeanRepository.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
index e68b503c6..0e50c1646 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
@@ -61,13 +61,13 @@ public class BlueprintContainerBeanRepository implements BeanRepository {
}
// just to be safe
- if (answer == null) {
+ if (!type.isInstance(answer)) {
return null;
}
try {
return type.cast(answer);
- } catch (Throwable e) {
+ } catch (Exception e) {
String msg = "Found bean: " + name + " in BlueprintContainer: " + blueprintContainer
+ " of type: " + answer.getClass().getName() + " expected type was: " + type;
throw new NoSuchBeanException(name, msg, e);