You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/11/12 12:34:18 UTC
[camel] branch sandbox/camel-3.x updated (7340cff -> d3af2a4)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7340cff Fix camel-jms tests
add f0712a3 Upgrade Mongo Java driver to version 3.9.0
add c4a5f6f CAMEL-12921 - Camel-AWS SQS: Add an option to create a SQS delay queue
add 3b52637 CAMEL-12921 - Added docs
add 96f8538 CAMEL-12921 - Regen docs
add 7fec7ee Camel-NSQ: Regen docs
add 1107b6f Upgrade Reactor to version 3.2.2.RELEASE
add 3cbbf35 Improved doc to use master api for singleton route usecase, fix CAMEL-12922 (#2606)
add e28fe1d Fixed some CS issues, deprecated links and eclipse warnings in camel-http4
add d4c06e3 CAMEL-12912 - Action Request Converter is reseting ID on index request to header that is not set
add 409c876 CAMEL-12924 - Camel-Elasticsearch-rest: Use not deprecated methods after the client upgrade
add 9e74ea0 Camel-Elastisearch-rest: the restHighLevelClient must be closed when disconnecting
add ac99f2a Camel-Elasticsearch-rest: Fixed CS
add f2b45e3 Fixed Camel-Sjms2 Spring Boot ITest
add 810ab37 Fixed camel-salesforce Spring Boot ITest
add aa12b9a Upgrade XChange to version 4.3.12
add e64a2ab [REFACTOR] Refactor slack tests
add 3b1f4ad Upgrade Infinispan Spring Boot to version 2.1.0.Final
add 881cf50 Fix removal of signature checksum files
add c09ddd3 Remove duplicate signature files (*.asc.asc)
add 2213170 Remove `quiet` parameter to display progress when origin is slow
add 0476554 Add XML reference for release 2.22.2
add 3bffb51 Fixed camel-mybatis tests and warnings
add dfb6284 Upgrade Braintree to version 2.87.0
add 2037535 Upgrade Lz4-java to version 1.5.0
new 5908343 Merge remote-tracking branch 'origin/master' into camel-3.x
new ec6fdd8 Fix version
new d3af2a4 Regen
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:
camel-core/readme.adoc | 2 +-
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 33 ++++++++++-
.../camel/component/aws/sqs/SqsConfiguration.java | 14 +++++
.../camel/component/aws/sqs/SqsEndpoint.java | 6 ++
.../src/main/resources/META-INF/spring.schemas | 1 +
.../main/docs/elasticsearch-rest-component.adoc | 2 +
.../elasticsearch/ElasticsearchProducer.java | 24 ++++----
.../camel/component/http4/HttpComponent.java | 4 +-
.../apache/camel/component/http4/HttpEndpoint.java | 25 ++++----
.../component/http4/HttpsAuthenticationTest.java | 4 +-
.../apache/camel/component/http4/HttpsGetTest.java | 4 +-
...psTwoComponentsSslContextParametersGetTest.java | 4 +-
...tpsTwoDifferentSslContextParametersGetTest.java | 4 +-
.../src/main/docs/jgroups-component.adoc | 12 ++--
.../camel-jms/src/main/docs/jms-component.adoc | 1 -
.../component/mybatis/MyBatisBeanProducer.java | 2 +-
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../component/mybatis/MyBatisTestSupport.java | 68 +++++++++++++---------
.../camel-nsq/src/main/docs/nsq-component.adoc | 2 +-
.../camel/component/nsq/NsqConfiguration.java | 2 +-
components/camel-slack/pom.xml | 6 +-
.../camel/component/slack/SlackConsumerTest.java | 55 +++++++++++++++--
.../camel/component/slack/SlackProducerTest.java | 48 +++++++++++----
.../resources/OSGI-INF/blueprint/blueprint.xml | 44 --------------
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
components/readme.adoc | 4 +-
etc/scripts/release-distro.sh | 6 +-
etc/scripts/release-website.sh | 4 +-
parent/pom.xml | 12 ++--
.../sqs/springboot/SqsComponentConfiguration.java | 13 +++++
.../components-starter/camel-nsq-starter/pom.xml | 2 +-
.../springboot/NsqComponentAutoConfiguration.java | 4 +-
.../camel-spring-boot-dependencies/pom.xml | 2 +-
.../itest/springboot/CamelSalesforceTest.java | 2 +-
.../camel/itest/springboot/CamelSjms2Test.java | 3 +-
37 files changed, 266 insertions(+), 158 deletions(-)
delete mode 100644 components/camel-slack/src/test/resources/OSGI-INF/blueprint/blueprint.xml
[camel] 03/03: Regen
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d3af2a456eeef1bb66fc09fb0e9f9b3c5cc4eb2a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 12 13:33:57 2018 +0100
Regen
---
camel-core/readme.adoc | 2 +-
components/camel-aws/src/main/docs/aws-sqs-component.adoc | 3 ++-
components/camel-jms/src/main/docs/jms-component.adoc | 1 -
components/readme.adoc | 4 ++--
.../camel/component/nsq/springboot/NsqComponentAutoConfiguration.java | 4 ++--
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 35aaf17..409ba95 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -103,7 +103,7 @@ Data Formats
// dataformats: START
-Number of Data Formats: 4 in 34 JAR artifacts (0 deprecated)
+Number of Data Formats: 4 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
index 970bb77..d5dc6e8 100644
--- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
@@ -128,7 +128,7 @@ with the following path and query parameters:
=== Spring Boot Auto-Configuration
-The component supports 30 options, which are listed below.
+The component supports 31 options, which are listed below.
@@ -142,6 +142,7 @@ The component supports 30 options, which are listed below.
| *camel.component.aws-sqs.configuration.attribute-names* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String
| *camel.component.aws-sqs.configuration.concurrent-consumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | Integer
| *camel.component.aws-sqs.configuration.default-visibility-timeout* | The default visibility timeout (in seconds) | | Integer
+| *camel.component.aws-sqs.configuration.delay-queue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | Boolean
| *camel.component.aws-sqs.configuration.delay-seconds* | Delay sending messages for a number of seconds. | | Integer
| *camel.component.aws-sqs.configuration.delete-after-read* | Delete message from SQS after it has been read | true | Boolean
| *camel.component.aws-sqs.configuration.delete-if-filtered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | Boolean
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index a451d5e..afc4525 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -604,7 +604,6 @@ The component supports 171 options, which are listed below.
| *camel.component.jms.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
| *camel.component.jms.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer
| *camel.component.jms.wait-for-provision-correlation-to-be-updated-thread-sleeping-time* | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | Long
-| *camel.component.jms.configuration.transacted-in-out* | | | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/components/readme.adoc b/components/readme.adoc
index 68397f7..b939492 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 280 in 185 JAR artifacts (0 deprecated)
+Number of Components: 281 in 186 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -859,7 +859,7 @@ Data Formats
^^^^^^^^^^^^
// dataformats: START
-Number of Data Formats: 43 in 34 JAR artifacts (0 deprecated)
+Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java
index dbab909..881648e 100644
--- a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
-
import org.apache.camel.CamelContext;
import org.apache.camel.component.nsq.NsqComponent;
import org.apache.camel.spi.ComponentCustomizer;
@@ -31,12 +30,13 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
import org.apache.camel.spring.boot.util.GroupCondition;
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationContext;
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 15fc032..09fde21 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
@@ -3425,7 +3425,7 @@
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-core</artifactId>
- <version>4.3.11</version>
+ <version>4.3.12</version>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
[camel] 01/03: Merge remote-tracking branch 'origin/master' into
camel-3.x
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 590834380a57a8061d1bb512ee55e68b74025cb0
Merge: 7340cff 2037535
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 12 09:06:41 2018 +0100
Merge remote-tracking branch 'origin/master' into camel-3.x
.../camel-aws/src/main/docs/aws-sqs-component.adoc | 30 +++++++++-
.../camel/component/aws/sqs/SqsConfiguration.java | 14 +++++
.../camel/component/aws/sqs/SqsEndpoint.java | 6 ++
.../src/main/resources/META-INF/spring.schemas | 1 +
.../main/docs/elasticsearch-rest-component.adoc | 2 +
.../elasticsearch/ElasticsearchProducer.java | 24 ++++----
.../camel/component/http4/HttpComponent.java | 4 +-
.../apache/camel/component/http4/HttpEndpoint.java | 25 ++++----
.../component/http4/HttpsAuthenticationTest.java | 4 +-
.../apache/camel/component/http4/HttpsGetTest.java | 4 +-
...psTwoComponentsSslContextParametersGetTest.java | 4 +-
...tpsTwoDifferentSslContextParametersGetTest.java | 4 +-
.../src/main/docs/jgroups-component.adoc | 12 ++--
.../component/mybatis/MyBatisBeanProducer.java | 2 +-
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../component/mybatis/MyBatisTestSupport.java | 68 +++++++++++++---------
.../camel-nsq/src/main/docs/nsq-component.adoc | 2 +-
.../camel/component/nsq/NsqConfiguration.java | 2 +-
components/camel-slack/pom.xml | 6 +-
.../camel/component/slack/SlackConsumerTest.java | 55 +++++++++++++++--
.../camel/component/slack/SlackProducerTest.java | 48 +++++++++++----
.../resources/OSGI-INF/blueprint/blueprint.xml | 44 --------------
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
.../src/main/resources/META-INF/spring.schemas | 1 +
etc/scripts/release-distro.sh | 6 +-
etc/scripts/release-website.sh | 4 +-
parent/pom.xml | 12 ++--
.../sqs/springboot/SqsComponentConfiguration.java | 13 +++++
.../itest/springboot/CamelSalesforceTest.java | 2 +-
.../camel/itest/springboot/CamelSjms2Test.java | 3 +-
31 files changed, 257 insertions(+), 149 deletions(-)
diff --cc components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index 845929b,6049ee3..9b2beb6
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@@ -57,6 -59,13 +57,11 @@@ import org.apache.http.protocol.HttpCon
@ManagedResource(description = "Managed HttpEndpoint")
public class HttpEndpoint extends HttpCommonEndpoint {
- private static final Logger LOG = LoggerFactory.getLogger(HttpEndpoint.class);
-
+ @UriParam(label = "security", description = "To configure security using SSLContextParameters."
+ + " Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent."
+ + " If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need.")
+ protected SSLContextParameters sslContextParameters;
+
@UriParam(label = "advanced", description = "To use a custom HttpContext instance")
private HttpContext httpContext;
@UriParam(label = "advanced", description = "Register a custom configuration strategy for new HttpClient instances"
diff --cc components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
index 69f8427,572526c..a2da530
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
@@@ -19,8 -19,8 +19,8 @@@ package org.apache.camel.component.http
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.util.jsse.SSLContextParameters;
+import org.apache.camel.support.jsse.SSLContextParameters;
- import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+ import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
diff --cc components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
index f1a79ff,7f259cf..75509b6
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
@@@ -19,8 -19,8 +19,8 @@@ package org.apache.camel.component.http
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.util.jsse.SSLContextParameters;
+import org.apache.camel.support.jsse.SSLContextParameters;
- import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+ import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
[camel] 02/03: Fix version
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ec6fdd8a3cd943a23610d0411d97f37d6d5ad04c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 12 10:52:49 2018 +0100
Fix version
---
platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml b/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml
index cfabb89..7bce516 100644
--- a/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components-starter</artifactId>
- <version>2.23.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-nsq-starter</artifactId>
<packaging>jar</packaging>