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 b6fe4f25202 Upgrade AWS SDK v2 to version 2.20.138 (#11265)
b6fe4f25202 is described below
commit b6fe4f2520281f0f1d30a0277faba43feeb3edbc
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Sep 1 07:21:46 2023 +0200
Upgrade AWS SDK v2 to version 2.20.138 (#11265)
* Upgrade AWS SDK v2 to version 2.20.138
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
* Regen
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java | 2 +-
.../java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java | 1 -
.../camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java | 4 ++--
.../java/org/apache/camel/component/mllp/MllpTcpClientProducer.java | 1 -
.../src/main/java/org/apache/camel/component/seda/SedaEndpoint.java | 3 ---
parent/pom.xml | 2 +-
6 files changed, 4 insertions(+), 9 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
index e0a9e69beb2..138995c6e59 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
@@ -213,7 +213,7 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
}
state = null;
}
-
+
} catch (Exception e) {
getEndpoint().getS3Client()
.abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName())
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
index d99e4405afa..fa166fdcdb8 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
@@ -26,7 +26,6 @@ import org.apache.camel.StreamCache;
import org.apache.camel.component.aws2.s3.AWS2S3Configuration;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
index f1eef645c19..d8d52d687ec 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
@@ -43,9 +43,9 @@ public class S3StreamUploadTimeoutIT extends Aws2S3Base {
@Test
public void sendIn() throws Exception {
- for(int i = 1; i <= 2; i++) {
+ for (int i = 1; i <= 2; i++) {
int count = i * 23;
-
+
result.expectedMessageCount(count);
for (int j = 0; j < 23; j++) {
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 19796a11e4b..802d7b8914b 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -112,7 +112,6 @@ public class MllpTcpClientProducer extends DefaultProducer
implements Runnable {
String fullEndpointKey = getEndpoint().getEndpointKey();
String endpointKey = StringHelper.before(fullEndpointKey, "?",
fullEndpointKey);
-
idleTimeoutExecutor =
Executors.newSingleThreadScheduledExecutor(new
IdleTimeoutThreadFactory(endpointKey));
}
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index e59dc325e1e..7f9f58d0398 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -221,7 +221,6 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
}
}
-
protected synchronized AsyncProcessor getConsumerMulticastProcessor() {
if (!multicastStarted && consumerMulticastProcessor != null) {
// only start it on-demand to avoid starting it during stopping
@@ -589,6 +588,4 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
queue = null;
}
-
-
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 3d5cd4e8baa..18e1cffd863 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.137</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.138</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>
