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 2019/11/25 08:46:14 UTC

[camel] branch master updated (4fdcc61 -> 4c558a8)

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

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


    from 4fdcc61  spring boot groupId fix
     new 4518605  Fixed flaky test on slow CI servers
     new 4c558a8  Upgrade CXF plugins

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/spring/config/ConsumerTemplateMaximumCacheSizeTest.java   | 6 +++---
 parent/pom.xml                                                      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


[camel] 01/02: Fixed flaky test on slow CI servers

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

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

commit 4518605960c8091b4d066691b8014fa28b244a6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 25 09:39:03 2019 +0100

    Fixed flaky test on slow CI servers
---
 .../camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
index a16d812..55d7fbc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateMaximumCacheSizeTest.java
@@ -43,8 +43,8 @@ public class ConsumerTemplateMaximumCacheSizeTest extends SpringRunWithTestSuppo
         assertEquals(50, template.getMaximumCacheSize());
         assertEquals("Size should be 0", 0, template.getCurrentCacheSize());
 
-        // test that we cache at most 50 producers to avoid it eating too much memory
-        for (int i = 0; i < 53; i++) {
+        // test that we cache around 50 producers to avoid it eating too much memory
+        for (int i = 0; i <= 55; i++) {
             Endpoint e = context.getEndpoint("direct:queue:" + i);
             template.receiveNoWait(e);
         }
@@ -54,7 +54,7 @@ public class ConsumerTemplateMaximumCacheSizeTest extends SpringRunWithTestSuppo
 
         // eviction may still run a bit
         int currentCacheSize = template.getCurrentCacheSize();
-        assertTrue("Size should be around 50, but was " + currentCacheSize, currentCacheSize <= 51);
+        assertTrue("Size should be around 50, but was " + currentCacheSize, currentCacheSize <= 53);
         template.stop();
 
         // should be 0


[camel] 02/02: Upgrade CXF plugins

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

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

commit 4c558a876f002d96b04e6c6ed85e33f16ee7fafd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 25 09:40:43 2019 +0100

    Upgrade CXF plugins
---
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index dc896e3..d5f4ae0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,9 +155,9 @@
         <curator-version>2.12.0</curator-version>
         <cxf-version>3.3.4</cxf-version>
         <cxf-version-range>[3.3,4.0)</cxf-version-range>
-        <cxf-codegen-plugin-version>3.3.2</cxf-codegen-plugin-version>
-        <cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
-        <cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
+        <cxf-codegen-plugin-version>3.3.4</cxf-codegen-plugin-version>
+        <cxf-xjc-plugin-version>3.3.0</cxf-xjc-plugin-version>
+        <cxf-xjc-utils-version>3.3.0</cxf-xjc-utils-version>
         <deltaspike-version>1.9.0</deltaspike-version>
         <depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
         <derby-version>10.14.2.0</derby-version>