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/09/04 05:28:51 UTC
[camel] branch main updated: Upgrade AWS SDK v2 to version 2.20.140 (#11291)
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 3b7cae70b01 Upgrade AWS SDK v2 to version 2.20.140 (#11291)
3b7cae70b01 is described below
commit 3b7cae70b0127378bf3c95e95393bc18c163a998
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 4 07:28:45 2023 +0200
Upgrade AWS SDK v2 to version 2.20.140 (#11291)
* Upgrade AWS SDK v2 to version 2.20.140
Signed-off-by: Andrea Cosentino <an...@gmail.com>
* Regen
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../java/org/apache/camel/component/file/azure/FilesOperations.java | 2 +-
.../src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java | 2 --
.../main/java/org/apache/camel/component/jpa/TransactionStrategy.java | 2 +-
.../src/test/java/org/apache/camel/processor/ConvertBodyTest.java | 1 -
parent/pom.xml | 2 +-
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
index da39a382ea9..8cd7874b879 100644
--- a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
+++ b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
@@ -181,7 +181,7 @@ public class FilesOperations extends NormalizedOperations {
}
private boolean renameRemote(ShareFileClient fileClient, String shareRelativeTo) {
- // TODO set the replace flag? likely yes, callers strategy should avoid this call when otherwise
+ // TODO set the replace flag? likely yes, callers strategy should avoid this call when otherwise
var options = new ShareFileRenameOptions(shareRelativeTo);
var renamed = fileClient.renameWithResponse(options, endpoint.getMetadataTimeout(), Context.NONE).getValue();
return existsRemote(renamed);
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java
index d6d1e1a55da..9eface3e43b 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java
@@ -32,10 +32,8 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test class for {@link org.apache.camel.component.dhis2.api.Dhis2Get} APIs.
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/TransactionStrategy.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/TransactionStrategy.java
index 3a6255ccba5..39cd30d33f7 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/TransactionStrategy.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/TransactionStrategy.java
@@ -24,7 +24,7 @@ public interface TransactionStrategy {
/**
* Execute the work in transaction.
*
- * @param runnable the work to execute.
+ * @param runnable the work to execute.
*/
void executeInTransaction(Runnable runnable);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
index 00cbc270294..2ccfe20e3cc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.processor;
import java.io.ByteArrayInputStream;
import java.nio.charset.UnsupportedCharsetException;
import java.util.Date;
-import java.util.Locale;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
diff --git a/parent/pom.xml b/parent/pom.xml
index d1c9586cbf7..7a37c1ff26c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,7 +68,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.138</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.140</aws-java-sdk2-version>
<aws-xray-version>2.14.0</aws-xray-version>
<azure-sdk-bom-version>1.2.15</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>