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 92e63c25ab5 Upgrade AWS SDK v2 to version 2.20.131 (#11179)
92e63c25ab5 is described below
commit 92e63c25ab53b04694457f885262713bc6202b65
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Aug 23 06:55:56 2023 +0200
Upgrade AWS SDK v2 to version 2.20.131 (#11179)
* Upgrade AWS SDK v2 to version 2.20.131
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>
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 2 --
.../src/main/java/org/apache/camel/impl/engine/VersionHolder.java | 4 +---
.../main/java/org/apache/camel/main/MainDurationEventNotifier.java | 3 ++-
parent/pom.xml | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 97f945a6a76..7a771fd0425 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -1906,13 +1906,11 @@ public abstract class AbstractCamelContext extends
BaseService
return new Date(startDate);
}
-
@Override
public String getVersion() {
return VersionHolder.VERSION;
}
-
@Override
protected void doSuspend() throws Exception {
EventHelper.notifyCamelContextSuspending(this);
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java
index a15943b6501..9190d562386 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java
@@ -24,8 +24,7 @@ import org.apache.camel.util.IOHelper;
class VersionHolder {
public static final String VERSION;
- private static final String POM_PROPERTIES =
-
"/META-INF/maven/org.apache.camel/camel-base-engine/pom.properties";
+ private static final String POM_PROPERTIES =
"/META-INF/maven/org.apache.camel/camel-base-engine/pom.properties";
static {
VERSION = doGetVersion();
@@ -68,7 +67,6 @@ class VersionHolder {
}
}
-
if (resolvedVersion == null) {
// we could not compute the version so use a blank
resolvedVersion = "";
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
index daecdbffeea..7b6c6e52b31 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
@@ -96,7 +96,8 @@ public class MainDurationEventNotifier extends
EventNotifierSupport {
boolean complete = false;
if (maxMessages > 0) {
- complete = event.getType() == CamelEvent.Type.ExchangeCompleted
|| event.getType() == CamelEvent.Type.ExchangeFailed;
+ complete = event.getType() == CamelEvent.Type.ExchangeCompleted
+ || event.getType() == CamelEvent.Type.ExchangeFailed;
if (complete) {
boolean result = doneMessages.incrementAndGet() >= maxMessages;
diff --git a/parent/pom.xml b/parent/pom.xml
index d9a1c5c0445..6e0c93d35dd 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.130</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.131</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>
