Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1773970585 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 6600452815-1173-ca719f6d-c9c7-4c0c-bc6d-81d0febfb032 * Camel Quarkus Commit: ca23fce15f55ecb3130f6e39910bae7c3ff21b85 * Camel Main Commit: e4bbd1ac980c0684714567ac703ae424f796bc1a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6600452815 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b1e81606db946d8ed9d311c372b58d16053b332a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Oct 22 01:20:24 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 5b249c857..ca4e6e170 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:608c34fb-8d8c-4982-93fe-e9b37b7fc18f",
+ "serialNumber": "urn:uuid:926629d9-3c2c-4b50-a271-4ac474dae39f",
"version": 1,
"metadata": {
-"timestamp": "2023-10-21T01:24:13Z",
+"timestamp": "2023-10-22T01:20:24Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231021012158-8c20a182ae03?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231022011806-4a0226a5405b?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231021012158-8c20a182ae03",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231021012158-8c20a182ae03?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231022011806-4a0226a5405b",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231022011806-4a0226a5405b?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -4021,7 +4021,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231021012158-8c20a182ae03?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231022011806-4a0226a5405b?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.29?type=module",
[camel-k] branch release-2.0.x updated (589288a97 -> b1e81606d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 589288a97 chore: nightly SBOM update new 4a0226a54 chore: changelog automatic update new b1e81606d chore: nightly SBOM update The 2 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: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 4a0226a5405b51cc21f86b963c171aa7e0b70975 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Oct 22 01:18:06 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81706832d..15c728eb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - nested Kamelets are not working [\#4837](https://github.com/apache/camel-k/issues/4837) - Error log traces after integration error [\#4781](https://github.com/apache/camel-k/issues/4781) +- Using an XSLT as a local dependency results in "unknown dependency error" [\#4426](https://github.com/apache/camel-k/issues/4426) - Projecting routes status to a Kubernetes Resource [\#2728](https://github.com/apache/camel-k/issues/2728) ## [v2.1.0](https://github.com/apache/camel-k/tree/v2.1.0) (2023-10-16)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 1c11a8a63ec66d1d82170157a243a3588e43787d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Oct 22 00:31:54 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81706832d..15c728eb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - nested Kamelets are not working [\#4837](https://github.com/apache/camel-k/issues/4837) - Error log traces after integration error [\#4781](https://github.com/apache/camel-k/issues/4781) +- Using an XSLT as a local dependency results in "unknown dependency error" [\#4426](https://github.com/apache/camel-k/issues/4426) - Projecting routes status to a Kubernetes Resource [\#2728](https://github.com/apache/camel-k/issues/2728) ## [v2.1.0](https://github.com/apache/camel-k/tree/v2.1.0) (2023-10-16)
[camel-k] branch release-2.1.x updated (45e944cf4 -> 7ff25e282)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 45e944cf4 chore: nightly SBOM update new 1c11a8a63 chore: changelog automatic update new 7ff25e282 chore: nightly SBOM update The 2 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: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.1.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7ff25e28276074f0c161892c92c43efa314b40ad
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Oct 22 00:35:15 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 1f434daaf..bfc3d84b1 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:f090daa5-ce28-4ef5-84cd-daff6ebc8e1f",
+ "serialNumber": "urn:uuid:40009e24-64af-41f8-88e6-8e47d7724f6f",
"version": 1,
"metadata": {
-"timestamp": "2023-10-21T00:38:27Z",
+"timestamp": "2023-10-22T00:35:15Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231021003449-b0b683331995?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231022003154-1c11a8a63ec6?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231021003449-b0b683331995",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231021003449-b0b683331995?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231022003154-1c11a8a63ec6",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231022003154-1c11a8a63ec6?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231021003449-b0b683331995?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231022003154-1c11a8a63ec6?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
Re: [I] Using an XSLT as a local dependency results in "unknown dependency error" [camel-k]
github-actions[bot] closed issue #4426: Using an XSLT as a local dependency results in "unknown dependency error" URL: https://github.com/apache/camel-k/issues/4426 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 429ade26b chore: nightly SBOM update
429ade26b is described below
commit 429ade26b9493bdf8d85ab811cd006a05e558d25
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Oct 21 23:47:38 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index ab8679800..3c1fbb8da 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:afbef4f1-2045-46c2-9b10-73f19765444d",
+ "serialNumber": "urn:uuid:486f15a6-ec15-4c36-abc4-339a349f6693",
"version": 1,
"metadata": {
-"timestamp": "2023-10-20T23:49:43Z",
+"timestamp": "2023-10-21T23:47:38Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231020234907-ea512aa69b02?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231020234943-ca6643007d75?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231020234907-ea512aa69b02",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231020234907-ea512aa69b02?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231020234943-ca6643007d75",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231020234943-ca6643007d75?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231020234907-ea512aa69b02?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231020234943-ca6643007d75?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
Re: [I] Can we remove the tectonic.ui crap [camel-kamelets]
lburgazzoli commented on issue #1700: URL: https://github.com/apache/camel-kamelets/issues/1700#issuecomment-1773840689 some of those descriptors are leveraged by tools to i.e. show the properties on different places/wizard/whatnot. the tectonic ones are leveraged by openshift's dev console so we may need to deprecate them before removing them -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Can we remove the tectonic.ui crap [camel-kamelets]
davsclaus commented on issue #1700: URL: https://github.com/apache/camel-kamelets/issues/1700#issuecomment-1773837846 Some of them can be replaced with enum #1699 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Can we remove the tectonic.ui crap [camel-kamelets]
davsclaus commented on issue #1700: URL: https://github.com/apache/camel-kamelets/issues/1700#issuecomment-1773837746 Maybe we can do a grep from terminal and find out approx how many x-descriptors there are to understand how big a work this is -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (51e48ef8484 -> c8f27cc57f1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 51e48ef8484 CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large add c8f27cc57f1 CAMEL-20001: camel-core - PropertiesParser should have a hook in a different phase that Spring Boot uses. This ensures that override properties from Camel will take precedence. No new revisions were added by this update. Summary of changes: .../camel/component/properties/DefaultPropertiesParser.java | 10 +- .../apache/camel/component/properties/PropertiesParser.java | 11 +++ .../modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc| 6 ++ 3 files changed, 26 insertions(+), 1 deletion(-)
[camel-spring-boot] branch main updated: CAMEL-20001: camel-core - PropertiesParser should have a hook in a different phase that Spring Boot uses. This ensures that override properties from Camel will
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 660a27179ee CAMEL-20001: camel-core - PropertiesParser should have a
hook in a different phase that Spring Boot uses. This ensures that override
properties from Camel will take precedence.
660a27179ee is described below
commit 660a27179eee32a147447bfe4b5d454dabb1fef8
Author: Claus Ibsen
AuthorDate: Sat Oct 21 16:30:47 2023 +0200
CAMEL-20001: camel-core - PropertiesParser should have a hook in a
different phase that Spring Boot uses. This ensures that override properties
from Camel will take precedence.
---
.../camel/spring/boot/SpringPropertiesParser.java | 13 +--
.../spring/boot/issues/OverridePropertiesTest.java | 101 +
2 files changed, 108 insertions(+), 6 deletions(-)
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
index d05f5bd2e34..1706bb942f6 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
@@ -17,22 +17,23 @@
package org.apache.camel.spring.boot;
import org.apache.camel.component.properties.DefaultPropertiesParser;
-import org.apache.camel.component.properties.PropertiesLookup;
import org.springframework.core.env.Environment;
-class SpringPropertiesParser extends DefaultPropertiesParser {
+/**
+ * Extension to {@link DefaultPropertiesParser} that will lookup
+ * in Spring via {@link Environment#getProperty(String)}.
+ */
+public class SpringPropertiesParser extends DefaultPropertiesParser {
// Members
private final Environment env;
-SpringPropertiesParser(Environment env) {
+public SpringPropertiesParser(Environment env) {
this.env = env;
}
-// Overridden
-
@Override
-public String parseProperty(String key, String value, PropertiesLookup
properties) {
+public String customLookup(String key) {
return env.getProperty(key);
}
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java
new file mode 100644
index 000..ddd1fef1260
--- /dev/null
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.boot.issues;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.properties.PropertiesComponent;
+import org.apache.camel.spring.boot.SpringPropertiesParser;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.env.PropertiesPropertySource;
+
+import java.util.Properties;
+
+public class OverridePropertiesTest extends CamelSpringTestSupport {
+
+@Override
+protected Properties useOverridePropertiesWithPropertiesComponent() {
+Properties prop = new Properties();
+prop.put("name", "Donald Duck");
+return prop;
+}
+
+@Override
+protected CamelContext createCamelContext() throws Exception {
+CamelContext context = super.createCamelContext();
+PropertiesComponent pc = (PropertiesComponent)
context.getPropertiesComponent();
+pc.setPropertiesParser(new
SpringPropertiesParser(applicationContext.getEnvironment()));
+return context;
+}
+
+@Test
+public void testOverrideProperties() throws Exception {
+context.addRoutes(new
[camel] branch main updated: CAMEL-20001: camel-core - PropertiesParser should have a hook in a different phase that Spring Boot uses. This ensures that override properties from Camel will take preced
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 c8f27cc57f1 CAMEL-20001: camel-core - PropertiesParser should have a
hook in a different phase that Spring Boot uses. This ensures that override
properties from Camel will take precedence.
c8f27cc57f1 is described below
commit c8f27cc57f1787f26ea5487bb90eb6b5113d79e5
Author: Claus Ibsen
AuthorDate: Sat Oct 21 16:29:46 2023 +0200
CAMEL-20001: camel-core - PropertiesParser should have a hook in a
different phase that Spring Boot uses. This ensures that override properties
from Camel will take precedence.
---
.../camel/component/properties/DefaultPropertiesParser.java | 10 +-
.../apache/camel/component/properties/PropertiesParser.java | 11 +++
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc| 6 ++
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
index 0053cc09de9..e74100846fe 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
@@ -446,6 +446,14 @@ public class DefaultPropertiesParser implements
PropertiesParser {
}
}
+if (value == null) {
+// custom lookup in spring boot or other runtimes
+value = customLookup(key);
+if (value != null) {
+log.debug("Found property (custom lookup): {} with value:
{} to be used.", key, value);
+}
+}
+
if (value == null && envMode ==
PropertiesComponent.ENVIRONMENT_VARIABLES_MODE_FALLBACK) {
value = lookupEnvironmentVariable(key);
if (value != null) {
@@ -461,7 +469,7 @@ public class DefaultPropertiesParser implements
PropertiesParser {
}
}
-// parse property may return null (such as when using spring boot
and route templates)
+// parse property may return null (such as when using route
templates)
String answer = parseProperty(key, value, properties);
if (answer == null) {
answer = value;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
index cb9f1cd67f0..7299188fc8f 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
@@ -50,4 +50,15 @@ public interface PropertiesParser {
* @returnthe value to use
*/
String parseProperty(String key, String value, PropertiesLookup
properties);
+
+/**
+ * Allow custom providers to attempt to lookup the property
+ *
+ * @param key the key
+ * @return the value if found or null if none found
+ */
+default String customLookup(String key) {
+return null;
+}
+
}
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc
index 2546edca1b9..dca28e4a9a3 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc
@@ -38,3 +38,9 @@ The Apache Ignite project (v2.15) is not yet Java 21
compatible and therefore `c
expected to function correctly if using Java 21.
A new release of Apache Ignite is expected that will start to support Java 21.
+
+=== camel-spring-boot
+
+The `initialProperties` and `overrideProperties` on Camel
`PropertiesComponent` will now
+take precedence over Spring Boot properties. This can be used for testing
purpose,
+to allow overriding properties when using `CamelTestSupport` for unit testing.
Re: [I] Can we remove the tectonic.ui crap [camel-kamelets]
oscerd commented on issue #1700: URL: https://github.com/apache/camel-kamelets/issues/1700#issuecomment-1773772077 This was when Kamelets were associated only to camel k -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_40x updated (6c0d0210bd9 -> 51e48ef8484)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_40x in repository https://gitbox.apache.org/repos/asf/camel.git from 6c0d0210bd9 CAMEL-20023: camel-file - File readLock changed minAge issue add 51e48ef8484 CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/converter/NIOConverter.java | 7 +++ 1 file changed, 7 insertions(+)
[camel] branch regen_bot updated (6c0d0210bd9 -> 51e48ef8484)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 6c0d0210bd9 CAMEL-20023: camel-file - File readLock changed minAge issue add 51e48ef8484 CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/converter/NIOConverter.java | 7 +++ 1 file changed, 7 insertions(+)
[camel-spring-boot] branch camel-spring-boot-4.0.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.0.x by
this push:
new 13db5c0db3e Regen
13db5c0db3e is described below
commit 13db5c0db3ef27d4d9b2725f5ad7e833ef768b49
Author: Claus Ibsen
AuthorDate: Sat Oct 21 13:37:05 2023 +0200
Regen
---
.../org/apache/camel/springboot/catalog/components/aws2-ec2.json | 2 +-
.../org/apache/camel/springboot/catalog/components/aws2-s3.json | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml| 8
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
index cebea664fa0..af2129e33cd 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
@@ -45,7 +45,7 @@
},
"headers": {
"CamelAwsEC2ImageId": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "An image ID of the AWS marketplace", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" },
-"CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
+"CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
"CamelAwsEC2Operation": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation we want to perform", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" },
"CamelAwsEC2InstanceMinCount": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The minimum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" },
"CamelAwsEC2InstanceMaxCount": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The maximum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
index 3f33ed0edba..7a649a84730 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
@@ -99,7 +99,7 @@
"CamelAwsS3Operation": { "index": 16, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation to perform. Permitted values are
copyObject, deleteObject, listBuckets, deleteBucket, listObjects",
"constantName":
"org.apache.camel.component.aws2.s3.AWS2S3Constants#S3_OPERATION" },
"CamelAwsS3ServerSideEncryption": {
[camel] branch main updated: CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 51e48ef8484 CAMEL-19975: Convert file to ByteBuffer should fail if the
file is too large
51e48ef8484 is described below
commit 51e48ef8484c415985b3e9fcb2dc50bd5f37135b
Author: Claus Ibsen
AuthorDate: Sat Oct 21 13:29:58 2023 +0200
CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large
---
.../src/main/java/org/apache/camel/converter/NIOConverter.java | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
b/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
index 8d3aed054dd..91080749d9d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -71,6 +71,13 @@ public final class NIOConverter {
@Converter(order = 5)
public static ByteBuffer toByteBuffer(File file) throws IOException {
+if (file.length() > Integer.MAX_VALUE) {
+// very big file we cannot load into memory
+throw new IOException(
+"Cannot convert file: " + file.getName() + " to
ByteBuffer. The file length is too large: "
+ + file.length());
+}
+
InputStream in = null;
try {
byte[] buf = new byte[(int) file.length()];
[camel] branch camel-4.0.x updated: CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 7029d87bfc8 CAMEL-19975: Convert file to ByteBuffer should fail if the
file is too large
7029d87bfc8 is described below
commit 7029d87bfc8d66192808f5f0004fcf294ddc
Author: Claus Ibsen
AuthorDate: Sat Oct 21 13:29:58 2023 +0200
CAMEL-19975: Convert file to ByteBuffer should fail if the file is too large
---
.../src/main/java/org/apache/camel/converter/NIOConverter.java | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
b/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
index 8d3aed054dd..91080749d9d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
@@ -71,6 +71,13 @@ public final class NIOConverter {
@Converter(order = 5)
public static ByteBuffer toByteBuffer(File file) throws IOException {
+if (file.length() > Integer.MAX_VALUE) {
+// very big file we cannot load into memory
+throw new IOException(
+"Cannot convert file: " + file.getName() + " to
ByteBuffer. The file length is too large: "
+ + file.length());
+}
+
InputStream in = null;
try {
byte[] buf = new byte[(int) file.length()];
[I] Karavan Space - Route configuration does not work [camel-karavan]
davsclaus opened a new issue, #945: URL: https://github.com/apache/camel-karavan/issues/945 When I add onException and any of the others, then the UI show a tiny box but I cannot configure anything, see picture https://github.com/apache/camel-karavan/assets/477100/dc4bbaf2-8960-4240-90a3-aff6bfdf96c0";> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_40x updated (a744ff06ad1 -> 6c0d0210bd9)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot_40x
in repository https://gitbox.apache.org/repos/asf/camel.git
from a744ff06ad1 Add in upgrade guide that camel-ignite is not expected to
work with Java 21
add 037a1433195 Regen
add e6cede73c02 Model apps (#11795)
add 52564b245c5 CAMEL-20026: camel-jbang - Export camel-main allow to
configure jib-maven-plugin version
add 99af625708b Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b
(#11796)
add b89d9573f6e Revert "File Changed ReadLock Strategy with minAge only
looks for lastModified (#10131)"
add 6c0d0210bd9 CAMEL-20023: camel-file - File readLock changed minAge
issue
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models-app.properties | 7 +
.../org/apache/camel/catalog/models-app/bean.json | 26
.../catalog/{models => models-app}/beans.json | 18 +--
.../catalog/{models => models-app}/camel.json | 18 +--
.../camel/catalog/models-app/constructor.json | 18 +++
.../camel/catalog/models-app/constructors.json | 17 +++
.../camel/catalog/models-app/properties.json | 17 +++
.../apache/camel/catalog/models-app/property.json | 19 +++
.../org/apache/camel/catalog/models.properties | 2 -
.../org/apache/camel/catalog/models/property.json | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 75 +++---
.../FileChangedExclusiveReadLockStrategy.java | 14 +-
.../camel/impl/engine/AbstractCamelContext.java| 16 ++
.../services/org/apache/camel/model.properties | 2 -
.../resources/org/apache/camel/model/app/bean.json | 26
.../org/apache/camel/model/app/beans.json | 18 +--
.../org/apache/camel/model/app/camel.json | 18 +--
.../org/apache/camel/model/app/constructor.json| 18 +++
.../org/apache/camel/model/app/constructors.json | 17 +++
.../org/apache/camel/model/app/properties.json | 17 +++
.../org/apache/camel/model/app/property.json | 19 +++
.../resources/org/apache/camel/model/property.json | 4 +-
.../org/apache/camel/model/PropertyDefinition.java | 4 +-
.../camel/model/app/ApplicationDefinition.java | 2 +-
.../camel/model/app/BeanConstructorDefinition.java | 8 +-
.../model/app/BeanConstructorsDefinition.java | 9 ++
.../camel/model/app/BeanPropertiesDefinition.java | 9 ++
.../camel/model/app/BeanPropertyDefinition.java| 15 ++
.../apache/camel/model/app/BeansDefinition.java| 44 --
.../camel/model/app/ComponentScanDefinition.java | 3 +
.../camel/model/app/RegistryBeanDefinition.java| 39 -
.../camel/main/MainDurationEventNotifier.java | 2 -
.../org/apache/camel/support/DefaultComponent.java | 11 +-
.../org/apache/camel/support/DefaultEndpoint.java | 11 +-
.../support/RestConsumerContextPathMatcher.java| 6 +-
.../ROOT/pages/camel-4-migration-guide.adoc| 11 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_2.adoc | 8 +
.../modules/ROOT/pages/camel-jbang.adoc| 5 +
.../dsl/jbang/core/commands/ExportBaseCommand.java | 11 ++
.../dsl/jbang/core/commands/ExportCamelMain.java | 4 +-
.../resources/templates/main-kubernetes-pom.tmpl | 2 +-
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 166 +
.../deserializers/ModelDeserializersResolver.java | 4 -
.../generated/resources/schema/camelYamlDsl.json | 130 +---
.../apache/camel/maven/packaging/GenerateMojo.java | 2 +-
.../camel/maven/packaging/PackageModelMojo.java| 2 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 42 ++
.../camel/maven/packaging/SchemaGeneratorMojo.java | 49 +-
49 files changed, 551 insertions(+), 440 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
rename
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/{models
=> models-app}/beans.json (76%)
rename
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/{models
=> models-app}/camel.json (75%)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/constructor.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/constructors.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/properties.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/property.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/app/bean.json
create mode 100644
core/camel-cor
[camel] branch regen_bot updated (99af625708b -> 6c0d0210bd9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 99af625708b Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b (#11796) add b89d9573f6e Revert "File Changed ReadLock Strategy with minAge only looks for lastModified (#10131)" add 6c0d0210bd9 CAMEL-20023: camel-file - File readLock changed minAge issue No new revisions were added by this update. Summary of changes: .../strategy/FileChangedExclusiveReadLockStrategy.java | 14 -- .../modules/ROOT/pages/camel-4-migration-guide.adoc| 11 +++ .../modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc | 8 3 files changed, 27 insertions(+), 6 deletions(-)
[camel] branch camel-4.0.x updated: Revert "File Changed ReadLock Strategy with minAge only looks for lastModified (#10131)"
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 1a815dcc6d8 Revert "File Changed ReadLock Strategy with minAge only
looks for lastModified (#10131)"
1a815dcc6d8 is described below
commit 1a815dcc6d8fe4fa6035d89188ec53f693d98a89
Author: Claus Ibsen
AuthorDate: Sat Oct 21 12:21:08 2023 +0200
Revert "File Changed ReadLock Strategy with minAge only looks for
lastModified (#10131)"
This reverts commit e957e02a6f73daed34e7e912951763d383064a9c.
---
.../strategy/FileChangedExclusiveReadLockStrategy.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
index 1bf34e8b0c5..c3d01f0880f 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.file.strategy;
import java.io.File;
+import java.util.Date;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -57,7 +58,7 @@ public class FileChangedExclusiveReadLockStrategy extends
MarkerFileExclusiveRea
long lastModified = Long.MIN_VALUE;
long length = Long.MIN_VALUE;
StopWatch watch = new StopWatch();
-long startTime = System.currentTimeMillis();
+long startTime = (new Date()).getTime();
while (!exclusive) {
// timeout check
@@ -80,15 +81,16 @@ public class FileChangedExclusiveReadLockStrategy extends
MarkerFileExclusiveRea
long newLastModified = target.lastModified();
long newLength = target.length();
-long minTriggerTime = startTime + minAge;
-long currentTime = System.currentTimeMillis();
+long newOlderThan = startTime + watch.taken() - minAge;
LOG.trace("Previous last modified: {}, new last modified: {}",
lastModified, newLastModified);
LOG.trace("Previous length: {}, new length: {}", length,
newLength);
-LOG.trace("Min File Trigger Time: {}", minTriggerTime);
+LOG.trace("New older than threshold: {}", newOlderThan);
-if (newLength >= minLength && currentTime >= minTriggerTime
-&& newLastModified == lastModified && newLength == length)
{
+// CHECKSTYLE:OFF
+if (newLength >= minLength && ((minAge == 0 && newLastModified ==
lastModified && newLength == length)
+|| (minAge != 0 && newLastModified < newOlderThan))) {
+// CHECKSTYLE:ON
LOG.trace("Read lock acquired.");
exclusive = true;
} else {
[camel] 01/02: Revert "File Changed ReadLock Strategy with minAge only looks for lastModified (#10131)"
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b89d9573f6e591eee7030605af65a213367b4fa0
Author: Claus Ibsen
AuthorDate: Sat Oct 21 12:21:08 2023 +0200
Revert "File Changed ReadLock Strategy with minAge only looks for
lastModified (#10131)"
This reverts commit e957e02a6f73daed34e7e912951763d383064a9c.
---
.../strategy/FileChangedExclusiveReadLockStrategy.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
index 1bf34e8b0c5..c3d01f0880f 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileChangedExclusiveReadLockStrategy.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.file.strategy;
import java.io.File;
+import java.util.Date;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -57,7 +58,7 @@ public class FileChangedExclusiveReadLockStrategy extends
MarkerFileExclusiveRea
long lastModified = Long.MIN_VALUE;
long length = Long.MIN_VALUE;
StopWatch watch = new StopWatch();
-long startTime = System.currentTimeMillis();
+long startTime = (new Date()).getTime();
while (!exclusive) {
// timeout check
@@ -80,15 +81,16 @@ public class FileChangedExclusiveReadLockStrategy extends
MarkerFileExclusiveRea
long newLastModified = target.lastModified();
long newLength = target.length();
-long minTriggerTime = startTime + minAge;
-long currentTime = System.currentTimeMillis();
+long newOlderThan = startTime + watch.taken() - minAge;
LOG.trace("Previous last modified: {}, new last modified: {}",
lastModified, newLastModified);
LOG.trace("Previous length: {}, new length: {}", length,
newLength);
-LOG.trace("Min File Trigger Time: {}", minTriggerTime);
+LOG.trace("New older than threshold: {}", newOlderThan);
-if (newLength >= minLength && currentTime >= minTriggerTime
-&& newLastModified == lastModified && newLength == length)
{
+// CHECKSTYLE:OFF
+if (newLength >= minLength && ((minAge == 0 && newLastModified ==
lastModified && newLength == length)
+|| (minAge != 0 && newLastModified < newOlderThan))) {
+// CHECKSTYLE:ON
LOG.trace("Read lock acquired.");
exclusive = true;
} else {
[camel] branch main updated (99af625708b -> 6c0d0210bd9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 99af625708b Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b (#11796) new b89d9573f6e Revert "File Changed ReadLock Strategy with minAge only looks for lastModified (#10131)" new 6c0d0210bd9 CAMEL-20023: camel-file - File readLock changed minAge issue The 2 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: .../strategy/FileChangedExclusiveReadLockStrategy.java | 14 -- .../modules/ROOT/pages/camel-4-migration-guide.adoc| 11 +++ .../modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc | 8 3 files changed, 27 insertions(+), 6 deletions(-)
[camel] 02/02: CAMEL-20023: camel-file - File readLock changed minAge issue
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 6c0d0210bd9db440d95fe80056a338cef4652ef7 Author: Claus Ibsen AuthorDate: Sat Oct 21 12:38:51 2023 +0200 CAMEL-20023: camel-file - File readLock changed minAge issue --- .../modules/ROOT/pages/camel-4-migration-guide.adoc | 11 +++ .../modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc| 8 2 files changed, 19 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc index aeeca720ea5..13f5c3fd2ba 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc @@ -511,6 +511,17 @@ If the route or consumer is suspended then http status 503 is now returned inste The component was updated to use Twitter4j version 4.1.2, which https://twitter4j.org/2022/10/21/264[has moved the packages] used by a few of its classes. If accessing certain twitter-related data, such as the Twit status, you need to update the packages used from `twitter4j.Status` to `twitter4j.v1.Status`. +== Upgrading Camel 4.0.1 to 4.0.2 + +=== camel-file + +The `readLock=changed` with using `readLockMinAge` has been restored to same behaviour as 3.x. + +For example using `readLockMinAge=5s` would pickup files that are older than 5 seconds from startup time. +If you have many existing files on startup that are old, then Camel will now again be fast, +and pickup these files immediately. + + == Upgrading Camel 4.0.0 to 4.0.1 === camel-aws2-sns diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc index 91ab3961243..2546edca1b9 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc @@ -6,6 +6,14 @@ from both 4.0 to 4.1 and 4.1 to 4.2. == Upgrading Camel 4.1 to 4.2 +=== camel-file + +The `readLock=changed` with using `readLockMinAge` has been restored to same behaviour as 3.x. + +For example using `readLockMinAge=5s` would pickup files that are older than 5 seconds from startup time. +If you have many existing files on startup that are old, then Camel will now again be fast, +and pickup these files immediately. + === camel-kafka The consumer will now pre validate hostname:port and DNS resolution on startup, and fail-fast
[camel] branch regen_bot updated (e7cb74487c4 -> 99af625708b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit e7cb74487c4 Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b add 52564b245c5 CAMEL-20026: camel-jbang - Export camel-main allow to configure jib-maven-plugin version add 99af625708b Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b (#11796) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e7cb74487c4) \ N -- N -- N refs/heads/regen_bot (99af625708b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 5 + .../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 11 +++ .../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 4 +++- .../src/main/resources/templates/main-kubernetes-pom.tmpl | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-)
Re: [I] Upgrade jib-maven-plugin [camel-karavan]
davsclaus commented on issue #908: URL: https://github.com/apache/camel-karavan/issues/908#issuecomment-1773742863 You can configure in application.properties with key `camel.jbang.jib-maven-plugin-version` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Upgrade jib-maven-plugin [camel-karavan]
davsclaus commented on issue #908: URL: https://github.com/apache/camel-karavan/issues/908#issuecomment-1773742751 You can now configure this and we use 3.4.0 as default version in Camel 4.2 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b (#11796)
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 99af625708b Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b (#11796) 99af625708b is described below commit 99af625708b0f05f64c8db82504d92f274c8f1ee Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Oct 21 12:10:56 2023 +0200 Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b (#11796) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../apache/camel/catalog/schemas/camel-spring.xsd | 52 +++--- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 8b8aba708c5..50efc8aa176 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -75,7 +75,7 @@ Configures batch-processing resequence eip. @@ -1143,7 +1143,7 @@ Properties to use with properties placeholder @@ -3852,50 +3852,10 @@ Enables random backoff. Default value: false - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
Re: [PR] Generated sources regen [camel]
davsclaus merged PR #11796: URL: https://github.com/apache/camel/pull/11796 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (037a1433195 -> e7cb74487c4)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git
from 037a1433195 Regen
add e6cede73c02 Model apps (#11795)
add e7cb74487c4 Regen for commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models-app.properties | 7 +
.../org/apache/camel/catalog/models-app/bean.json | 26
.../catalog/{models => models-app}/beans.json | 18 +--
.../catalog/{models => models-app}/camel.json | 18 +--
.../camel/catalog/models-app/constructor.json | 18 +++
.../camel/catalog/models-app/constructors.json | 17 +++
.../camel/catalog/models-app/properties.json | 17 +++
.../apache/camel/catalog/models-app/property.json | 19 +++
.../org/apache/camel/catalog/models.properties | 2 -
.../org/apache/camel/catalog/models/property.json | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 75 +++---
.../camel/impl/engine/AbstractCamelContext.java| 16 ++
.../services/org/apache/camel/model.properties | 2 -
.../resources/org/apache/camel/model/app/bean.json | 26
.../org/apache/camel/model/app/beans.json | 18 +--
.../org/apache/camel/model/app/camel.json | 18 +--
.../org/apache/camel/model/app/constructor.json| 18 +++
.../org/apache/camel/model/app/constructors.json | 17 +++
.../org/apache/camel/model/app/properties.json | 17 +++
.../org/apache/camel/model/app/property.json | 19 +++
.../resources/org/apache/camel/model/property.json | 4 +-
.../org/apache/camel/model/PropertyDefinition.java | 4 +-
.../camel/model/app/ApplicationDefinition.java | 2 +-
.../camel/model/app/BeanConstructorDefinition.java | 8 +-
.../model/app/BeanConstructorsDefinition.java | 9 ++
.../camel/model/app/BeanPropertiesDefinition.java | 9 ++
.../camel/model/app/BeanPropertyDefinition.java| 15 ++
.../apache/camel/model/app/BeansDefinition.java| 44 --
.../camel/model/app/ComponentScanDefinition.java | 3 +
.../camel/model/app/RegistryBeanDefinition.java| 39 -
.../camel/main/MainDurationEventNotifier.java | 2 -
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 166 +
.../deserializers/ModelDeserializersResolver.java | 4 -
.../generated/resources/schema/camelYamlDsl.json | 130 +---
.../apache/camel/maven/packaging/GenerateMojo.java | 2 +-
.../camel/maven/packaging/PackageModelMojo.java| 2 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 42 ++
.../camel/maven/packaging/SchemaGeneratorMojo.java | 49 +-
39 files changed, 488 insertions(+), 420 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
rename
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/{models
=> models-app}/beans.json (76%)
rename
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/{models
=> models-app}/camel.json (75%)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/constructor.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/constructors.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/properties.json
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/property.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/app/bean.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/app/constructor.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/app/constructors.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/app/properties.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/app/property.json
[PR] Generated sources regen [camel]
github-actions[bot] opened a new pull request, #11796: URL: https://github.com/apache/camel/pull/11796 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-20026: camel-jbang - Export camel-main allow to configure jib-maven-plugin version
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 52564b245c5 CAMEL-20026: camel-jbang - Export camel-main allow to
configure jib-maven-plugin version
52564b245c5 is described below
commit 52564b245c510d82870ef99c6d1255e20f97e005
Author: Claus Ibsen
AuthorDate: Sat Oct 21 12:09:38 2023 +0200
CAMEL-20026: camel-jbang - Export camel-main allow to configure
jib-maven-plugin version
---
docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 5 +
.../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 11 +++
.../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 4 +++-
.../src/main/resources/templates/main-kubernetes-pom.tmpl | 2 +-
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 314bd99da6b..3b5f07b7595 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -2382,6 +2382,8 @@ jkube.enricher.jkube-service.port=8080
jkube.recreate=true
+TIP: You can specify the jib-maven-plugin version using the
`camel.jbang.jib-maven-plugin-version` property in `application.properties`.
+
You can find more details in the https://eclipse.dev/jkube/docs/[Eclipse
JKube] and
https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin[Jib]
documentations.
= Resource fragments
@@ -2546,6 +2548,9 @@ The follow options related to _exporting_, can be
configured in `application.pro
|`camel.jbang.ignoreLoadingError`
| Whether to ignore route loading and compilation errors (use this with care!)
+|`camel.jbang.jib-maven-plugin-version`
+| Version to use for jib-maven-plugin if exporting to camel-main and have
Kubernetes enabled (jkube.xxx options).
+
|===
NOTE: These are options from the export command, so you can see mor details
and default values using `camel export --help`.
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 4d6f3ccd518..a473a91f8d9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -681,6 +681,17 @@ abstract class ExportBaseCommand extends CamelCommand {
return -1;
}
+protected static String jibMavenPluginVersion(File settings) {
+try {
+List lines = Files.readAllLines(settings.toPath());
+return lines.stream().filter(l ->
l.startsWith("camel.jbang.jib-maven-plugin-version="))
+.map(s -> StringHelper.after(s,
"=")).findFirst().orElse("3.4.0");
+} catch (Exception e) {
+// ignore
+}
+return "3.4.0";
+}
+
protected static void safeCopy(File source, File target, boolean override)
throws Exception {
if (!source.exists()) {
return;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index f081c8d90d6..bb9110b3ff0 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -255,7 +255,9 @@ class ExportCamelMain extends Export {
if (port == -1) {
port = 8080;
}
-sb2.append(context2.replaceFirst("\\{\\{ \\.Port }}",
String.valueOf(port)));
+context2 = context2.replaceFirst("\\{\\{ \\.Port }}",
String.valueOf(port));
+context2 = context2.replaceFirst("\\{\\{ \\.JibMavenPluginVersion
}}", jibMavenPluginVersion(settings));
+sb2.append(context2);
}
context = context.replace("{{ .CamelKubernetesProperties }}",
sb1.toString());
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
index ac6a1e70f91..0623bd06a0b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-kubernetes-pom.tmpl
@@ -1,7 +1,7 @@
com.google.cloud.tools
jib-maven-plugin
-
Re: [I] Upgrade jib-maven-plugin [camel-karavan]
davsclaus commented on issue #908: URL: https://github.com/apache/camel-karavan/issues/908#issuecomment-1773739392 This will require a new camel release so moving to 4.2. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Upgrade jib-maven-plugin [camel-karavan]
davsclaus commented on issue #908: URL: https://github.com/apache/camel-karavan/issues/908#issuecomment-1773738929 https://issues.apache.org/jira/browse/CAMEL-20026 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch model-apps deleted (was d13fc8b0645)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch model-apps in repository https://gitbox.apache.org/repos/asf/camel.git was d13fc8b0645 CAMEL-20024: camel-core-model - Add description for new bean DSL The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Model apps (#11795)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 e6cede73c02 Model apps (#11795)
e6cede73c02 is described below
commit e6cede73c02c88d83ffd5876090e0072f9ea8e7b
Author: Claus Ibsen
AuthorDate: Sat Oct 21 11:57:35 2023 +0200
Model apps (#11795)
CAMEL-20024: camel-core-model - Add description for new bean DSL
---
.../org/apache/camel/catalog/models-app.properties | 7 +
.../org/apache/camel/catalog/models-app/bean.json | 26
.../catalog/{models => models-app}/beans.json | 18 +--
.../catalog/{models => models-app}/camel.json | 18 +--
.../camel/catalog/models-app/constructor.json | 18 +++
.../camel/catalog/models-app/constructors.json | 17 +++
.../camel/catalog/models-app/properties.json | 17 +++
.../apache/camel/catalog/models-app/property.json | 19 +++
.../org/apache/camel/catalog/models.properties | 2 -
.../org/apache/camel/catalog/models/property.json | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 23 +--
.../camel/impl/engine/AbstractCamelContext.java| 16 ++
.../services/org/apache/camel/model.properties | 2 -
.../resources/org/apache/camel/model/app/bean.json | 26
.../org/apache/camel/model/app/beans.json | 18 +--
.../org/apache/camel/model/app/camel.json | 18 +--
.../org/apache/camel/model/app/constructor.json| 18 +++
.../org/apache/camel/model/app/constructors.json | 17 +++
.../org/apache/camel/model/app/properties.json | 17 +++
.../org/apache/camel/model/app/property.json | 19 +++
.../resources/org/apache/camel/model/property.json | 4 +-
.../org/apache/camel/model/PropertyDefinition.java | 4 +-
.../camel/model/app/ApplicationDefinition.java | 2 +-
.../camel/model/app/BeanConstructorDefinition.java | 8 +-
.../model/app/BeanConstructorsDefinition.java | 9 ++
.../camel/model/app/BeanPropertiesDefinition.java | 9 ++
.../camel/model/app/BeanPropertyDefinition.java| 15 ++
.../apache/camel/model/app/BeansDefinition.java| 44 --
.../camel/model/app/ComponentScanDefinition.java | 3 +
.../camel/model/app/RegistryBeanDefinition.java| 39 -
.../camel/main/MainDurationEventNotifier.java | 2 -
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 166 +
.../deserializers/ModelDeserializersResolver.java | 4 -
.../generated/resources/schema/camelYamlDsl.json | 130 +---
.../apache/camel/maven/packaging/GenerateMojo.java | 2 +-
.../camel/maven/packaging/PackageModelMojo.java| 2 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 42 ++
.../camel/maven/packaging/SchemaGeneratorMojo.java | 49 +-
39 files changed, 482 insertions(+), 374 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
new file mode 100644
index 000..2a3a0b1b286
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
@@ -0,0 +1,7 @@
+bean
+beans
+camel
+constructor
+constructors
+properties
+property
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
new file mode 100644
index 000..ffb007e78e4
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
@@ -0,0 +1,26 @@
+{
+ "model": {
+"kind": "model",
+"name": "bean",
+"title": "Bean",
+"description": "Define custom beans that can be used in your Camel routes
and in general.",
+"deprecated": false,
+"label": "configuration",
+"javaType": "org.apache.camel.model.app.RegistryBeanDefinition",
+"abstract": false,
+"input": false,
+"output": false
+ },
+ "properties": {
+"name": { "index": 0, "kind": "attribute", "displayName": "Name",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
name of the bean (bean id)" },
+"type": { "index": 1, "kind": "attribute", "displayName": "Type",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
class name (fully qualified) of the bean" },
+"initMethod": { "index": 2, "kind": "attribute", "displayName": "Init
Method", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description"
Re: [PR] Model apps [camel]
davsclaus merged PR #11795: URL: https://github.com/apache/camel/pull/11795 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Model apps [camel]
github-actions[bot] commented on PR #11795: URL: https://github.com/apache/camel/pull/11795#issuecomment-1773734297 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Model apps [camel]
davsclaus opened a new pull request, #11795: URL: https://github.com/apache/camel/pull/11795 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 03/04: CAMEL-20024: camel-core-model - Add description for new bean DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch model-apps
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 473f4856b9f12cc9828d1f9cb3d3c716f47d5971
Author: Claus Ibsen
AuthorDate: Sat Oct 21 11:30:27 2023 +0200
CAMEL-20024: camel-core-model - Add description for new bean DSL
---
.../apache/camel/catalog/schemas/camel-spring.xsd | 23 +--
.../camel-yaml-dsl-deserializers/pom.xml | 2 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 166 +
.../deserializers/ModelDeserializersResolver.java | 4 -
.../generated/resources/schema/camelYamlDsl.json | 130 +---
5 files changed, 20 insertions(+), 305 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 0be8875ac2e..8b8aba708c5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -93,9 +93,7 @@ Spring specific DefaultCamelBeanPostProcessor which uses
Spring BeanPostProcesso
@@ -141,7 +139,7 @@ Deprecated: null
@@ -2299,7 +2297,7 @@ property.
@@ -2308,7 +2306,7 @@ Property key.
@@ -13573,13 +13571,20 @@ Uses a custom thread pool.
+
+
+
+
+
+
+
-
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index 30e4da51d03..9bf7cf17c05 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -140,6 +140,8 @@
org.apache.camel.model.RestsDefinition
org.apache.camel.model.RouteConfigurationDefinition
org.apache.camel.model.RouteConfigurationsDefinition
+
org.apache.camel.model.app.BeansDefinition
+
org.apache.camel.model.app.ApplicationDefinition
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 37b8eb620cc..8f3aee8a841 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
@@ -98,12 +98,10 @@ import org.apache.camel.model.ValueDefinition;
import org.apache.camel.model.WhenDefinition;
import org.apache.camel.model.WhenSkipSendToEndpointDefinition;
import org.apache.camel.model.WireTapDefinition;
-import org.apache.camel.model.app.ApplicationDefinition;
import org.apache.camel.model.app.BeanConstructorDefinition;
import org.apache.camel.model.app.BeanConstructorsDefinition;
import org.apache.camel.model.app.BeanPropertiesDefinition;
import org.apache.camel.model.app.BeanPropertyDefinition;
-import org.apache.camel.model.app.BeansDefinition;
import org.apache.camel.model.app.ComponentScanDefinition;
import org.apache.camel.model.app.RegistryBeanDefinition;
import
org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration;
@@ -600,86 +598,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
}
-@YamlType(
-nodes = "camel",
-types = org.apache.camel.model.app.ApplicationDefinition.class,
-order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
-displayName = "Camel",
-description = "If beans reminds Spring application too much, we
can use camel.",
-deprecated = false,
-properties = {
-@YamlProperty(name = "bean", type =
"array:org.apache.camel.model.app.RegistryBeanDefinition", displayName =
"Bean"),
-@YamlProperty(name = "component-scan", type =
"array:org.apache.camel.model.app.ComponentScanDefinition"),
-@YamlProperty(name = "rest", type =
"array:org.apache.camel.model.rest.RestDefinition", displayName = "Rest"),
-@YamlProperty(name = "rest-configuration", type =
"array:org.apache.camel.model.rest.RestConfigurationDe
[camel] 02/04: CAMEL-20024: camel-core-model - Add description for new bean DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch model-apps
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6e71c0ba4e599664a14a6dcfc2bc5377eca3a18c
Author: Claus Ibsen
AuthorDate: Sat Oct 21 11:18:05 2023 +0200
CAMEL-20024: camel-core-model - Add description for new bean DSL
---
.../org/apache/camel/catalog/models-app.properties | 7
.../org/apache/camel/catalog/models-app/bean.json | 26
.../catalog/{models => models-app}/beans.json | 0
.../catalog/{models => models-app}/camel.json | 0
.../camel/catalog/models-app/constructor.json | 18
.../camel/catalog/models-app/constructors.json | 17
.../camel/catalog/models-app/properties.json | 17
.../apache/camel/catalog/models-app/property.json | 19 +
.../org/apache/camel/catalog/models.properties | 2 -
.../services/org/apache/camel/model.properties | 2 -
.../resources/org/apache/camel/model/app/bean.json | 26
.../org/apache/camel/model/app/constructor.json| 18
.../org/apache/camel/model/app/constructors.json | 17
.../org/apache/camel/model/app/properties.json | 17
.../org/apache/camel/model/app/property.json | 19 +
.../apache/camel/maven/packaging/GenerateMojo.java | 2 +-
.../camel/maven/packaging/PackageModelMojo.java| 2 +
.../camel/maven/packaging/PrepareCatalogMojo.java | 42 +++
.../camel/maven/packaging/SchemaGeneratorMojo.java | 49 +++---
19 files changed, 290 insertions(+), 10 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
new file mode 100644
index 000..2a3a0b1b286
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app.properties
@@ -0,0 +1,7 @@
+bean
+beans
+camel
+constructor
+constructors
+properties
+property
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
new file mode 100644
index 000..ffb007e78e4
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/bean.json
@@ -0,0 +1,26 @@
+{
+ "model": {
+"kind": "model",
+"name": "bean",
+"title": "Bean",
+"description": "Define custom beans that can be used in your Camel routes
and in general.",
+"deprecated": false,
+"label": "configuration",
+"javaType": "org.apache.camel.model.app.RegistryBeanDefinition",
+"abstract": false,
+"input": false,
+"output": false
+ },
+ "properties": {
+"name": { "index": 0, "kind": "attribute", "displayName": "Name",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
name of the bean (bean id)" },
+"type": { "index": 1, "kind": "attribute", "displayName": "Type",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
class name (fully qualified) of the bean" },
+"initMethod": { "index": 2, "kind": "attribute", "displayName": "Init
Method", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
name of the custom initialization method to invoke after setting bean
properties. The method must have no arguments, but may throw any exception." },
+"destroyMethod": { "index": 3, "kind": "attribute", "displayName":
"Destroy Method", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the custom destroy method to invoke on bean
shutdown, such as when Camel is shutting down. The method must have no
arguments, but may throw any exception." },
+"factoryMethod": { "index": 4, "kind": "attribute", "displayName":
"Factory Method", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of method to invoke when creating the bean via a factory
bean." },
+"factoryBean": { "index": 5, "kind": "attribute", "displayName": "Factory
Bean", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Name
of factory bean (bean id) to use for creating the bean." },
+"scriptLanguage": { "index": 6, "kind": "attribute", "displayName":
"Script Language", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "dep
[camel] branch model-apps created (now d13fc8b0645)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch model-apps in repository https://gitbox.apache.org/repos/asf/camel.git at d13fc8b0645 CAMEL-20024: camel-core-model - Add description for new bean DSL This branch includes the following new commits: new 2c76db43c61 CAMEL-20024: camel-core-model - Add description for new bean DSL new 6e71c0ba4e5 CAMEL-20024: camel-core-model - Add description for new bean DSL new 473f4856b9f CAMEL-20024: camel-core-model - Add description for new bean DSL new d13fc8b0645 CAMEL-20024: camel-core-model - Add description for new bean DSL The 4 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.
[camel] 04/04: CAMEL-20024: camel-core-model - Add description for new bean DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch model-apps
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d13fc8b06455570c106800495e61f80e9a86eb26
Author: Claus Ibsen
AuthorDate: Sat Oct 21 11:39:10 2023 +0200
CAMEL-20024: camel-core-model - Add description for new bean DSL
---
.../apache/camel/impl/engine/AbstractCamelContext.java | 16
.../org/apache/camel/main/MainDurationEventNotifier.java | 2 --
2 files changed, 16 insertions(+), 2 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 b97ef65e16f..82f74f464ee 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
@@ -1550,6 +1550,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -1600,6 +1601,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3696,6 +3698,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3705,6 +3708,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3742,6 +3746,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3761,6 +3766,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3964,6 +3970,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3978,6 +3985,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -3992,6 +4000,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4001,6 +4010,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4010,6 +4020,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4019,6 +4030,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4028,6 +4040,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4049,6 +4062,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4058,6 +4072,7 @@ public abstract class AbstractCamelContext extends
BaseService
/**
* Deprecated API.
+ *
* @deprecated Use methods from the {@link ExtendedCamelContext}
*/
@Deprecated(since = "4.2.0", forRemoval = true)
@@ -4067,6 +4082,7 @@ public abstract class AbstractCamelContext extends
BaseService
[camel] 01/04: CAMEL-20024: camel-core-model - Add description for new bean DSL
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch model-apps
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c76db43c61794f4bfd879be63de99b194d3f8a7
Author: Claus Ibsen
AuthorDate: Sat Oct 21 10:12:56 2023 +0200
CAMEL-20024: camel-core-model - Add description for new bean DSL
---
.../org/apache/camel/catalog/models/beans.json | 18 -
.../org/apache/camel/catalog/models/camel.json | 18 -
.../org/apache/camel/catalog/models/property.json | 4 +-
.../org/apache/camel/model/app/beans.json | 18 -
.../org/apache/camel/model/app/camel.json | 18 -
.../resources/org/apache/camel/model/property.json | 4 +-
.../org/apache/camel/model/PropertyDefinition.java | 4 +-
.../camel/model/app/ApplicationDefinition.java | 2 +-
.../camel/model/app/BeanConstructorDefinition.java | 8 +++-
.../model/app/BeanConstructorsDefinition.java | 9 +
.../camel/model/app/BeanPropertiesDefinition.java | 9 +
.../camel/model/app/BeanPropertyDefinition.java| 15
.../apache/camel/model/app/BeansDefinition.java| 44 --
.../camel/model/app/ComponentScanDefinition.java | 3 ++
.../camel/model/app/RegistryBeanDefinition.java| 39 ++-
15 files changed, 156 insertions(+), 57 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beans.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beans.json
index 4c1976317d4..7724035e206 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beans.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beans.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "beans",
"title": "Beans",
-"description": "A grouping POJO (and related XML root element) that's
historically associated with entire application (or its distinguished
fragment). This class is not meant to be used with Camel Java DSL, but it's
needed to generate XML Schema and MX parser methods.",
+"description": "Container for beans, routes, and more.",
"deprecated": false,
"label": "configuration",
"javaType": "org.apache.camel.model.app.BeansDefinition",
@@ -12,13 +12,13 @@
"output": false
},
"properties": {
-"component-scan": { "index": 0, "kind": "element", "displayName":
"Component-scan", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component scanning definition(s). But unlike
package\/packageScan\/contextScan, we're not scanning only for
org.apache.camel.builder.RouteBuilder." },
-"bean": { "index": 1, "kind": "element", "displayName": "Bean",
"required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false },
-"restConfiguration": { "index": 2, "kind": "element", "displayName": "Rest
Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false },
-"rest": { "index": 3, "kind": "element", "displayName": "Rest",
"required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false },
-"routeConfiguration": { "index": 4, "kind": "element", "displayName":
"Route Configuration", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false },
-"routeTemplate": { "index": 5, "kind": "element", "displayName": "Route
Template", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false },
-"templatedRoute": { "index": 6, "kind": "element", "displayName":
"Templated Route", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false },
-"route": { "index": 7, "kind": "element", "displayName": "Route",
"required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false }
+"component-scan": { "index": 0, "kind": "element", "displayName":
"Component-scan", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component scanning that can auto-discover Camel route builders from the
classpath." },
+"bean": { "index": 1, "kind": "element", "displayName": "Bean",
"required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "List
of bean" },
+"restConfiguration": { "index": 2, "kind": "element", "displayName": "Rest
Configuration", "required": false, "type": "array", "javaType":
