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/07/05 09:03:33 UTC
[camel] branch master updated (5cce67f -> b9fda21)
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 5cce67f CAMEL-13725: Endpoint DSL - Add to javadoc if an option is required
new b5a9ef9 Upgrade RabbitMQ client to version 5.7.2
new b9fda21 Regen
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:
components/readme.adoc | 2 +-
.../endpoint/dsl/SshEndpointBuilderFactory.java | 18 ++++++++++++------
.../modules/ROOT/pages/pulsar-component.adoc | 16 ++++++++++------
docs/components/modules/ROOT/pages/ssh-component.adoc | 10 +++++++---
parent/pom.xml | 2 +-
5 files changed, 31 insertions(+), 17 deletions(-)
[camel] 02/02: Regen
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 b9fda215b4d5f434349c72c8bf8bdd4ef5f68a7a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jul 5 10:58:54 2019 +0200
Regen
---
components/readme.adoc | 2 +-
.../endpoint/dsl/SshEndpointBuilderFactory.java | 18 ++++++++++++------
.../modules/ROOT/pages/pulsar-component.adoc | 16 ++++++++++------
docs/components/modules/ROOT/pages/ssh-component.adoc | 10 +++++++---
4 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index ffeaac7..037831b 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -23,7 +23,7 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated)
`flink:endpointType` | 2.18 | The flink component can be used to send DataSet jobs to Apache Flink cluster.
| link:camel-pulsar/src/main/docs/pulsar-component.adoc[Apache Pulsar] (camel-pulsar) +
-`pulsar:uri` | 2.24 | Camel Apache Pulsar Component
+`pulsar:persistence://tenant/namespace/topic` | 2.24 | Camel Apache Pulsar Component
| link:camel-spark/src/main/docs/spark-component.adoc[Apache Spark] (camel-spark) +
`spark:endpointType` | 2.17 | The spark component can be used to send RDD or DataFrame jobs to Apache Spark cluster.
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
index dae2e9c..23931b5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
@@ -581,8 +581,10 @@ public interface SshEndpointBuilderFactory {
/**
* Sets the password to use in loading certResource, if certResource is
* an encrypted key.
- * The option is a <code>java.lang.String</code> type.
- * @group security
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
*/
default SshEndpointConsumerBuilder certResourcePassword(
String certResourcePassword) {
@@ -1021,8 +1023,10 @@ public interface SshEndpointBuilderFactory {
/**
* Sets the password to use in loading certResource, if certResource is
* an encrypted key.
- * The option is a <code>java.lang.String</code> type.
- * @group security
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
*/
default SshEndpointProducerBuilder certResourcePassword(
String certResourcePassword) {
@@ -1329,8 +1333,10 @@ public interface SshEndpointBuilderFactory {
/**
* Sets the password to use in loading certResource, if certResource is
* an encrypted key.
- * The option is a <code>java.lang.String</code> type.
- * @group security
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
*/
default SshEndpointBuilder certResourcePassword(
String certResourcePassword) {
diff --git a/docs/components/modules/ROOT/pages/pulsar-component.adoc b/docs/components/modules/ROOT/pages/pulsar-component.adoc
index ded6ccd..6cd4f99 100644
--- a/docs/components/modules/ROOT/pages/pulsar-component.adoc
+++ b/docs/components/modules/ROOT/pages/pulsar-component.adoc
@@ -17,14 +17,14 @@ their `pom.xml` for this component.
</dependency>
------------------------------------------------------------
-### URI format
+=== URI format
-[source,java]
+[source,text]
----------------------
pulsar:[persistent|non-persistent]://tenant/namespace/topic
----------------------
-### Options
+=== Options
// component options: START
@@ -50,18 +50,21 @@ The Apache Pulsar component supports 4 options, which are listed below.
The Apache Pulsar endpoint is configured using URI syntax:
----
-pulsar:uri
+pulsar:persistence://tenant/namespace/topic
----
with the following path and query parameters:
-==== Path Parameters (1 parameters):
+==== Path Parameters (4 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *topicUri* | The Topic's full URI path including type, tenant and namespace | | String
+| *persistence* | *Required* Whether the topic is persistent or non-persistent | | String
+| *tenant* | *Required* The tenant | | String
+| *namespace* | *Required* The namespace | | String
+| *topic* | *Required* The topic | | String
|===
@@ -86,6 +89,7 @@ with the following path and query parameters:
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|===
// endpoint options: END
+
// spring-boot-auto-configure options: START
=== Spring Boot Auto-Configuration
diff --git a/docs/components/modules/ROOT/pages/ssh-component.adoc b/docs/components/modules/ROOT/pages/ssh-component.adoc
index 3b961f8..4df54df 100644
--- a/docs/components/modules/ROOT/pages/ssh-component.adoc
+++ b/docs/components/modules/ROOT/pages/ssh-component.adoc
@@ -31,7 +31,7 @@ ssh:[username[:password]@]host[:port][?options]
// component options: START
-The SSH component supports 15 options, which are listed below.
+The SSH component supports 16 options, which are listed below.
@@ -48,6 +48,7 @@ The SSH component supports 15 options, which are listed below.
| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. Defaults to ssh-rsa. | | String
| *timeout* (common) | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. | | long
| *certResource* (security) | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate, and depends on keyType setting. | | String
+| *certResourcePassword* (security) | Sets the password to use in loading certResource, if certResource is an encrypted key. | | String
| *channelType* (advanced) | Sets the channel type to pass to the Channel as part of command execution. Defaults to exec. | | String
| *shellPrompt* (advanced) | Sets the shellPrompt to be dropped when response is read after command execution | | String
| *sleepForShellPrompt* (advanced) | Sets the sleep period in milliseconds to wait reading response from shell prompt. Defaults to 100 milliseconds. | | long
@@ -79,7 +80,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (33 parameters):
+==== Query Parameters (34 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -114,6 +115,7 @@ with the following path and query parameters:
| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
| *certResource* (security) | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate, and depends on keyType setting. | | String
+| *certResourcePassword* (security) | Sets the password to use in loading certResource, if certResource is an encrypted key. | | String
| *keyPairProvider* (security) | Sets the KeyPairProvider reference to use when connecting using Certificates to the remote SSH Server. | | KeyPairProvider
| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. From Camel 3.0.0 / 2.25.0, by default Camel will select the first available KeyPair that is loaded. Prior to this, a KeyType of 'ssh-rsa' was enforced by default. | | String
| *password* (security) | Sets the password to use in connecting to remote SSH server. Requires keyPairProvider to be set to null. | | String
@@ -136,7 +138,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 30 options, which are listed below.
+The component supports 32 options, which are listed below.
@@ -145,8 +147,10 @@ The component supports 30 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.ssh.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.ssh.cert-resource* | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate, and depends on keyType setting. | | String
+| *camel.component.ssh.cert-resource-password* | Sets the password to use in loading certResource, if certResource is an encrypted key. | | String
| *camel.component.ssh.channel-type* | Sets the channel type to pass to the Channel as part of command execution. Defaults to exec. | | String
| *camel.component.ssh.configuration.cert-resource* | Sets the resource path of the certificate to use for Authentication. Will use {@link ResourceHelperKeyPairProvider} to resolve file based certificate, and depends on keyType setting. | | String
+| *camel.component.ssh.configuration.cert-resource-password* | Sets the password to use in loading certResource, if certResource is an encrypted key. | | String
| *camel.component.ssh.configuration.channel-type* | Sets the channel type to pass to the Channel as part of command execution. Defaults to "exec". | exec | String
| *camel.component.ssh.configuration.fail-on-unknown-host* | Specifies whether a connection to an unknown host should fail or not. This value is only checked when the property knownHosts is set. | false | Boolean
| *camel.component.ssh.configuration.host* | Sets the hostname of the remote SSH server. | | String
[camel] 01/02: Upgrade RabbitMQ client to version 5.7.2
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 b5a9ef958a266e67e960f39d24a12421dbe0e516
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jul 5 10:41:22 2019 +0200
Upgrade RabbitMQ client to version 5.7.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1e378c4..2956b20 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -576,7 +576,7 @@
<qpid-jms-client-version>0.44.0</qpid-jms-client-version>
<quartz2-version>2.3.1</quartz2-version>
<quickfixj-version>2.1.1</quickfixj-version>
- <rabbitmq-amqp-client-version>5.7.1</rabbitmq-amqp-client-version>
+ <rabbitmq-amqp-client-version>5.7.2</rabbitmq-amqp-client-version>
<reactive-streams-version>1.0.2</reactive-streams-version>
<reactor-version>3.2.10.RELEASE</reactor-version>
<reflections-version>0.9.11</reflections-version>