You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/06/26 16:45:48 UTC
[camel] branch camel-2.x updated (8741fea -> 58d1af4)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 8741fea Fixing Zookeeper test that was previously removed
new 483e1af Updating Xbean
new 9ca230d Fixing flaky Lumberjack SSL tests
new 58d1af4 Updating Spring boot deps
The 3 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:
.../component/lumberjack/LumberjackComponentGlobalSSLTest.java | 4 ----
.../camel/component/lumberjack/LumberjackComponentSSLTest.java | 1 +
.../java/org/apache/camel/component/lumberjack/LumberjackUtil.java | 6 +++---
parent/pom.xml | 4 +---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
6 files changed, 8 insertions(+), 13 deletions(-)
[camel] 01/03: Updating Xbean
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 483e1afe6b04b44d26c09acb53119cb5648779ed
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Jun 22 12:55:13 2019 +0100
Updating Xbean
---
parent/pom.xml | 4 +---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7b1cf67..ba1f7f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -721,9 +721,7 @@
<wsdl4j-version>1.6.3</wsdl4j-version>
<xalan-bundle-version>2.7.2_3</xalan-bundle-version>
<xalan-version>2.7.2</xalan-version>
- <xbean-spring-version>4.5</xbean-spring-version>
- <!-- xbean-asm4-bundle is used by openjpa -->
- <xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>
+ <xbean-spring-version>4.14</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xchange-version>4.3.13</xchange-version>
<xerces-bundle-version>2.12.0_1</xerces-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ddc8373..ca04d18 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1345,7 +1345,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.xbean/xbean-asm4-shaded/${xbean-asm4-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.xbean/xbean-asm5-shaded/${xbean-asm5-shaded-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jpa/${project.version}</bundle>
</feature>
<feature name='camel-jsch' version='${project.version}' resolver='(obr)' start-level='50'>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 8183876..90ecb04 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3461,7 +3461,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>4.5</version>
+ <version>4.14</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
[camel] 03/03: Updating Spring boot deps
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58d1af403920c465a2756f375d082c23ee9ce769
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 26 17:45:19 2019 +0100
Updating Spring boot deps
---
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 90ecb04..0fec05f 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3466,7 +3466,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.13</version>
+ <version>3.4.14</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
[camel] 02/03: Fixing flaky Lumberjack SSL tests
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9ca230d9a28ee5ffa1710b0e1a82f2d3e6e523a8
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 25 11:03:32 2019 +0100
Fixing flaky Lumberjack SSL tests
---
.../component/lumberjack/LumberjackComponentGlobalSSLTest.java | 4 ----
.../camel/component/lumberjack/LumberjackComponentSSLTest.java | 1 +
.../java/org/apache/camel/component/lumberjack/LumberjackUtil.java | 6 +++---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
index 97c181f..2aa8473 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
@@ -61,10 +61,6 @@ public class LumberjackComponentGlobalSSLTest extends CamelTestSupport {
@Test
public void shouldListenToMessagesOverSSL() throws Exception {
- // cannot test on java 1.9
- if (isJava19()) {
- return;
- }
// We're expecting 25 messages with Maps
MockEndpoint mock = getMockEndpoint("mock:output");
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
index 2df6a36..f1965c3 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
@@ -48,6 +48,7 @@ public class LumberjackComponentSSLTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
+
return new RouteBuilder() {
public void configure() {
// Lumberjack configured with SSL
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
index 45fa108..3cea515 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
@@ -83,11 +83,11 @@ final class LumberjackUtil {
.connect("127.0.0.1", port).sync().channel(); //
// Send the 2 window frames
- TimeUnit.MILLISECONDS.sleep(100);
+ TimeUnit.MILLISECONDS.sleep(500);
channel.writeAndFlush(readSample("io/window10"));
- TimeUnit.MILLISECONDS.sleep(100);
+ TimeUnit.MILLISECONDS.sleep(500);
channel.writeAndFlush(readSample("io/window15"));
- TimeUnit.MILLISECONDS.sleep(100);
+ TimeUnit.MILLISECONDS.sleep(500);
channel.close();