You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/06/27 08:30:32 UTC
[camel] branch camel-3.21.x updated (6cf4ff50896 -> 329c300c947)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 6cf4ff50896 Revert "CAMEL-19130: Upgrade to snakeyaml 2.x (#10450)" (#10474)
new 13a74efd344 [CAMEL-19503] Upgrade to maven-resolver 1.9.13
new 212292a3736 CAMEL-19499: camel-yaml-dsl: Missing rest-configuration in YAML DSL schema (#10492)
new 329c300c947 CAMEL-19489: camel-minio - Update docs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-minio/src/main/docs/minio-component.adoc | 4 +---
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 1 +
.../apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 3 +++
.../src/generated/resources/schema/camel-yaml-dsl.json | 6 ++++++
.../camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json | 3 +++
parent/pom.xml | 2 +-
6 files changed, 15 insertions(+), 4 deletions(-)
[camel] 01/03: [CAMEL-19503] Upgrade to maven-resolver 1.9.13
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 13a74efd344b4bb150b8b4824932c170a15f572c
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Mon Jun 26 12:44:42 2023 +0200
[CAMEL-19503] Upgrade to maven-resolver 1.9.13
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f6b505c5651..dc4459b5219 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,7 +386,7 @@
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
- <maven-resolver-version>1.9.10</maven-resolver-version>
+ <maven-resolver-version>1.9.13</maven-resolver-version>
<maven-shade-plugin-version>3.4.1</maven-shade-plugin-version>
<maven-shared-utils-plugin-version>3.3.4</maven-shared-utils-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>
[camel] 03/03: CAMEL-19489: camel-minio - Update docs
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 329c300c94781de0075988f81db3dc24735d54a4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 27 10:22:10 2023 +0200
CAMEL-19489: camel-minio - Update docs
---
components/camel-minio/src/main/docs/minio-component.adoc | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/components/camel-minio/src/main/docs/minio-component.adoc b/components/camel-minio/src/main/docs/minio-component.adoc
index df4039785a5..e52b405fbfe 100644
--- a/components/camel-minio/src/main/docs/minio-component.adoc
+++ b/components/camel-minio/src/main/docs/minio-component.adoc
@@ -35,7 +35,7 @@ For example in order to read file `hello.txt` from the bucket `helloBucket`, use
[source,java]
--------------------------------------------------------------------------------
-from("minio://helloBucket?accessKey=yourAccessKey&secretKey=yourSecretKey&prefix=hello.txt")
+from("minio://helloBucket?accessKey=yourAccessKey&secretKey=yourSecretKey&objectName=hello.txt")
.to("file:/var/downloaded");
--------------------------------------------------------------------------------
@@ -65,8 +65,6 @@ This allows you for instance to know how many messages exists in this
batch and for instance let the Aggregator
aggregate this number of messages.
-== Usage
-
// component headers: START
include::partial$component-endpoint-headers.adoc[]
// component headers: END
[camel] 02/03: CAMEL-19499: camel-yaml-dsl: Missing rest-configuration in YAML DSL schema (#10492)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 212292a3736bbb1295b7142fab6af7b1c971e55d
Author: Tomohisa Igarashi <tm...@gmail.com>
AuthorDate: Mon Jun 26 12:01:10 2023 -0400
CAMEL-19499: camel-yaml-dsl: Missing rest-configuration in YAML DSL schema (#10492)
---
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 1 +
.../apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 3 +++
.../src/generated/resources/schema/camel-yaml-dsl.json | 6 ++++++
.../camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json | 3 +++
4 files changed, 13 insertions(+)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 42f77213767..9370353c1e8 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -12536,6 +12536,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
}
+ @YamlIn
@YamlType(
nodes = {
"rest-configuration",
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index 7f1b64acd12..2881b80dbc9 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -393,6 +393,9 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
if (info.name().toString().equals("org.apache.camel.model.rest.RestDefinition")) {
builder.addAnnotation(CN_YAML_IN);
}
+ if (info.name().toString().equals("org.apache.camel.model.rest.RestConfigurationDefinition")) {
+ builder.addAnnotation(CN_YAML_IN);
+ }
final AtomicReference<String> modelName = new AtomicReference<>();
annotationValue(info, XML_ROOT_ELEMENT_ANNOTATION_CLASS, "name")
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index 7f8aeca9036..1144392d45f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -8290,6 +8290,12 @@
"templatedRoute" : {
"$ref" : "#/items/definitions/org.apache.camel.model.TemplatedRouteDefinition"
},
+ "rest-configuration" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestConfigurationDefinition"
+ },
+ "restConfiguration" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestConfigurationDefinition"
+ },
"rest" : {
"$ref" : "#/items/definitions/org.apache.camel.model.rest.RestDefinition"
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index e8701676be3..d980756c26e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -8176,6 +8176,9 @@
"templatedRoute" : {
"$ref" : "#/items/definitions/org.apache.camel.model.TemplatedRouteDefinition"
},
+ "restConfiguration" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.rest.RestConfigurationDefinition"
+ },
"rest" : {
"$ref" : "#/items/definitions/org.apache.camel.model.rest.RestDefinition"
}