You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/05/11 08:31:05 UTC

[camel-kamelets] branch main updated (cebfbd87 -> b18ae5c4)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git


    from cebfbd87 Updated CHANGELOG.md
     new 3f440e56 Upgrade to Camel 4.0.0-M3
     new 2c7625c6 Upgrade Camel to 4.0.0-M3
     new b4edce86 Upgrade Camel to 4.0.0-M3
     new e26b6b45 Upgrade Camel to 4.0.0-M3
     new b18ae5c4 Upgrade Camel to 4.0.0-M3

The 5 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:
 .../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java   | 4 ++--
 .../apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java  | 3 ++-
 pom.xml                                                               | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)


[camel-kamelets] 03/05: Upgrade Camel to 4.0.0-M3

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit b4edce86b531c595600087f9854089f3c48dd743
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 11 10:08:23 2023 +0200

    Upgrade Camel to 4.0.0-M3
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 231275f8..d5565220 100644
--- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -223,7 +223,7 @@ public class KameletsCatalogTest {
         verifyHeaders("oracle-database-source", 0);
         verifyHeaders("postgresql-sink", 8);
         verifyHeaders("postgresql-source", 0);
-        verifyHeaders("pulsar-sink", 3);
+        verifyHeaders("pulsar-sink", 4);
         verifyHeaders("pulsar-source", 11);
         verifyHeaders("redis-sink", 29);
         verifyHeaders("redis-source", 28);


[camel-kamelets] 01/05: Upgrade to Camel 4.0.0-M3

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit 3f440e56feff1dbe36c9caacd3b145e7f1b1bc95
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 11 10:04:44 2023 +0200

    Upgrade to Camel 4.0.0-M3
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 954a4153..6d26e858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <apache-rat-plugin.version>0.14</apache-rat-plugin.version>
 	<cyclonedx-maven-plugin-version>2.7.8</cyclonedx-maven-plugin-version>
 
-        <camel.version>4.0.0-M2</camel.version>
+        <camel.version>4.0.0-M3</camel.version>
         <slf4j.version>2.0.6</slf4j.version>
         <log4j.version>2.20.0</log4j.version>
         <jackson.version>2.15.0</jackson.version>


[camel-kamelets] 02/05: Upgrade Camel to 4.0.0-M3

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit 2c7625c6773ed49b1ce2a4e35d258cc032ebab0f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 11 10:07:30 2023 +0200

    Upgrade Camel to 4.0.0-M3
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java
index 26e5e6ad..70e13786 100644
--- a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java
+++ b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java
@@ -35,7 +35,7 @@ import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter;
 import org.apache.camel.kamelets.utils.format.spi.DataTypeLoader;
 import org.apache.camel.kamelets.utils.format.spi.DataTypeRegistry;
 import org.apache.camel.kamelets.utils.format.spi.annotations.DataType;
-import org.apache.camel.spi.PackageScanClassResolver;
+import org.apache.camel.support.PluginHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
@@ -63,7 +63,7 @@ public class AnnotationDataTypeLoader implements DataTypeLoader, CamelContextAwa
 
         if (resolver == null) {
             if (camelContext instanceof ExtendedCamelContext) {
-                resolver = camelContext.getCamelContextExtension().getPackageScanClassResolver();
+                resolver = PluginHelper.getPackageScanClassResolver(camelContext);
             } else {
                 resolver = new DefaultPackageScanClassResolver();
             }


[camel-kamelets] 05/05: Upgrade Camel to 4.0.0-M3

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit b18ae5c4eb9a25bf2f64954d815fd2394f4e70b2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 11 10:12:15 2023 +0200

    Upgrade Camel to 4.0.0-M3
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java
index 70e13786..0fa1ad3e 100644
--- a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java
+++ b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java
@@ -35,6 +35,7 @@ import org.apache.camel.kamelets.utils.format.spi.DataTypeConverter;
 import org.apache.camel.kamelets.utils.format.spi.DataTypeLoader;
 import org.apache.camel.kamelets.utils.format.spi.DataTypeRegistry;
 import org.apache.camel.kamelets.utils.format.spi.annotations.DataType;
+import org.apache.camel.spi.PackageScanClassResolver;
 import org.apache.camel.support.PluginHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;


[camel-kamelets] 04/05: Upgrade Camel to 4.0.0-M3

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit e26b6b457cb83427ac2c88acbf0ce5cb83dbbb6f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 11 10:08:59 2023 +0200

    Upgrade Camel to 4.0.0-M3
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index d5565220..404a9bfe 100644
--- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -231,7 +231,7 @@ public class KameletsCatalogTest {
         verifyHeaders("salesforce-create-sink", 1);
         verifyHeaders("salesforce-delete-sink", 1);
         verifyHeaders("salesforce-update-sink", 1);
-        verifyHeaders("salesforce-source", 18);
+        verifyHeaders("salesforce-source", 19);
         verifyHeaders("scp-sink", 0);
         verifyHeaders("sftp-sink", 8);
         verifyHeaders("sftp-source", 10);