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/04/20 08:43:55 UTC

[camel-karaf] branch camel-karaf-3.20.x updated (dddd0704 -> 2fc698f6)

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

davsclaus pushed a change to branch camel-karaf-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


    from dddd0704 Prepare for next version
     new 71eb355e Upgrade to karaf 4.4.3
     new 2fc698f6 Fixed test

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/test/blueprint/component/rest/FromRestGetTest.java   | 10 ++++++++--
 pom.xml                                                        |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)


[camel-karaf] 01/02: Upgrade to karaf 4.4.3

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

davsclaus pushed a commit to branch camel-karaf-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit 71eb355ef903f9f6e3ca72da313a2596753af966
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 20 10:36:12 2023 +0200

    Upgrade to karaf 4.4.3
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 62461983..7afa9b21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
         <jdk.version>11</jdk.version>
         <compiler.fork>false</compiler.fork>
 
-        <karaf4-version>4.4.2</karaf4-version>
+        <karaf4-version>4.4.3</karaf4-version>
 
         <!-- Camel target version -->
         <camel-version>3.20.4-SNAPSHOT</camel-version>


[camel-karaf] 02/02: Fixed test

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

davsclaus pushed a commit to branch camel-karaf-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit 2fc698f690c0e556d1948a42fdb26c3345c27e65
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 20 10:43:48 2023 +0200

    Fixed test
---
 .../camel/test/blueprint/component/rest/FromRestGetTest.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
index 45ff7b51..debe0827 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
@@ -63,8 +63,14 @@ public class FromRestGetTest extends CamelBlueprintTestSupport {
 
         assertEquals("integer", rest.getVerbs().get(0).getParams().get(0).getDataType());
         assertEquals("string", rest.getVerbs().get(0).getParams().get(1).getDataType());
-        assertEquals(Arrays.asList("1", "2", "3", "4"), rest.getVerbs().get(0).getParams().get(0).getAllowableValues());
-        assertEquals(Arrays.asList("a", "b", "c", "d"), rest.getVerbs().get(0).getParams().get(1).getAllowableValues());
+        assertEquals("1", rest.getVerbs().get(0).getParams().get(0).getAllowableValues().get(0).getValue());
+        assertEquals("2", rest.getVerbs().get(0).getParams().get(0).getAllowableValues().get(1).getValue());
+        assertEquals("3", rest.getVerbs().get(0).getParams().get(0).getAllowableValues().get(2).getValue());
+        assertEquals("4", rest.getVerbs().get(0).getParams().get(0).getAllowableValues().get(3).getValue());
+        assertEquals("a", rest.getVerbs().get(0).getParams().get(1).getAllowableValues().get(0).getValue());
+        assertEquals("b", rest.getVerbs().get(0).getParams().get(1).getAllowableValues().get(1).getValue());
+        assertEquals("c", rest.getVerbs().get(0).getParams().get(1).getAllowableValues().get(2).getValue());
+        assertEquals("d", rest.getVerbs().get(0).getParams().get(1).getAllowableValues().get(3).getValue());
         assertEquals("1", rest.getVerbs().get(0).getParams().get(0).getDefaultValue());
         assertEquals("b", rest.getVerbs().get(0).getParams().get(1).getDefaultValue());