You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/07/04 12:06:23 UTC
[camel] branch main updated (bc1d1c10632 -> 25505e1e3e7)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from bc1d1c10632 CAMEL-18698 Enhance transform EIP and transformer documentation
new 388ca698571 Upgrade jsch to 0.2.9
new 25505e1e3e7 Upgrade littleproxy to 2.0.18
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:
camel-dependencies/pom.xml | 3 ++-
components/camel-ftp/pom.xml | 4 ++--
.../component/file/remote/integration/SftpKeyExchangeProtocolsIT.java | 2 +-
.../camel/component/file/remote/integration/SftpServerHostKeysIT.java | 2 +-
components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 4 ++--
parent/pom.xml | 3 ++-
6 files changed, 10 insertions(+), 8 deletions(-)
[camel] 02/02: Upgrade littleproxy to 2.0.18
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 25505e1e3e7d411c30b6c8f72d18e18337703cb3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jul 4 11:57:08 2023 +0100
Upgrade littleproxy to 2.0.18
---
camel-dependencies/pom.xml | 1 +
components/camel-ftp/pom.xml | 4 ++--
components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 4 ++--
parent/pom.xml | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 06472011db5..e8cb485e847 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -299,6 +299,7 @@
<libthrift-version>0.18.1</libthrift-version>
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<lightcouch-version>0.2.0</lightcouch-version>
+ <littleproxy-version>2.0.18</littleproxy-version>
<log4j2-version>2.20.0</log4j2-version>
<logback-version>1.4.8</logback-version>
<lucene-version>9.7.0</lucene-version>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index cda89d0edfd..2d1936d46df 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -102,9 +102,9 @@
<!-- for testing sftp through http proxy -->
<dependency>
- <groupId>org.littleshoot</groupId>
+ <groupId>xyz.rogfam</groupId>
<artifactId>littleproxy</artifactId>
- <version>1.1.2</version>
+ <version>${littleproxy-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 595bc4c6046..6462062bec3 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -170,9 +170,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.littleshoot</groupId>
+ <groupId>xyz.rogfam</groupId>
<artifactId>littleproxy</artifactId>
- <version>1.1.2</version>
+ <version>${littleproxy-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index a3a51f0e064..b434583fb25 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -323,6 +323,7 @@
<logback-version>1.4.8</logback-version>
<lucene-version>9.7.0</lucene-version>
<lightcouch-version>0.2.0</lightcouch-version>
+ <littleproxy-version>2.0.18</littleproxy-version>
<mapstruct-version>1.5.5.Final</mapstruct-version>
<!-- needed from tooling/archetypes -->
<maven-version>3.8.8</maven-version>
[camel] 01/02: Upgrade jsch to 0.2.9
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 388ca6985715eed37697c73265d455488f639872
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jul 4 11:41:14 2023 +0100
Upgrade jsch to 0.2.9
---
camel-dependencies/pom.xml | 2 +-
.../component/file/remote/integration/SftpKeyExchangeProtocolsIT.java | 2 +-
.../camel/component/file/remote/integration/SftpServerHostKeysIT.java | 2 +-
parent/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 5ab50319eff..06472011db5 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -267,7 +267,7 @@
<jool-version>0.9.15</jool-version>
<jooq-version>3.18.4</jooq-version>
<joor-version>0.9.14</joor-version>
- <jsch-version>0.2.1</jsch-version>
+ <jsch-version>0.2.9</jsch-version>
<jslt-version>0.1.14</jslt-version>
<jsmpp-version>2.3.11</jsmpp-version>
<json-patch-version>1.13</json-patch-version>
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpKeyExchangeProtocolsIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpKeyExchangeProtocolsIT.java
index a3dac2f1c69..ee1c6e9c95f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpKeyExchangeProtocolsIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpKeyExchangeProtocolsIT.java
@@ -70,7 +70,7 @@ public class SftpKeyExchangeProtocolsIT extends SftpServerTestSupport {
exception = exception.getCause();
}
- MatcherAssert.assertThat(errorMessages, Matchers.hasItem("Algorithm negotiation fail"));
+ MatcherAssert.assertThat(errorMessages, Matchers.hasItem(Matchers.containsString("Algorithm negotiation fail")));
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpServerHostKeysIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpServerHostKeysIT.java
index 698f0251cc1..ff54b79d0d0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpServerHostKeysIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpServerHostKeysIT.java
@@ -46,7 +46,7 @@ public class SftpServerHostKeysIT extends SftpServerTestSupport {
exception = exception.getCause();
}
- MatcherAssert.assertThat(errorMessages, Matchers.hasItem("Algorithm negotiation fail"));
+ MatcherAssert.assertThat(errorMessages, Matchers.hasItem(Matchers.containsString("Algorithm negotiation fail")));
}
@Test
diff --git a/parent/pom.xml b/parent/pom.xml
index 465a5f4309f..a3a51f0e064 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -290,7 +290,7 @@
<johnzon-version>1.2.20</johnzon-version>
<jslt-version>0.1.14</jslt-version>
<jsmpp-version>2.3.11</jsmpp-version>
- <jsch-version>0.2.1</jsch-version>
+ <jsch-version>0.2.9</jsch-version>
<json-api>1.0</json-api>
<jsonassert-version>1.5.1</jsonassert-version>
<json-path-version>2.8.0</json-path-version>