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 2023/08/05 05:31:17 UTC
[camel] branch main updated (52143bd62a1 -> 5b28fe4128f)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 52143bd62a1 add salesforce section to 4.0 migration guide.
new 94c7bc512d1 Upgrade azure test container
new 5b28fe4128f camel-ftp: Fix test due to jsch upgrade
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:
.../component/file/remote/sftp/integration/SftpKeyPairECConsumeIT.java | 3 ++-
.../camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
[camel] 02/02: camel-ftp: Fix test due to jsch upgrade
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b28fe4128fa9417550b4a46001d5961d272debd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 5 07:31:07 2023 +0200
camel-ftp: Fix test due to jsch upgrade
---
.../component/file/remote/sftp/integration/SftpKeyPairECConsumeIT.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpKeyPairECConsumeIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpKeyPairECConsumeIT.java
index b635385aa7f..770a0e4fb5f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpKeyPairECConsumeIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpKeyPairECConsumeIT.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
+import com.jcraft.jsch.JSch;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -84,7 +85,7 @@ public class SftpKeyPairECConsumeIT extends SftpServerTestSupport {
// 83:d=1 hl=3 l= 137 cons: cont [ 1 ]
// 86:d=2 hl=3 l= 134 prim: BIT STRING
// and a key with "-----BEGIN EC PRIVATE KEY-----"
- com.jcraft.jsch.KeyPair kp = com.jcraft.jsch.KeyPair.genKeyPair(null, com.jcraft.jsch.KeyPair.ECDSA, 521);
+ com.jcraft.jsch.KeyPair kp = com.jcraft.jsch.KeyPair.genKeyPair(new JSch(), com.jcraft.jsch.KeyPair.ECDSA, 521);
kp.writePrivateKey(PRIVATE_KEY);
}
[camel] 01/02: Upgrade azure test container
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94c7bc512d104f2ce5d89a3ceccd1f5bed780ec7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 5 07:27:50 2023 +0200
Upgrade azure test container
---
.../apache/camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
index b35e887d115..8d88fb77033 100644
--- a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
+++ b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
@@ -26,7 +26,7 @@ public class AzuriteContainer extends GenericContainer<AzuriteContainer> {
public static final String DEFAULT_ACCOUNT_KEY
= "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
- public static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.23.0";
+ public static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.25.0";
public AzuriteContainer() {
this(IMAGE_NAME);