You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/09 08:22:15 UTC
[camel] branch master updated (4d47e8d -> 6b52762)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4d47e8d CAMEL-13492 - Camel-Weather: Fixed Karaf feature
new 874c524 Camel-Soroush: Align okhttp-sse to okhttp version widely used in the project
new ab22626 Camel-Soroush: Aligned the okhttp-sse version to okhttp client version in karaf feature
new 6b52762 Camel-Soroush: Removed useless property placeholder
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:
components/camel-soroush/pom.xml | 2 +-
.../component/soroushbot/component/SoroushBotAbstractConsumer.java | 6 +++---
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
[camel] 03/03: Camel-Soroush: Removed useless property placeholder
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6b52762e8c551cf49b2ad28852ecfb152be4aa00
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 10:21:40 2019 +0200
Camel-Soroush: Removed useless property placeholder
---
parent/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9eb330c..86f857e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -654,7 +654,6 @@
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>2.7.5</squareup-okhttp-version>
<squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version>
- <squareup-okhttp3-version>3.14.1</squareup-okhttp3-version>
<squareup-okio-bundle-version>1.15.0_1</squareup-okio-bundle-version>
<squareup-retrofit-bundle-version>1.9.0_1</squareup-retrofit-bundle-version>
<squareup-retrofit2-bundle-version>2.4.0_1</squareup-retrofit2-bundle-version>
[camel] 02/03: Camel-Soroush: Aligned the okhttp-sse version to
okhttp client version in karaf feature
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ab22626642957ffde18d4bf9e710fc4dc7ae9482
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 10:20:39 2019 +0200
Camel-Soroush: Aligned the okhttp-sse version to okhttp client version in karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 3fd8cb1..1a02beb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2258,7 +2258,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp-sse/${squareup-okhttp3-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp-sse/${okclient-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.jersey.inject/jersey-hk2/${jersey-version}</bundle>
<bundle dependency='true'>mvn:org.glassfish.hk2/hk2-locator/${hk2-version}</bundle>
[camel] 01/03: Camel-Soroush: Align okhttp-sse to okhttp version
widely used in the project
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 874c524e3a89525941cdff1438bce82e542eafcf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 10:13:14 2019 +0200
Camel-Soroush: Align okhttp-sse to okhttp version widely used in the project
---
components/camel-soroush/pom.xml | 2 +-
.../component/soroushbot/component/SoroushBotAbstractConsumer.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-soroush/pom.xml b/components/camel-soroush/pom.xml
index 53ffe03..6d4dd206 100644
--- a/components/camel-soroush/pom.xml
+++ b/components/camel-soroush/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-sse</artifactId>
- <version>${squareup-okhttp3-version}</version>
+ <version>${okclient-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java
index ff4dbd0..02bc7ea 100644
--- a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java
+++ b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java
@@ -84,9 +84,9 @@ public abstract class SoroushBotAbstractConsumer extends DefaultConsumer impleme
.build();
OkHttpClient client = new OkHttpClient.Builder()
.connectTimeout(endpoint.connectionTimeout, TimeUnit.MILLISECONDS)
- .writeTimeout(Duration.ZERO)
- .readTimeout(Duration.ZERO)
- .callTimeout(Duration.ZERO).build();
+ .writeTimeout(0L, TimeUnit.MILLISECONDS)
+ .readTimeout(0L, TimeUnit.MILLISECONDS)
+ .build();
connection = new ReconnectableEventSourceListener(client, request, endpoint.maxConnectionRetry) {
@Override
protected boolean onBeforeConnect() {