ENTESB-11729: Upgrade of fuse-camel

* Bumps version to 2.21.0.fuse-750029 * Corrects odata tests to conform with upstream change.
syndesisio · Sep 25, 2019 · 308845a · 308845a
1 parent 88dfa7a
commit 308845a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 40 deletions.
diff --git a/.../src/test/java/io/syndesis/connector/odata/consumer/ODataReadRouteNoSplitResultsTest.java b/.../src/test/java/io/syndesis/connector/odata/consumer/ODataReadRouteNoSplitResultsTest.java
@@ -501,30 +501,18 @@ public void testReferenceODataRouteAlreadySeenWithKeyPredicate() throws Exceptio
         RouteBuilder routes = newIntegrationRouteBuilder(odataIntegration);
         context.addRoutes(routes);
 
-        int expectedMsgCount = 3;
+        int expectedMsgCount = 1;
         MockEndpoint result = initMockEndpoint();
-        result.setMinimumExpectedMessageCount(expectedMsgCount);
+        result.setExpectedMessageCount(expectedMsgCount);
 
         context.start();
 
         result.assertIsSatisfied();
 
-        for (int i = 0; i < expectedMsgCount; ++i) {
-            String json = extractJsonFromExchgMsg(result, i, String.class);
-            assertNotNull(json);
-
-            String expected;
-            if (i == 0) {
-                expected = testData(REF_SERVER_AIRPORT_DATA_1);
-                JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
-            } else {
-                //
-                // Subsequent polling messages should be empty
-                //
-                expected = testData(TEST_SERVER_DATA_EMPTY);
-                JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
-            }
-        }
+        String json = extractJsonFromExchgMsg(result, 0, String.class);
+        assertNotNull(json);
+        String expected = testData(REF_SERVER_AIRPORT_DATA_1);
+        JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
 
         //
         // Check backup consumer options carried through to olingo4 component

diff --git a/...ta/src/test/java/io/syndesis/connector/odata/consumer/ODataReadRouteSplitResultsTest.java b/...ta/src/test/java/io/syndesis/connector/odata/consumer/ODataReadRouteSplitResultsTest.java
@@ -618,30 +618,18 @@ public void testReferenceODataRouteAlreadySeenWithKeyPredicate() throws Exceptio
         RouteBuilder routes = newIntegrationRouteBuilder(odataIntegration);
         context.addRoutes(routes);
 
-        int expectedMsgCount = 3;
+        int expectedMsgCount = 1;
         MockEndpoint result = initMockEndpoint();
-        result.setMinimumExpectedMessageCount(expectedMsgCount);
+        result.setExpectedMessageCount(expectedMsgCount);
 
         context.start();
 
         result.assertIsSatisfied();
 
-        for (int i = 0; i < expectedMsgCount; ++i) {
-            String json = extractJsonFromExchgMsg(result, i, String.class);
-            assertNotNull(json);
-
-            String expected;
-            if (i == 0) {
-                expected = testData(REF_SERVER_AIRPORT_DATA_1);
-                JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
-            } else {
-                //
-                // Subsequent polling messages should be empty
-                //
-                expected = testData(TEST_SERVER_DATA_EMPTY);
-                JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
-            }
-        }
+        String json = extractJsonFromExchgMsg(result, 0, String.class);
+        assertNotNull(json);
+        String expected = testData(REF_SERVER_AIRPORT_DATA_1);
+        JSONAssert.assertEquals(expected, json, JSONCompareMode.LENIENT);
 
         //
         // Check backup consumer options carried through to olingo4 component

diff --git a/app/extension/bom/pom.xml b/app/extension/bom/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
-    <camel.version>2.21.0.fuse-750007</camel.version>
+    <camel.version>2.21.0.fuse-750029</camel.version>
   </properties>
 
     <!-- Metadata need to publish to central -->

diff --git a/app/integration/bom-camel-k/pom.xml b/app/integration/bom-camel-k/pom.xml
@@ -27,7 +27,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <camel.version>2.21.0.fuse-740039-redhat-00001</camel.version>
+    <camel.version>2.21.0.fuse-750029</camel.version>
     <atlasmap.version>1.39.5</atlasmap.version>
     <jackson.version>2.8.11</jackson.version>
     <jackson.databind.version>2.8.11.3</jackson.databind.version>

diff --git a/app/integration/bom/pom.xml b/app/integration/bom/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
-    <camel.version>2.21.0.fuse-750007</camel.version>
+    <camel.version>2.21.0.fuse-750029</camel.version>
     <atlasmap.version>1.42.3</atlasmap.version>
     <jackson.databind.version>2.8.11.3</jackson.databind.version>
   </properties>

diff --git a/app/pom.xml b/app/pom.xml
@@ -77,7 +77,7 @@
     <commons.compress.version>1.18</commons.compress.version>
 
     <!-- Global camel version used everywhere -->
-    <camel.version>2.21.0.fuse-750007</camel.version>
+    <camel.version>2.21.0.fuse-750029</camel.version>
     <camel-k-runtime.version>0.3.4.fuse-740009-redhat-00002</camel-k-runtime.version>
 
     <!-- Don't fork based on cores, doesn't work nicely in the cloud -->