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 2022/12/07 18:34:18 UTC
[camel] branch camel-3.18.x updated (64a3ce792ce -> cc237b92901)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 64a3ce792ce CAMEL-18800 - Support Camel K integration in JBang run command
new 5b91e388404 CAMEL-18804 update documentation (#8861)
new 2d0f965d5b0 CAMEL-18804: Regen
new cc237b92901 CAMEL-18805: Telegram : Fix unregister webhook API method (#8862)
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:
.../resources/org/apache/camel/catalog/components/sftp.json | 4 ++--
.../org/apache/camel/component/file/remote/sftp.json | 4 ++--
.../camel/component/file/remote/SftpConfiguration.java | 4 ++--
.../telegram/service/TelegramServiceRestBotAPIAdapter.java | 7 ++++++-
.../component/telegram/TelegramWebhookRegistrationTest.java | 5 +++++
.../builder/endpoint/dsl/SftpEndpointBuilderFactory.java | 12 ++++++------
6 files changed, 23 insertions(+), 13 deletions(-)
[camel] 02/03: CAMEL-18804: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2d0f965d5b070f8370da5359d13d7d4ad96f996a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 7 19:33:14 2022 +0100
CAMEL-18804: Regen
---
.../resources/org/apache/camel/catalog/components/sftp.json | 4 ++--
.../org/apache/camel/component/file/remote/sftp.json | 4 ++--
.../builder/endpoint/dsl/SftpEndpointBuilderFactory.java | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
index 7c474f8c925..a25bd1baa2f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
@@ -160,8 +160,8 @@
"privateKeyFile": { "kind": "parameter", "displayName": "Private Key File", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file so that the SFTP endpoint can do private key verification." },
"privateKeyPassphrase": { "kind": "parameter", "displayName": "Private Key Passphrase", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file passphrase so that the SFTP endpoint can do private key verification." },
"privateKeyUri": { "kind": "parameter", "displayName": "Private Key Uri", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file (loaded from classpath by default) so that the SFTP endpoint can do private key veri [...]
- "publicKeyAcceptedAlgorithms": { "kind": "parameter", "displayName": "Public Key Accepted Algorithms", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of public key accepted algorithms. Some examples inc [...]
- "serverHostKeys": { "kind": "parameter", "displayName": "Server Host Keys", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of algorithms supported for the server host key. Some examples include: ssh-ed2 [...]
+ "publicKeyAcceptedAlgorithms": { "kind": "parameter", "displayName": "Public Key Accepted Algorithms", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of public key accepted algorithms. Some examples inc [...]
+ "serverHostKeys": { "kind": "parameter", "displayName": "Server Host Keys", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of algorithms supported for the server host key. Some examples include: ssh-dss [...]
"strictHostKeyChecking": { "kind": "parameter", "displayName": "Strict Host Key Checking", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "no", "yes" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "no", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets whether to use strict host key checking." },
"username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Username to use for login" },
"useUserKnownHostsFile": { "kind": "parameter", "displayName": "Use User Known Hosts File", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "If knownHostFile has not been explicit configured then use the host file fro [...]
diff --git a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
index 7c474f8c925..a25bd1baa2f 100644
--- a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
+++ b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
@@ -160,8 +160,8 @@
"privateKeyFile": { "kind": "parameter", "displayName": "Private Key File", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file so that the SFTP endpoint can do private key verification." },
"privateKeyPassphrase": { "kind": "parameter", "displayName": "Private Key Passphrase", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file passphrase so that the SFTP endpoint can do private key verification." },
"privateKeyUri": { "kind": "parameter", "displayName": "Private Key Uri", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file (loaded from classpath by default) so that the SFTP endpoint can do private key veri [...]
- "publicKeyAcceptedAlgorithms": { "kind": "parameter", "displayName": "Public Key Accepted Algorithms", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of public key accepted algorithms. Some examples inc [...]
- "serverHostKeys": { "kind": "parameter", "displayName": "Server Host Keys", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of algorithms supported for the server host key. Some examples include: ssh-ed2 [...]
+ "publicKeyAcceptedAlgorithms": { "kind": "parameter", "displayName": "Public Key Accepted Algorithms", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of public key accepted algorithms. Some examples inc [...]
+ "serverHostKeys": { "kind": "parameter", "displayName": "Server Host Keys", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of algorithms supported for the server host key. Some examples include: ssh-dss [...]
"strictHostKeyChecking": { "kind": "parameter", "displayName": "Strict Host Key Checking", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "no", "yes" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "no", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets whether to use strict host key checking." },
"username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Username to use for login" },
"useUserKnownHostsFile": { "kind": "parameter", "displayName": "Use User Known Hosts File", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "If knownHostFile has not been explicit configured then use the host file fro [...]
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
index f6f459c31d8..745cb89e73e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
@@ -2376,7 +2376,7 @@ public interface SftpEndpointBuilderFactory {
/**
* Set a comma separated list of public key accepted algorithms. Some
* examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not specified the default list from JSCH will be used.
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not specified the default list from JSCH will be used.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -2393,7 +2393,7 @@ public interface SftpEndpointBuilderFactory {
/**
* Set a comma separated list of algorithms supported for the server
* host key. Some examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not specified the default list from JSCH will be used.
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not specified the default list from JSCH will be used.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -4239,7 +4239,7 @@ public interface SftpEndpointBuilderFactory {
/**
* Set a comma separated list of public key accepted algorithms. Some
* examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not specified the default list from JSCH will be used.
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not specified the default list from JSCH will be used.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -4256,7 +4256,7 @@ public interface SftpEndpointBuilderFactory {
/**
* Set a comma separated list of algorithms supported for the server
* host key. Some examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not specified the default list from JSCH will be used.
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not specified the default list from JSCH will be used.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -5742,7 +5742,7 @@ public interface SftpEndpointBuilderFactory {
/**
* Set a comma separated list of public key accepted algorithms. Some
* examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not specified the default list from JSCH will be used.
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not specified the default list from JSCH will be used.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -5759,7 +5759,7 @@ public interface SftpEndpointBuilderFactory {
/**
* Set a comma separated list of algorithms supported for the server
* host key. Some examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not specified the default list from JSCH will be used.
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not specified the default list from JSCH will be used.
*
* The option is a: <code>java.lang.String</code> type.
*
[camel] 03/03: CAMEL-18805: Telegram : Fix unregister webhook API method (#8862)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cc237b9290137677fa82018247b1e13b7d7cd575
Author: Zineb BENDHIBA <be...@gmail.com>
AuthorDate: Wed Dec 7 19:33:33 2022 +0100
CAMEL-18805: Telegram : Fix unregister webhook API method (#8862)
---
.../telegram/service/TelegramServiceRestBotAPIAdapter.java | 7 ++++++-
.../camel/component/telegram/TelegramWebhookRegistrationTest.java | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
index 4a1934e1f3f..a207af7f294 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
@@ -190,7 +190,12 @@ public class TelegramServiceRestBotAPIAdapter implements TelegramService {
@Override
public boolean removeWebhook() {
- return setWebhook("");
+ final String uri = baseUri + "/deleteWebhook";
+
+ final HttpRequest.Builder request = HttpRequest.newBuilder().uri(URI.create(uri)).GET();
+
+ WebhookResult res = sendSyncRequest(request.build(), WebhookResult.class);
+ return res.isOk() && res.isResult();
}
@Override
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
index 9c4a2a5cbb7..876342dfe3e 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
@@ -136,6 +136,11 @@ public class TelegramWebhookRegistrationTest extends TelegramTestSupport {
"setWebhook?url=http://my-domain.com/my-test",
"GET",
String.class,
+ TelegramTestUtil.serialize(result))
+ .addEndpoint(
+ "deleteWebhook",
+ "GET",
+ String.class,
TelegramTestUtil.serialize(result));
}
[camel] 01/03: CAMEL-18804 update documentation (#8861)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b91e388404bfac48a4fd7a687a22460faab5829
Author: Maarten Donderwinkel <ma...@donderwinkel.org>
AuthorDate: Wed Dec 7 19:29:31 2022 +0100
CAMEL-18804 update documentation (#8861)
Update documentation for applicable algorithms supported according to http://www.jcraft.com/jsch/README.
Remove ed25519
---
.../org/apache/camel/component/file/remote/SftpConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index 5c34df7e8e4..cca314e163c 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -373,7 +373,7 @@ public class SftpConfiguration extends RemoteFileConfiguration {
/**
* Set a comma separated list of algorithms supported for the server host key. Some examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not
* specified the default list from JSCH will be used.
*/
public void setServerHostKeys(String serverHostKeys) {
@@ -386,7 +386,7 @@ public class SftpConfiguration extends RemoteFileConfiguration {
/**
* Set a comma separated list of public key accepted algorithms. Some examples include:
- * ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256 If not
+ * ssh-dss,ssh-rsa,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521. If not
* specified the default list from JSCH will be used.
*/
public void setPublicKeyAcceptedAlgorithms(String publicKeyAcceptedAlgorithms) {