You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/12/15 13:56:52 UTC

(camel) branch main updated (a62cf089cdb -> b47910bf00f)

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

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


    from a62cf089cdb Update known releases in catalog
     new e6e984002f4 Upgrade spring 6.1.2
     new b47910bf00f Fixed test after changes in camel-core tests

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:
 .../resources/org/apache/camel/spring/processor/convertBody.xml   | 8 +++++++-
 parent/pom.xml                                                    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)


(camel) 02/02: Fixed test after changes in camel-core tests

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

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

commit b47910bf00fedc274e6b7b9b10e07b22bf8ba03e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 15 14:56:44 2023 +0100

    Fixed test after changes in camel-core tests
---
 .../resources/org/apache/camel/spring/processor/convertBody.xml   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/convertBody.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
index 63e5b74a35b..6adb11b9ebe 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/convertBody.xml
@@ -25,7 +25,7 @@
     ">
 
     <!-- START SNIPPET: example -->
-    <camelContext xmlns="http://camel.apache.org/schema/spring">
+    <camelContext loadTypeConverters="true" xmlns="http://camel.apache.org/schema/spring">
     <jmxAgent id="jmx" disabled="true"/>
 
         <route>
@@ -64,6 +64,12 @@
             <to uri="mock:result"/>
         </route>
 
+        <route>
+            <from uri="direct:loadedCustomConverter"/>
+            <convertBodyTo type="org.apache.camel.processor.converter.custom.MyBean"/>
+            <to uri="mock:result"/>
+        </route>
+
     </camelContext>
     <!-- END SNIPPET: example -->
 </beans>


(camel) 01/02: Upgrade spring 6.1.2

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

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

commit e6e984002f43043f263ff6fcda92a02b99983bfb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Dec 15 14:50:59 2023 +0100

    Upgrade spring 6.1.2
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 959df8ea9d2..85aceae2e34 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -426,7 +426,7 @@
         <spring-data-redis-version>3.2.0</spring-data-redis-version>
         <spring-ldap-version>3.2.0</spring-ldap-version>
         <spring-vault-core-version>3.1.0</spring-vault-core-version>
-        <spring-version>6.1.1</spring-version>
+        <spring-version>6.1.2</spring-version>
         <spring-rabbitmq-version>3.1.0</spring-rabbitmq-version>
         <spring-security-version>6.2.0</spring-security-version>
         <spring-ws-version>4.0.8</spring-ws-version>