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/18 07:40:39 UTC
[camel] branch main updated: Upgrade AWS SDK v2 to version 2.20.149 (#11435)
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 a893a2bb9f0 Upgrade AWS SDK v2 to version 2.20.149 (#11435)
a893a2bb9f0 is described below
commit a893a2bb9f09526feb4c12c3cba071b26b1b17cd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 18 09:40:33 2023 +0200
Upgrade AWS SDK v2 to version 2.20.149 (#11435)
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../component/spring/ws/SpringWebserviceConfiguration.java | 2 +-
.../main/java/org/apache/camel/catalog/impl/CatalogHelper.java | 10 +++-------
.../src/main/java/org/apache/camel/util/FileUtil.java | 2 +-
.../endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java | 6 ++----
.../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
parent/pom.xml | 2 +-
6 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
index f1ab3bf7369..73a0af8c5e9 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
@@ -106,7 +106,7 @@ public class SpringWebserviceConfiguration {
}
/**
- * Option to provide a custom WebServiceMessageFactory.
+ * Option to provide a custom WebServiceMessageFactory.
*/
public void setMessageFactory(WebServiceMessageFactory messageFactory) {
this.messageFactory = messageFactory;
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CatalogHelper.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CatalogHelper.java
index c07f1120a5c..f335dfea2bd 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CatalogHelper.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CatalogHelper.java
@@ -125,8 +125,6 @@ public final class CatalogHelper {
}
}
-
-
/**
* Parses the query parameters of the uri (eg the query part) manually.
* <p>
@@ -151,11 +149,10 @@ public final class CatalogHelper {
return parseQueryManually(query);
}
-
/**
* Parses the query part of the uri (eg the parameters) manually. This method is mostly used by the CamelCatalog in
- * order to be able to handle certain special characters markers (i.e.: "{{" and "}}"). It should not be used anywhere
- * else.
+ * order to be able to handle certain special characters markers (i.e.: "{{" and "}}"). It should not be used
+ * anywhere else.
* <p/>
* The URI parameters will by default be URI encoded. However, you can define a parameter values with the syntax:
* <tt>key=RAW(value)</tt> which tells Camel to not encode the value, and use the value as is (eg key=value) and the
@@ -175,7 +172,7 @@ public final class CatalogHelper {
if (uri.endsWith("&")) {
throw new URISyntaxException(
uri, "Invalid uri syntax: Trailing & marker found. "
- + "Check the uri and remove the trailing & marker.");
+ + "Check the uri and remove the trailing & marker.");
}
// need to parse the uri query parameters manually as we cannot rely on splitting by &,
@@ -259,7 +256,6 @@ public final class CatalogHelper {
}
}
-
private static void addParameter(String name, final String value, Map<String, Object> map, boolean isRaw) {
name = URLDecoder.decode(name, CHARSET);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
index e6260c3fa7f..5f06399f077 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
@@ -465,7 +465,7 @@ public final class FileUtil {
if (!deleteFile(from)) {
throw new IOException(
"Renaming file from '" + from + "' to '" + to + "' failed: Cannot delete file '" + from
- + "' after copy succeeded");
+ + "' after copy succeeded");
}
return true;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
index a7101a0b489..d46accd53c5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
@@ -603,8 +603,7 @@ public interface SpringWebserviceEndpointBuilderFactory {
return this;
}
/**
- * Option to provide a custom WebServiceMessageFactory. For example when
- * you want Apache Axiom to handle web service messages instead of SAAJ.
+ * Option to provide a custom WebServiceMessageFactory.
*
* The option is a:
* <code>org.springframework.ws.WebServiceMessageFactory</code> type.
@@ -620,8 +619,7 @@ public interface SpringWebserviceEndpointBuilderFactory {
return this;
}
/**
- * Option to provide a custom WebServiceMessageFactory. For example when
- * you want Apache Axiom to handle web service messages instead of SAAJ.
+ * Option to provide a custom WebServiceMessageFactory.
*
* The option will be converted to a
* <code>org.springframework.ws.WebServiceMessageFactory</code> type.
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 82030f8c798..b9efcf539a7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -203,7 +203,7 @@ public class Run extends CamelCommand {
@Option(names = { "--properties" },
description = "comma separated list of properties file" +
- " (ex. /path/to/file.properties,/path/to/other.properties")
+ " (ex. /path/to/file.properties,/path/to/other.properties")
String propertiesFiles;
@Option(names = { "-p", "--prop", "--property" }, description = "Additional properties (override existing)", arity = "0")
diff --git a/parent/pom.xml b/parent/pom.xml
index acbd7cb2363..a7bcea3a422 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.148</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.149</aws-java-sdk2-version>
<aws-xray-version>2.14.0</aws-xray-version>
<azure-sdk-bom-version>1.2.16</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>