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 2023/07/19 08:20:24 UTC
[camel] branch main updated: Upgrade AWS SDK v2 to version 2.20.105 (#10719)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 01bc8aea080 Upgrade AWS SDK v2 to version 2.20.105 (#10719)
01bc8aea080 is described below
commit 01bc8aea080ffe5df05410882c1dc309340dd8c7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 19 10:20:18 2023 +0200
Upgrade AWS SDK v2 to version 2.20.105 (#10719)
* Upgrade AWS SDK v2 to version 2.20.105
Signed-off-by: Andrea Cosentino <an...@gmail.com>
* Sync and regen
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel-irc/src/test/unrealircd/unrealircd.conf | 17 +++++++++++++++++
.../telegram/integration/TelegramServiceProxyIT.java | 6 ++----
.../ResequenceStreamNotIgnoreInvalidExchangesTest.java | 2 +-
parent/pom.xml | 2 +-
4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/components/camel-irc/src/test/unrealircd/unrealircd.conf b/components/camel-irc/src/test/unrealircd/unrealircd.conf
index 6b5be58211c..f0895506c20 100644
--- a/components/camel-irc/src/test/unrealircd/unrealircd.conf
+++ b/components/camel-irc/src/test/unrealircd/unrealircd.conf
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceProxyIT.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceProxyIT.java
index 2ab6ba85b81..ec4d9c37618 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceProxyIT.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceProxyIT.java
@@ -64,12 +64,10 @@ public class TelegramServiceProxyIT extends TelegramTestSupport {
OutgoingTextMessage msg = new OutgoingTextMessage();
msg.setChatId(chatId);
msg.setText("This is an auto-generated message from the Bot");
- Assertions.assertDoesNotThrow(() ->
- template.requestBody(
+ Assertions.assertDoesNotThrow(() -> template.requestBody(
String.format("telegram://bots?chatId=%s&proxyHost=%s&proxyPort=%s&proxyType=%s", chatId, proxyHost, proxyPort,
proxyType),
- msg)
- );
+ msg));
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamNotIgnoreInvalidExchangesTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamNotIgnoreInvalidExchangesTest.java
index 31026c4d783..4d5dca838f5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamNotIgnoreInvalidExchangesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ResequenceStreamNotIgnoreInvalidExchangesTest.java
@@ -80,7 +80,7 @@ public class ResequenceStreamNotIgnoreInvalidExchangesTest extends ContextTestSu
template.sendBodyAndHeader("direct:start", "B", "seqno", 2);
assertThrows(CamelExecutionException.class, () -> template.sendBody("direct:start", "A"),
- "Should have thrown an exception");
+ "Should have thrown an exception");
assertMockEndpointsSatisfied();
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 6371b601832..ee0aad829b3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -70,7 +70,7 @@
<avro-ipc-jetty-version>1.11.2</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.2</avro-ipc-netty-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.20.103</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.105</aws-java-sdk2-version>
<aws-xray-version>2.14.0</aws-xray-version>
<azure-sdk-bom-version>1.2.14</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>