[camel-quarkus] branch main updated: Remove vertx-kafka extension
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 6d161fc Remove vertx-kafka extension
6d161fc is described below
commit 6d161fc74af7b243413284587ccc61eccd3d3852
Author: James Netherton
AuthorDate: Wed Jan 12 15:35:01 2022 +
Remove vertx-kafka extension
Fixes #3358
---
catalog/pom.xml| 13 ---
.../ROOT/examples/components/vertx-kafka.yml | 13 ---
docs/modules/ROOT/nav.adoc | 1 -
.../pages/reference/extensions/vertx-kafka.adoc| 39 ---
docs/modules/ROOT/pages/user-guide/messaging.adoc | 4 +-
extensions/pom.xml | 1 -
extensions/vertx-kafka/deployment/pom.xml | 69
.../kafka/deployment/VertxKafkaProcessor.java | 43
extensions/vertx-kafka/pom.xml | 37 ---
extensions/vertx-kafka/runtime/pom.xml | 119 -
.../vertx/kafka/CamelVertxKafkaRecorder.java | 32 --
.../main/resources/META-INF/quarkus-extension.yaml | 32 --
integration-tests/pom.xml | 1 -
integration-tests/vertx-kafka/pom.xml | 117
.../vertx/kafka/it/VertxKafkaProducers.java| 72 -
.../vertx/kafka/it/VertxKafkaResource.java | 73 -
.../component/vertx/kafka/it/VertxKafkaRoutes.java | 30 --
.../component/vertx/kafka/it/VertxKafkaIT.java | 26 -
.../component/vertx/kafka/it/VertxKafkaTest.java | 50 -
.../vertx/kafka/it/VertxKafkaTestResource.java | 59 --
poms/bom/pom.xml | 15 ---
tooling/scripts/test-categories.yaml | 1 -
22 files changed, 1 insertion(+), 846 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 41b80fa..efe9f3e 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -4109,19 +4109,6 @@
org.apache.camel.quarkus
-camel-quarkus-vertx-kafka
-${project.version}
-pom
-test
-
-
-*
-*
-
-
-
-
-org.apache.camel.quarkus
camel-quarkus-vertx-websocket
${project.version}
pom
diff --git a/docs/modules/ROOT/examples/components/vertx-kafka.yml
b/docs/modules/ROOT/examples/components/vertx-kafka.yml
deleted file mode 100644
index 02550f8..000
--- a/docs/modules/ROOT/examples/components/vertx-kafka.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Do not edit directly!
-# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
-cqArtifactId: camel-quarkus-vertx-kafka
-cqArtifactIdBase: vertx-kafka
-cqNativeSupported: true
-cqStatus: Stable
-cqDeprecated: true
-cqJvmSince: 1.6.0
-cqNativeSince: 1.6.0
-cqCamelPartName: vertx-kafka
-cqCamelPartTitle: Vert.x Kafka
-cqCamelPartDescription: Sent and receive messages to/from an Apache Kafka
broker using vert.x Kafka client
-cqExtensionPageTitle: Vert.x Kafka
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index b767ea5..540dde1 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -309,7 +309,6 @@
*** xref:reference/extensions/velocity.adoc[Velocity]
*** xref:reference/extensions/vertx.adoc[Vert.x]
*** xref:reference/extensions/vertx-http.adoc[Vert.x HTTP Client]
-*** xref:reference/extensions/vertx-kafka.adoc[Vert.x Kafka]
*** xref:reference/extensions/vertx-websocket.adoc[Vert.x WebSocket]
*** xref:reference/extensions/weather.adoc[Weather]
*** xref:reference/extensions/web3j.adoc[Web3j Ethereum Blockchain]
diff --git a/docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc
b/docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc
deleted file mode 100644
index ad49a8f..000
--- a/docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Do not edit directly!
-// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
-= Vert.x Kafka
-:linkattrs:
-:cq-artifact-id: camel-quarkus-vertx-kafka
-:cq-native-supported: true
-:cq-status: Stable
-:cq-status-deprecation: Stable Deprecated
-:cq-description: Sent and receive messages to/from an Apache Kafka broker
using vert.x Kafka client
-:cq-deprecated: true
-:cq-jvm-since: 1.6.0
-:cq-native-since: 1.6.0
-
-[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.6.0## [.badge-key]##Native
since##[.badge-supported]##1.6.0##
[.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
-
-Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka
client
-
-== What's inside
-
-*
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3450: Remove vertx-kafka extension
jamesnetherton merged pull request #3450: URL: https://github.com/apache/camel-quarkus/pull/3450 -- 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
[GitHub] [camel-quarkus] jamesnetherton closed issue #3358: `vertx-kafka` extension incompatible with `kafka-clients` 3.0.0
jamesnetherton closed issue #3358: URL: https://github.com/apache/camel-quarkus/issues/3358 -- 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 (87ea0db -> 99f4038)
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 87ea0db Update jclouds-component.adoc add 99f4038 camel-mail - Fix includeHeaders on multipart dataformat not mapped No new revisions were added by this update. Summary of changes: .../multipart/MimeMultipartDataFormatConfigurer.java| 2 ++ .../mime/multipart/MimeMultipartDataFormat.java | 17 + 2 files changed, 15 insertions(+), 4 deletions(-)
[camel-quarkus] 02/03: Exclude geronimo-jms from corda
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d8a52c7aff9dc972d0860e1f9a47a3f70cfc90be Author: Zineb Bendhiba AuthorDate: Thu Dec 23 14:46:53 2021 +0100 Exclude geronimo-jms from corda --- extensions-jvm/corda/runtime/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/extensions-jvm/corda/runtime/pom.xml b/extensions-jvm/corda/runtime/pom.xml index aa8b110..beed32e 100644 --- a/extensions-jvm/corda/runtime/pom.xml +++ b/extensions-jvm/corda/runtime/pom.xml @@ -67,6 +67,10 @@ org.apache.logging.log4j log4j-core + +org.apache.geronimo.specs +geronimo-jms_2.0_spec +
[camel-quarkus] branch quarkus-main updated (53832b7 -> a56ac93)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 53832b7 java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests discard bdf6a84 Exclude geronimo-jms from corda discard 9163470 ⬆️ Upgrade Quarkus to 2.7.0.CR1 add 18896ef Updated CHANGELOG.md add 717793a Avoid usage of deprecated io.quarkus.arc.AlternativePriority add 84338e6 Fix description of extension core runtime add d1dc105 Updated CHANGELOG.md add 8f3eb21 Ban log4j 1.x #3451 new c87ba70 ⬆️ Upgrade Quarkus to 2.7.0.CR1 new d8a52c7 Exclude geronimo-jms from corda new a56ac93 java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests 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 (53832b7) \ N -- N -- N refs/heads/quarkus-main (a56ac93) 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. 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: CHANGELOG.md | 3 +++ docs/modules/ROOT/pages/reference/extensions/core.adoc| 4 ++-- extensions-core/core/runtime/pom.xml | 2 +- .../core/runtime/src/main/resources/META-INF/quarkus-extension.yaml | 2 +- .../camel/quarkus/component/jta/MockTransactionManagerProducer.java | 4 ++-- pom.xml | 1 + 6 files changed, 10 insertions(+), 6 deletions(-)
[camel-quarkus] 01/03: ⬆️ Upgrade Quarkus to 2.7.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c87ba7064f658c866ea57c1b2b766a3c5549072a
Author: Freeman Fang
AuthorDate: Tue Dec 21 15:58:04 2021 -0500
⬆️ Upgrade Quarkus to 2.7.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 6 +++---
poms/bom/pom.xml | 4
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 5d11b0b..7974faf 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.0 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
-quarkus-version: 2.6.0.Final # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.14.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/pom.xml b/pom.xml
index ae0f396..bd7896f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
1.0.0
2.3.0
1.0.2
-2.6.0.Final
+999-SNAPSHOT
2.0.0
0.30.0
@@ -68,7 +68,7 @@
2.17.100
1.11.714
1.0.5
-1.69
+1.70
${commons-beanutils-version}
1.4
3.2.2
@@ -87,7 +87,7 @@
0.22.2
29.0-jre
21.3.0
-1.42.1
+1.43.1
2.8.6
4.0
${hadoop3-version}
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index ecd81a6..057860a 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -662,6 +662,10 @@
jsr305
+org.apache.activemq
+*
+
+
org.jboss.logmanager
jboss-logmanager
[camel-quarkus] 03/03: java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a56ac938c9a62bf2b32749dbcb4e5e889dd102fd
Author: Freeman Fang
AuthorDate: Thu Dec 23 12:08:42 2021 -0500
java.lang.UnsatisfiedLinkError: no awt in java.library.path in native tests
---
.../test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java| 4
.../test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java | 4
2 files changed, 8 insertions(+)
diff --git
a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
index ac326a9..15b137b 100644
---
a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
+++
b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
@@ -17,8 +17,12 @@
package org.apache.camel.quarkus.component.pdf.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
@NativeImageTest
+//https://github.com/apache/camel-quarkus/issues/3417
+@DisabledOnOs(OS.MAC)
class PdfIT extends PdfTest {
}
diff --git
a/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
b/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
index 48ce48a..3cbf97e 100644
---
a/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
+++
b/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaIT.java
@@ -17,8 +17,12 @@
package org.apache.camel.quarkus.component.tika.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
@NativeImageTest
+//https://github.com/apache/camel-quarkus/issues/3417
+@DisabledOnOs(OS.MAC)
class TikaIT extends TikaTest {
}
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1011847935 Build fixed with: * Camel Quarkus Commit: a56ac938c9a62bf2b32749dbcb4e5e889dd102fd * Quarkus Main Commit: 8f3eb2118fa02a5e95074cc512008cf0f6721997 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1690719657 -- 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
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] closed issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926 -- 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 (e98c154 -> 87ea0db)
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 e98c154 Updating documentation links as some of the projects have moved from code.google.com to github. (#6732) add 87ea0db Update jclouds-component.adoc No new revisions were added by this update. Summary of changes: components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot_3.14.x updated (d35045c -> ca6a7ba)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from d35045c Updating documentation links as some of the projects have moved from code.google.com to github. (#6732) add ca6a7ba camel-mail - Fix includeHeaders on multipart dataformat not mapped No new revisions were added by this update. Summary of changes: .../multipart/MimeMultipartDataFormatConfigurer.java| 2 ++ .../mime/multipart/MimeMultipartDataFormat.java | 17 + 2 files changed, 15 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (5cc6acb -> e98c154)
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 5cc6acb [CAMEL-17483]camel-cxf: avoid using deprecated API add e98c154 Updating documentation links as some of the projects have moved from code.google.com to github. (#6732) No new revisions were added by this update. Summary of changes: components/camel-jsonpath/src/main/docs/jsonpath-language.adoc | 4 ++-- components/camel-leveldb/src/main/docs/leveldb.adoc| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch regen_bot_3.14.x updated (37aebf8 -> d35045c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 37aebf8 Update jclouds-component.adoc add d35045c Updating documentation links as some of the projects have moved from code.google.com to github. (#6732) No new revisions were added by this update. Summary of changes: components/camel-jsonpath/src/main/docs/jsonpath-language.adoc | 4 ++-- components/camel-leveldb/src/main/docs/leveldb.adoc| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch regen_bot_3.14.x updated (155437d -> 37aebf8)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot_3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 155437d CAMEL-17479: configuring beans with {{?foo}} supported.
add 37aebf8 Update jclouds-component.adoc
No new revisions were added by this update.
Summary of changes:
components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch main updated: camel-mail - Fix includeHeaders on multipart dataformat not mapped
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 99f4038 camel-mail - Fix includeHeaders on multipart dataformat not
mapped
99f4038 is described below
commit 99f4038e91abc67de6c281649b7308d73f740ffe
Author: Claus Ibsen
AuthorDate: Thu Jan 13 06:58:49 2022 +0100
camel-mail - Fix includeHeaders on multipart dataformat not mapped
---
.../multipart/MimeMultipartDataFormatConfigurer.java| 2 ++
.../mime/multipart/MimeMultipartDataFormat.java | 17 +
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git
a/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
b/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
index 96c4067..d87899f 100644
---
a/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
+++
b/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
@@ -24,6 +24,8 @@ public class MimeMultipartDataFormatConfigurer extends
PropertyConfigurerSupport
case "multipartWithoutAttachment":
dataformat.setMultipartWithoutAttachment(property(camelContext, boolean.class,
value)); return true;
case "headersinline":
case "headersInline":
dataformat.setHeadersInline(property(camelContext, boolean.class, value));
return true;
+case "includeheaders":
+case "includeHeaders":
dataformat.setIncludeHeaders(property(camelContext, java.lang.String.class,
value)); return true;
case "binarycontent":
case "binaryContent":
dataformat.setBinaryContent(property(camelContext, boolean.class, value));
return true;
default: return false;
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
index 5573142..831be5e 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
@@ -69,7 +69,8 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
private String multipartSubType = "mixed";
private boolean multipartWithoutAttachment;
private boolean headersInline;
-private Pattern includeHeaders;
+private String includeHeaders;
+private Pattern includeHeadersPattern;
private boolean binaryContent;
public void setBinaryContent(boolean binaryContent) {
@@ -81,7 +82,7 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
}
public void setIncludeHeaders(String includeHeaders) {
-this.includeHeaders = Pattern.compile(includeHeaders,
Pattern.CASE_INSENSITIVE);
+this.includeHeaders = includeHeaders;
}
public void setMultipartWithoutAttachment(boolean
multipartWithoutAttachment) {
@@ -140,9 +141,9 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
mm.setContent(mp);
// copy headers if required and if the content can be converted
into
// a String
-if (headersInline && includeHeaders != null) {
+if (headersInline && includeHeadersPattern != null) {
for (Map.Entry entry :
exchange.getIn().getHeaders().entrySet()) {
-if (includeHeaders.matcher(entry.getKey()).matches()) {
+if
(includeHeadersPattern.matcher(entry.getKey()).matches()) {
String headerStr =
ExchangeHelper.convertToType(exchange, String.class, entry.getValue());
if (headerStr != null) {
mm.setHeader(entry.getKey(), headerStr);
@@ -317,4 +318,12 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
}
return MimeUtility.decodeText(key);
}
+
+@Override
+protected void doInit() throws Exception {
+if (includeHeaders != null) {
+this.includeHeadersPattern = Pattern.compile(includeHeaders,
Pattern.CASE_INSENSITIVE);
+}
+}
+
}
[camel] branch camel-3.14.x updated: camel-mail - Fix includeHeaders on multipart dataformat not mapped
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new ca6a7ba camel-mail - Fix includeHeaders on multipart dataformat not
mapped
ca6a7ba is described below
commit ca6a7ba96a69acd8d2742a060e264ea53ff86df0
Author: Claus Ibsen
AuthorDate: Thu Jan 13 06:58:49 2022 +0100
camel-mail - Fix includeHeaders on multipart dataformat not mapped
---
.../multipart/MimeMultipartDataFormatConfigurer.java| 2 ++
.../mime/multipart/MimeMultipartDataFormat.java | 17 +
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git
a/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
b/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
index 96c4067..d87899f 100644
---
a/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
+++
b/components/camel-mail/src/generated/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatConfigurer.java
@@ -24,6 +24,8 @@ public class MimeMultipartDataFormatConfigurer extends
PropertyConfigurerSupport
case "multipartWithoutAttachment":
dataformat.setMultipartWithoutAttachment(property(camelContext, boolean.class,
value)); return true;
case "headersinline":
case "headersInline":
dataformat.setHeadersInline(property(camelContext, boolean.class, value));
return true;
+case "includeheaders":
+case "includeHeaders":
dataformat.setIncludeHeaders(property(camelContext, java.lang.String.class,
value)); return true;
case "binarycontent":
case "binaryContent":
dataformat.setBinaryContent(property(camelContext, boolean.class, value));
return true;
default: return false;
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
index 5573142..831be5e 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
@@ -69,7 +69,8 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
private String multipartSubType = "mixed";
private boolean multipartWithoutAttachment;
private boolean headersInline;
-private Pattern includeHeaders;
+private String includeHeaders;
+private Pattern includeHeadersPattern;
private boolean binaryContent;
public void setBinaryContent(boolean binaryContent) {
@@ -81,7 +82,7 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
}
public void setIncludeHeaders(String includeHeaders) {
-this.includeHeaders = Pattern.compile(includeHeaders,
Pattern.CASE_INSENSITIVE);
+this.includeHeaders = includeHeaders;
}
public void setMultipartWithoutAttachment(boolean
multipartWithoutAttachment) {
@@ -140,9 +141,9 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
mm.setContent(mp);
// copy headers if required and if the content can be converted
into
// a String
-if (headersInline && includeHeaders != null) {
+if (headersInline && includeHeadersPattern != null) {
for (Map.Entry entry :
exchange.getIn().getHeaders().entrySet()) {
-if (includeHeaders.matcher(entry.getKey()).matches()) {
+if
(includeHeadersPattern.matcher(entry.getKey()).matches()) {
String headerStr =
ExchangeHelper.convertToType(exchange, String.class, entry.getValue());
if (headerStr != null) {
mm.setHeader(entry.getKey(), headerStr);
@@ -317,4 +318,12 @@ public class MimeMultipartDataFormat extends
DefaultDataFormat {
}
return MimeUtility.decodeText(key);
}
+
+@Override
+protected void doInit() throws Exception {
+if (includeHeaders != null) {
+this.includeHeadersPattern = Pattern.compile(includeHeaders,
Pattern.CASE_INSENSITIVE);
+}
+}
+
}
[camel-spring-boot] branch main updated: Regen
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 4a548ad Regen 4a548ad is described below commit 4a548add44ba1fdbbeb7eea96b70f88943b1ef60 Author: Claus Ibsen AuthorDate: Thu Jan 13 06:53:28 2022 +0100 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 03e8381..6d4db5b 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -3650,6 +3650,11 @@ org.apache.camel +camel-salesforce-codegen +3.15.0-SNAPSHOT + + +org.apache.camel camel-salesforce-maven-plugin 3.15.0-SNAPSHOT
[camel] branch main updated: Update jclouds-component.adoc
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 87ea0db Update jclouds-component.adoc 87ea0db is described below commit 87ea0dbeaf29c3f6687b50eca7b3ff2bcde3fb4b Author: Chirag Sanghavi AuthorDate: Wed Jan 12 23:28:20 2022 -0500 Update jclouds-component.adoc jclouds is now an apache projects. --- components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-jclouds/src/main/docs/jclouds-component.adoc b/components/camel-jclouds/src/main/docs/jclouds-component.adoc index d3944bc..455e85a 100644 --- a/components/camel-jclouds/src/main/docs/jclouds-component.adoc +++ b/components/camel-jclouds/src/main/docs/jclouds-component.adoc @@ -15,7 +15,7 @@ This component allows interaction with cloud provider key-value engines (blobstores) and compute services. The component uses -http://code.google.com/p/jclouds[jclouds] which is + +https://jclouds.apache.org/[jclouds] which is + a library that provides abstractions for blobstores and compute services.
[camel] branch main updated (5cc6acb -> e98c154)
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 5cc6acb [CAMEL-17483]camel-cxf: avoid using deprecated API add e98c154 Updating documentation links as some of the projects have moved from code.google.com to github. (#6732) No new revisions were added by this update. Summary of changes: components/camel-jsonpath/src/main/docs/jsonpath-language.adoc | 4 ++-- components/camel-leveldb/src/main/docs/leveldb.adoc| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch camel-3.14.x updated: Updating documentation links as some of the projects have moved from code.google.com to github. (#6732)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new d35045c Updating documentation links as some of the projects have
moved from code.google.com to github. (#6732)
d35045c is described below
commit d35045cdee4885b5521ee0b7db2e88f3d690430c
Author: Chirag
AuthorDate: Thu Jan 13 00:40:22 2022 -0500
Updating documentation links as some of the projects have moved from
code.google.com to github. (#6732)
* Update jsonpath-language.adoc
Jsonpath has moved to github. Updating documentation to match.
* Update leveldb.adoc
Leveldb has moved to Github. Updating documentation.
---
components/camel-jsonpath/src/main/docs/jsonpath-language.adoc | 4 ++--
components/camel-leveldb/src/main/docs/leveldb.adoc| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
index 8fe0986..f4d5924 100644
--- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
+++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
@@ -10,7 +10,7 @@
*Since Camel {since}*
-Camel supports https://code.google.com/p/json-path/[JSONPath] to allow
+Camel supports https://github.com/json-path/JsonPath/[JSONPath] to allow
using xref:manual::expression.adoc[Expression] or
xref:manual::predicate.adoc[Predicate] on JSON messages.
@@ -230,7 +230,7 @@ to extract a value from the message and bind it to a method
parameter, as shown
[source,java]
public class Foo {
-
+
@Consume("activemq:queue:books.new")
public void doSomething(@JsonPath("$.store.book[*].author") String author,
@Body String json) {
// process the inbound message here
diff --git a/components/camel-leveldb/src/main/docs/leveldb.adoc
b/components/camel-leveldb/src/main/docs/leveldb.adoc
index 7db523c..0e1325a 100644
--- a/components/camel-leveldb/src/main/docs/leveldb.adoc
+++ b/components/camel-leveldb/src/main/docs/leveldb.adoc
@@ -10,7 +10,7 @@
*Since Camel {since}*
-https://code.google.com/p/leveldb/[Leveldb] is a very lightweight and
+https://github.com/google/leveldb[Leveldb] is a very lightweight and
embedable key value database. It allows together with Camel to provide
persistent support for various Camel features such as
Aggregator.
[GitHub] [camel] davsclaus merged pull request #6732: Updating documentation links as some of the projects have moved from code.google.com to github.
davsclaus merged pull request #6732: URL: https://github.com/apache/camel/pull/6732 -- 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 camel-3.14.x updated: Update jclouds-component.adoc
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.14.x by this push: new 37aebf8 Update jclouds-component.adoc 37aebf8 is described below commit 37aebf8df24ab50c757d9c910b50433d6d9bca7d Author: Chirag Sanghavi AuthorDate: Wed Jan 12 23:28:20 2022 -0500 Update jclouds-component.adoc jclouds is now an apache projects. --- components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-jclouds/src/main/docs/jclouds-component.adoc b/components/camel-jclouds/src/main/docs/jclouds-component.adoc index d3944bc..455e85a 100644 --- a/components/camel-jclouds/src/main/docs/jclouds-component.adoc +++ b/components/camel-jclouds/src/main/docs/jclouds-component.adoc @@ -15,7 +15,7 @@ This component allows interaction with cloud provider key-value engines (blobstores) and compute services. The component uses -http://code.google.com/p/jclouds[jclouds] which is + +https://jclouds.apache.org/[jclouds] which is + a library that provides abstractions for blobstores and compute services.
[GitHub] [camel] oscerd merged pull request #6733: Update jclouds-component.adoc with correct jclouds URL as jclouds is now an Apache project.
oscerd merged pull request #6733: URL: https://github.com/apache/camel/pull/6733 -- 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
[GitHub] [camel-k] djencks merged pull request #2874: fix http-proxy-docs
djencks merged pull request #2874: URL: https://github.com/apache/camel-k/pull/2874 -- 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: fix http-proxy-docs
This is an automated email from the ASF dual-hosted git repository. djencks 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 e955394 fix http-proxy-docs e955394 is described below commit e9553940554ea533aaae2d0074681f37b434e7aa Author: David Jencks AuthorDate: Wed Jan 12 18:52:33 2022 -0800 fix http-proxy-docs --- docs/modules/ROOT/pages/configuration/http-proxy.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/configuration/http-proxy.adoc b/docs/modules/ROOT/pages/configuration/http-proxy.adoc index 1240c03..7e0b351 100644 --- a/docs/modules/ROOT/pages/configuration/http-proxy.adoc +++ b/docs/modules/ROOT/pages/configuration/http-proxy.adoc @@ -81,7 +81,7 @@ spec: <1> Deactivates the propagation of HTTP proxy environment variables at the platform level [[openshift]] -=== OpenShift +== OpenShift On OpenShift 4, cluster-wide egress proxy can be configured by editing the `cluster` Proxy resource:
[GitHub] [camel-k-runtime] djencks merged pull request #776: camel-website-701 RI update attribute name (1.9.x)
djencks merged pull request #776: URL: https://github.com/apache/camel-k-runtime/pull/776 -- 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-runtime] branch release-1.9.x updated: camel-website-701 RI update attribute name
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.9.x by this push:
new b70df32 camel-website-701 RI update attribute name
b70df32 is described below
commit b70df3240eaa25bc5e45948ef98f9be17ff021ec
Author: David Jencks
AuthorDate: Thu Jan 6 00:04:25 2022 -0800
camel-website-701 RI update attribute name
---
docs/modules/languages/pages/yaml.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/modules/languages/pages/yaml.adoc
b/docs/modules/languages/pages/yaml.adoc
index 9c56243..c3500f5 100644
--- a/docs/modules/languages/pages/yaml.adoc
+++ b/docs/modules/languages/pages/yaml.adoc
@@ -160,7 +160,7 @@ Support for Endpoint DSL auto completion
https://github.com/apache/camel-k-runti
== Defining beans
-In addition to the general support for creating beans provided by
xref:{camel-version}@components:others:main.adoc#_specifying_custom_beans[Camel
Main], the YAML DSL provide a convenient syntax to define and configure them:
+In addition to the general support for creating beans provided by
xref:{camel-docs-version}@components:others:main.adoc#_specifying_custom_beans[Camel
Main], the YAML DSL provide a convenient syntax to define and configure them:
[source,yaml]
[camel-k-runtime] branch release-1.10.x updated: camel-website-701 RI update attribute name
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.10.x by this push:
new 67023df camel-website-701 RI update attribute name
67023df is described below
commit 67023dfadd30873bdf2cd803aa117f035be3a857
Author: David Jencks
AuthorDate: Thu Jan 6 00:40:06 2022 -0800
camel-website-701 RI update attribute name
---
docs/modules/languages/pages/yaml.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/modules/languages/pages/yaml.adoc
b/docs/modules/languages/pages/yaml.adoc
index 6bee0ab..41089ea 100644
--- a/docs/modules/languages/pages/yaml.adoc
+++ b/docs/modules/languages/pages/yaml.adoc
@@ -160,7 +160,7 @@ Support for Endpoint DSL auto completion
https://github.com/apache/camel-k-runti
== Defining beans
-In addition to the general support for creating beans provided by
xref:{camel-version}@components:others:main.adoc#_specifying_custom_beans[Camel
Main], the YAML DSL provide a convenient syntax to define and configure them:
+In addition to the general support for creating beans provided by
xref:{camel-docs-version}@components:others:main.adoc#_specifying_custom_beans[Camel
Main], the YAML DSL provide a convenient syntax to define and configure them:
[source,yaml]
[GitHub] [camel-k-runtime] djencks merged pull request #775: camel-website-701 RI update attribute name (1.10.x)
djencks merged pull request #775: URL: https://github.com/apache/camel-k-runtime/pull/775 -- 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
[GitHub] [camel-k-runtime] djencks merged pull request #774: camel-website-701 RI update attribute name (main)
djencks merged pull request #774: URL: https://github.com/apache/camel-k-runtime/pull/774 -- 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
[GitHub] [camel-k] djencks merged pull request #2871: camel-website #701: RI info (1.4.x)
djencks merged pull request #2871: URL: https://github.com/apache/camel-k/pull/2871 -- 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-runtime] branch main updated: camel-website-701 RI update attribute name
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/main by this push:
new 8aa3026 camel-website-701 RI update attribute name
8aa3026 is described below
commit 8aa30267e07f3a724180583dd159830bc6013e24
Author: David Jencks
AuthorDate: Wed Jan 5 23:55:54 2022 -0800
camel-website-701 RI update attribute name
---
docs/modules/languages/pages/yaml.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/modules/languages/pages/yaml.adoc
b/docs/modules/languages/pages/yaml.adoc
index 6bee0ab..41089ea 100644
--- a/docs/modules/languages/pages/yaml.adoc
+++ b/docs/modules/languages/pages/yaml.adoc
@@ -160,7 +160,7 @@ Support for Endpoint DSL auto completion
https://github.com/apache/camel-k-runti
== Defining beans
-In addition to the general support for creating beans provided by
xref:{camel-version}@components:others:main.adoc#_specifying_custom_beans[Camel
Main], the YAML DSL provide a convenient syntax to define and configure them:
+In addition to the general support for creating beans provided by
xref:{camel-docs-version}@components:others:main.adoc#_specifying_custom_beans[Camel
Main], the YAML DSL provide a convenient syntax to define and configure them:
[source,yaml]
[camel-k] branch release-1.4.x updated: camel-website-701 RI
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.4.x by this push:
new bb38d0d camel-website-701 RI
bb38d0d is described below
commit bb38d0d36e61016aab0980a7fcde1930c9c705bf
Author: David Jencks
AuthorDate: Wed Jan 5 22:57:46 2022 -0800
camel-website-701 RI
---
docs/antora.yml| 14 ++
docs/modules/ROOT/pages/index.adoc | 21 +
2 files changed, 35 insertions(+)
diff --git a/docs/antora.yml b/docs/antora.yml
index c87cd5e..fadd882 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -5,3 +5,17 @@ nav:
- modules/ROOT/nav.adoc
- modules/languages/nav-languages.adoc
- modules/ROOT/nav-end.adoc
+
+asciidoc:
+ attributes:
+camel-kamelets-version: 0.2.1 # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-kamelets-docs-version: 0.2.x # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-k-runtime-version: 1.7.0 # Makefile RUNTIME_VERSION
+camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 #
Makefile BUNDLE_CAMEL_APIS
+# from camel-k-runtime parent pom:
+camel-version: 3.9.0
+camel-docs-version: 3.9.x
+camel-quarkus-version: 1.8.1
+camel-quarkus-docs-version: 1.8.x
+quarkus-version: 1.13.0.Final
+graalvm-version: 21.0.0
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 264bbfd..a7b813f 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -1,5 +1,26 @@
= Apache Camel K
+[NOTE]
+--
+This version ({page-component-display-version}) of {page-component-title}
depends on:
+
+* https://github.com/apache/camel-k-runtime.git[camel-k-runtime]
(undocumented) at version {camel-k-runtime-version}, and therefore:
+//** xref:{camel-quarkus-docs-version}@camel-quarkus::index.adoc[] at version
{camel-quarkus-version}.
+** https://github.com/apache/camel-quarkus.git[camel-quarkus] at version
{camel-quarkus-version} (no longer documented).
+//** xref:{camel-docs-version}@components::index.adoc[Camel] at version
{camel-version}.
+** https://github.com/apache/camel.git[Camel] at version {camel-version} (no
longer documented).
+** https://quarkus.io[Quarkus] at version {quarkus-version}.
+** https://www.graalvm.org[GraalVM] at version {graalvm-version}.
+//* xref:{camel-kamelets-docs-version}@camel-kamelets::index.adoc[] at version
{camel-kamelets-version}.
+* https://github.com/apache/camel-kamelets.git[camel-kamelets] at version
{camel-kamelets-version} (never documented).
+
+ifdef::lts[This long term service release will be supported until {lts}.]
+ifndef::lts[]
+ifdef::prerelease[This is the development version of {page-component-title}.
It should not be used in production.]
+ifndef::prerelease[This release will not be updated, but rather replaced by a
new release.]
+endif::[]
+--
+
Apache Camel K is a lightweight integration framework built from Apache Camel
that runs natively on Kubernetes and is specifically designed for serverless
and microservice architectures.
Users of Camel K can instantly run integration code written in Camel DSL on
their preferred cloud (Kubernetes or OpenShift).
[GitHub] [camel-k] djencks merged pull request #2870: camel-website #701: RI info (1.6.x)
djencks merged pull request #2870: URL: https://github.com/apache/camel-k/pull/2870 -- 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 release-1.6.x updated: camel-website-701 RI
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.6.x by this push:
new 4d8c6d4 camel-website-701 RI
4d8c6d4 is described below
commit 4d8c6d47ebcaf47d8ed25455dde32d64d2110a71
Author: David Jencks
AuthorDate: Wed Jan 5 22:57:46 2022 -0800
camel-website-701 RI
---
docs/antora.yml| 12 +++-
docs/modules/ROOT/pages/index.adoc | 20
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index d62c6f7..c2789d0 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,4 +25,14 @@ nav:
asciidoc:
attributes:
-camel-version: 3.11.x
\ No newline at end of file
+camel-kamelets-version: 0.4.0 # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-kamelets-docs-version: 0.4.x # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-k-runtime-version: 1.9.1 # Makefile RUNTIME_VERSION
+camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 #
Makefile BUNDLE_CAMEL_APIS
+# from camel-k-runtime parent pom:
+camel-version: 3.11.2
+camel-docs-version: 3.11.x
+camel-quarkus-version: 2.3.0
+camel-quarkus-docs-version: 2.3.x
+quarkus-version: 2.3.0.Final
+graalvm-version: 21.2.0
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 264bbfd..6466bff 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -1,5 +1,25 @@
= Apache Camel K
+[NOTE]
+--
+This version ({page-component-display-version}) of {page-component-title}
depends on:
+
+* https://github.com/apache/camel-k-runtime.git[camel-k-runtime]
(undocumented) at version {camel-k-runtime-version}, and therefore:
+//** xref:{camel-quarkus-docs-version}@camel-quarkus::index.adoc[] at version
{camel-quarkus-version}.
+** https://github.com/apache/camel-quarkus.git[camel-quarkus] at version
{camel-quarkus-version} (no longer documented).
+** xref:{camel-docs-version}@components::index.adoc[Camel] at version
{camel-version}.
+** https://quarkus.io[Quarkus] at version {quarkus-version}.
+** https://www.graalvm.org[GraalVM] at version {graalvm-version}.
+//* xref:{camel-kamelets-docs-version}@camel-kamelets::index.adoc[] at version
{camel-kamelets-version}.
+* https://github.com/apache/camel-kamelets.git[camel-kamelets] at version
{camel-kamelets-version} (never documented).
+
+ifdef::lts[This long term service release will be supported until {lts}.]
+ifndef::lts[]
+ifdef::prerelease[This is the development version of {page-component-title}.
It should not be used in production.]
+ifndef::prerelease[This release will not be updated, but rather replaced by a
new release.]
+endif::[]
+--
+
Apache Camel K is a lightweight integration framework built from Apache Camel
that runs natively on Kubernetes and is specifically designed for serverless
and microservice architectures.
Users of Camel K can instantly run integration code written in Camel DSL on
their preferred cloud (Kubernetes or OpenShift).
[GitHub] [camel-k] djencks merged pull request #2869: camel-website #701: RI info (1.7.x)
djencks merged pull request #2869: URL: https://github.com/apache/camel-k/pull/2869 -- 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 release-1.7.x updated: camel-website-701 RI
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.7.x by this push:
new 3587ba1 camel-website-701 RI
3587ba1 is described below
commit 3587ba11dfdaaf24aa3580f24a8886a7b792fe8e
Author: David Jencks
AuthorDate: Wed Jan 5 22:57:46 2022 -0800
camel-website-701 RI
---
docs/antora.yml| 12 +++-
docs/modules/ROOT/pages/index.adoc | 18 ++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c503fc2..0e77958 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -28,4 +28,14 @@ nav:
# On release, update this to the appropriate released camel version.
asciidoc:
attributes:
-camel-version: 3.12.x
+camel-kamelets-version: 0.5.0 # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-kamelets-docs-version: 0.5.x # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-k-runtime-version: 1.10.0 # Makefile RUNTIME_VERSION
+camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 #
Makefile BUNDLE_CAMEL_APIS
+# from camel-k-runtime parent pom:
+camel-version: 3.12.0
+camel-docs-version: 3.12.x
+camel-quarkus-version: 2.4.0
+camel-quarkus-docs-version: 2.4.x
+quarkus-version: 2.4.0.Final
+graalvm-version: 21.2.0
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 264bbfd..f10415b 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -1,5 +1,23 @@
= Apache Camel K
+[NOTE]
+--
+This version ({page-component-display-version}) of {page-component-title}
depends on:
+
+* https://github.com/apache/camel-k-runtime.git[camel-k-runtime]
(undocumented) at version {camel-k-runtime-version}, and therefore:
+** xref:{camel-quarkus-docs-version}@camel-quarkus::index.adoc[] at version
{camel-quarkus-version}.
+** xref:{camel-docs-version}@components::index.adoc[Camel] at version
{camel-version}
+** https://quarkus.io[Quarkus] at version {quarkus-version}
+** https://www.graalvm.org[GraalVM] at version {graalvm-version}
+* xref:{camel-kamelets-docs-version}@camel-kamelets::index.adoc[] at version
{camel-kamelets-version}
+
+ifdef::lts[This long term service release will be supported until {lts}.]
+ifndef::lts[]
+ifdef::prerelease[This is the development version of {page-component-title}.
It should not be used in production.]
+ifndef::prerelease[This release will not be updated, but rather replaced by a
new release.]
+endif::[]
+--
+
Apache Camel K is a lightweight integration framework built from Apache Camel
that runs natively on Kubernetes and is specifically designed for serverless
and microservice architectures.
Users of Camel K can instantly run integration code written in Camel DSL on
their preferred cloud (Kubernetes or OpenShift).
[GitHub] [camel-k] djencks merged pull request #2868: camel-website #701: RI info (main)
djencks merged pull request #2868: URL: https://github.com/apache/camel-k/pull/2868 -- 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: camel-website-701 RI
This is an automated email from the ASF dual-hosted git repository.
djencks 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 06a55fb camel-website-701 RI
06a55fb is described below
commit 06a55fb4e0c72538a027519ed2607ecee6b80863
Author: David Jencks
AuthorDate: Wed Jan 5 22:57:46 2022 -0800
camel-website-701 RI
---
docs/antora.yml| 14 +-
docs/modules/ROOT/pages/index.adoc | 18 ++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index a320fbd..dc16a5f 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,4 +30,16 @@ nav:
# On release, update this to the appropriate released camel version.
asciidoc:
attributes:
-camel-version: next
+prerelease: true
+camel-kamelets-version: 0.5.0 # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-kamelets-docs-version: 0.5.x # Makefile KAMELET_CATALOG_REPO_BRANCH
+camel-k-runtime-version: 1.10.0 # Makefile RUNTIME_VERSION
+camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 #
Makefile BUNDLE_CAMEL_APIS
+# from camel-k-runtime parent pom:
+camel-version: 3.12.0
+camel-docs-version: 3.12.x
+camel-quarkus-version: 2.4.0
+camel-quarkus-docs-version: 2.4.x
+quarkus-version: 2.4.0.Final
+graalvm-version: 21.2.0
+
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 264bbfd..f10415b 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -1,5 +1,23 @@
= Apache Camel K
+[NOTE]
+--
+This version ({page-component-display-version}) of {page-component-title}
depends on:
+
+* https://github.com/apache/camel-k-runtime.git[camel-k-runtime]
(undocumented) at version {camel-k-runtime-version}, and therefore:
+** xref:{camel-quarkus-docs-version}@camel-quarkus::index.adoc[] at version
{camel-quarkus-version}.
+** xref:{camel-docs-version}@components::index.adoc[Camel] at version
{camel-version}
+** https://quarkus.io[Quarkus] at version {quarkus-version}
+** https://www.graalvm.org[GraalVM] at version {graalvm-version}
+* xref:{camel-kamelets-docs-version}@camel-kamelets::index.adoc[] at version
{camel-kamelets-version}
+
+ifdef::lts[This long term service release will be supported until {lts}.]
+ifndef::lts[]
+ifdef::prerelease[This is the development version of {page-component-title}.
It should not be used in production.]
+ifndef::prerelease[This release will not be updated, but rather replaced by a
new release.]
+endif::[]
+--
+
Apache Camel K is a lightweight integration framework built from Apache Camel
that runs natively on Kubernetes and is specifically designed for serverless
and microservice architectures.
Users of Camel K can instantly run integration code written in Camel DSL on
their preferred cloud (Kubernetes or OpenShift).
[camel-kamelets] branch regen_bot updated (2bac79e -> 9cba1e1)
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-kamelets.git.
from 2bac79e Regen for commit 60d7ed7aa136dcd1e0b2792c76a9e5bad214a528
add 9cba1e1 fix docs
No new revisions were added by this update.
Summary of changes:
docs/{ => modules/ROOT}/pages/index.adoc | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename docs/{ => modules/ROOT}/pages/index.adoc (100%)
[GitHub] [camel-kamelets] oscerd merged pull request #710: fix docs
oscerd merged pull request #710: URL: https://github.com/apache/camel-kamelets/pull/710 -- 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-kamelets] branch main updated: fix docs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 9cba1e1 fix docs
9cba1e1 is described below
commit 9cba1e141569313d3bc68f67a7338367e6e7026a
Author: David Jencks
AuthorDate: Wed Jan 12 20:06:00 2022 -0800
fix docs
---
docs/{ => modules/ROOT}/pages/index.adoc | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/docs/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
similarity index 100%
rename from docs/pages/index.adoc
rename to docs/modules/ROOT/pages/index.adoc
[GitHub] [camel-website] github-actions[bot] commented on pull request #747: DO NOT MERGE PREVIEW ONLY preview playbook for RI work
github-actions[bot] commented on pull request #747: URL: https://github.com/apache/camel-website/pull/747#issuecomment-1011805085 Preview is available at https://pr-747--camel.netlify.app -- 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
[GitHub] [camel] chiragsanghavi opened a new pull request #6733: Update jclouds-component.adoc with correct jclouds URL as jclouds is now an Apache project.
chiragsanghavi opened a new pull request #6733: URL: https://github.com/apache/camel/pull/6733 jclouds is now an apache projects. -- 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
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1011784598 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1690334189-526-ecae89ff-6cd7-44e0-a08f-24dad1622742 * Camel Quarkus Commit: 6a041280c7c3e833ada81299a150fb4114a2fb93 * Camel Main Commit: 8f3eb2118fa02a5e95074cc512008cf0f6721997 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1690334189 -- 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
[GitHub] [camel-kamelets] djencks opened a new pull request #710: fix docs
djencks opened a new pull request #710: URL: https://github.com/apache/camel-kamelets/pull/710 Pay Attention!! -- 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
[GitHub] [camel] chiragsanghavi opened a new pull request #6732: Updating documentation links as some of the projects have moved from code.google.com to github.
chiragsanghavi opened a new pull request #6732: URL: https://github.com/apache/camel/pull/6732 -- 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-quarkus] branch main updated: Updated CHANGELOG.md
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-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 04ea063 Updated CHANGELOG.md 04ea063 is described below commit 04ea0636506c2d7504fbb83cb992262ae5e5e963 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jan 13 03:12:59 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf23c3..3e33569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Closed issues:** +- Ban log4j 1.x [\#3451](https://github.com/apache/camel-quarkus/issues/3451) - camel.main.durationMaxSeconds is not honoured [\#3433](https://github.com/apache/camel-quarkus/issues/3433) - Manage Eclipse jgit version and jzlib version [\#3414](https://github.com/apache/camel-quarkus/issues/3414) - Ban `commons-logging` and `commons-logging-api` [\#3405](https://github.com/apache/camel-quarkus/issues/3405) @@ -19,6 +20,7 @@ **Merged pull requests:** +- Ban log4j 1.x [\#3452](https://github.com/apache/camel-quarkus/pull/3452) ([ppalaga](https://github.com/ppalaga)) - Avoid usage of deprecated io.quarkus.arc.AlternativePriority [\#3445](https://github.com/apache/camel-quarkus/pull/3445) ([jamesnetherton](https://github.com/jamesnetherton)) - Add test coverage for OpenTelemetry `@WithSpan` annotation [\#3443](https://github.com/apache/camel-quarkus/pull/3443) ([jamesnetherton](https://github.com/jamesnetherton)) - Remove redundancy in pom description [\#3440](https://github.com/apache/camel-quarkus/pull/3440) ([apupier](https://github.com/apupier))
[camel-k] branch main updated (863887e -> b5639da)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 863887e chore(e2e): Move HTTPD resources creation in separate functions add b5639da Updated CHANGELOG.md No new revisions were added by this update. Summary of changes: CHANGELOG.md | 5 + 1 file changed, 5 insertions(+)
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new 9116889 Updated CHANGELOG.md 9116889 is described below commit 91168891edb979527cf3674968b0c99cffeebba0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jan 13 03:06:01 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11f58da..f2fdca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ **Merged pull requests:** +- 1.0.0release [\#1312](https://github.com/apache/camel-kafka-connector/pull/1312) ([valdar](https://github.com/valdar)) +- \#1308 update Antora structure \(main\) [\#1309](https://github.com/apache/camel-kafka-connector/pull/1309) ([djencks](https://github.com/djencks)) - Fix Maven IT failures due to doc generation removal [\#1307](https://github.com/apache/camel-kafka-connector/pull/1307) ([tadayosi](https://github.com/tadayosi)) - update to docs local build v2 [\#1305](https://github.com/apache/camel-kafka-connector/pull/1305) ([djencks](https://github.com/djencks)) - Main local index page and local/partial build [\#1298](https://github.com/apache/camel-kafka-connector/pull/1298) ([djencks](https://github.com/djencks))
[GitHub] [camel] chiragsanghavi closed pull request #6731: Camel 3.14.x jsonpath link needs change in documentation.
chiragsanghavi closed pull request #6731: URL: https://github.com/apache/camel/pull/6731 -- 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
[GitHub] [camel] chiragsanghavi opened a new pull request #6731: Camel 3.14.x jsonpath link needs change in documentation.
chiragsanghavi opened a new pull request #6731: URL: https://github.com/apache/camel/pull/6731 -- 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
[GitHub] [camel-k] djencks opened a new pull request #2874: fix http-proxy-docs
djencks opened a new pull request #2874: URL: https://github.com/apache/camel-k/pull/2874 This fixes the AsciiDoc syntax error in commit 4e15b691d47ed8c2aff86c4a08eb0b783f50d636 Author: Antonin Stefanutti Date: Wed Jan 12 11:33:37 2022 +0100 feat: Add HTTP proxy documentation -- 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
[GitHub] [camel-k] github-actions[bot] commented on issue #2341: Json marshalling is needed for Rest route and uncommented code seems to be executed
github-actions[bot] commented on issue #2341: URL: https://github.com/apache/camel-k/issues/2341#issuecomment-1011566874 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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
[GitHub] [camel-k] github-actions[bot] commented on issue #2693: Expose UDP port using traits and make it accessible outside of the pod
github-actions[bot] commented on issue #2693: URL: https://github.com/apache/camel-k/issues/2693#issuecomment-1011566858 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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 (2ce5b58 -> 5cc6acb)
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 2ce5b58 Fix the javadoc paths (#6729) add 5cc6acb [CAMEL-17483]camel-cxf: avoid using deprecated API No new revisions were added by this update. Summary of changes: .../camel/component/cxf/DefaultCxfBinding.java | 27 +++-- .../camel/component/cxf/jaxrs/CxfRsProducer.java | 33 ++--- .../component/cxf/jaxrs/DefaultCxfRsBinding.java | 8 +- .../cxf/spring/SpringJAXRSClientFactoryBean.java | 8 +- .../cxf/spring/SpringJAXRSServerFactoryBean.java | 8 +- .../cxf/AbstractCXFGreeterRouterTest.java | 27 + .../camel/component/cxf/CXFGreeterEnrichTest.java | 3 +- .../CxfConsumerPayloadFaultCauseEnabledTest.java | 17 +-- .../component/cxf/CxfConsumerResponseTest.java | 5 +- .../component/cxf/CxfDispatchMessageTest.java | 2 +- .../component/cxf/CxfDispatchPayloadTest.java | 2 +- .../cxf/CxfGreeterCXFMessageRouterTest.java| 3 +- .../CxfGreeterCXFMessageWithoutSEIRouterTest.java | 3 +- .../cxf/CxfGreeterConverterRouterTest.java | 3 +- .../cxf/CxfGreeterMessageCamelHttpRouterTest.java | 3 +- .../component/cxf/CxfGreeterMessageRouterTest.java | 3 +- .../component/cxf/CxfGreeterPayLoadRouterTest.java | 3 +- .../CxfGreeterPayLoadWithFeatureRouterTest.java| 5 +- .../cxf/CxfGreeterWSDLOnlyRouterTest.java | 3 +- .../cxf/CxfPayLoadMessageXmlBindingRouterTest.java | 35 +- .../cxf/CxfPayLoadSoapHeaderSpringTest.java| 133 + .../CxfPayloadConsumerNamespaceOnEnvelopeTest.java | 29 ++--- .../CxfPayloadProducerNamespaceOnEnvelopeTest.java | 29 ++--- .../cxf/CxfPayloadProviderRouterTest.java | 3 +- .../cxf/CxfPayloadRouterContentLengthTest.java | 22 ++-- .../cxf/CxfSpringCustomizedExceptionTest.java | 20 +--- .../camel/component/cxf/CxfSpringRouterTest.java | 84 +++-- .../camel/component/cxf/DefaultCxfBindingTest.java | 11 +- .../camel/component/cxf/FailOverFeatureTest.java | 4 +- .../component/cxf/LoadDistributorFeatureTest.java | 4 +- .../cxf/converter/PayLoadConvertToPOJOTest.java| 27 + .../cxf/jaxrs/CxfRsAsyncProducerSessionTest.java | 1 - .../cxf/jaxrs/CxfRsAsyncProducerTest.java | 2 - .../jaxrs/CxfRsProducerClientFactoryBeanTest.java | 33 ++--- .../jaxrs/CxfRsProducerClientFactoryCacheTest.java | 41 ++- .../cxf/jaxrs/CxfRsProducerHeaderTest.java | 2 +- .../cxf/jaxrs/CxfRsProducerSessionTest.java| 1 - .../component/cxf/jaxrs/CxfRsProducerTest.java | 8 +- .../cxf/jaxrs/CxfRsSpringConsumerTest.java | 1 + .../cxf/jaxrs/CxfRsSslAsyncProducerTest.java | 6 +- .../component/cxf/jaxrs/CxfRsStreamCacheTest.java | 2 +- .../cxf/jms/CxfEndpointJMSConsumerTest.java| 35 +- .../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 2 +- .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 4 +- .../CxfMtomDisabledConsumerPayloadModeTest.java| 4 +- .../CxfMtomDisabledProducerPayloadModeTest.java| 4 +- .../cxf/mtom/CxfMtomPOJOProducerTest.java | 3 +- .../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 4 +- .../component/cxf/multipart/CXFMultiPartTest.java | 33 + .../cxf/util/CxfEndpointUtilsWithSpringTest.java | 92 +- .../cxf/wssecurity/camel/WSSecurityRouteTest.java | 25 +--- .../component/cxf/jaxrs/JettyCxfRsSpringRouter.xml | 2 +- 52 files changed, 418 insertions(+), 454 deletions(-)
[camel] branch main updated: [CAMEL-17483]camel-cxf: avoid using deprecated API
This is an automated email from the ASF dual-hosted git repository. ffang 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 5cc6acb [CAMEL-17483]camel-cxf: avoid using deprecated API 5cc6acb is described below commit 5cc6acbf6e99dc91062b434211e1a3fc63474b56 Author: Freeman Fang AuthorDate: Wed Jan 12 17:09:42 2022 -0500 [CAMEL-17483]camel-cxf: avoid using deprecated API --- .../camel/component/cxf/DefaultCxfBinding.java | 27 +++-- .../camel/component/cxf/jaxrs/CxfRsProducer.java | 33 ++--- .../component/cxf/jaxrs/DefaultCxfRsBinding.java | 8 +- .../cxf/spring/SpringJAXRSClientFactoryBean.java | 8 +- .../cxf/spring/SpringJAXRSServerFactoryBean.java | 8 +- .../cxf/AbstractCXFGreeterRouterTest.java | 27 + .../camel/component/cxf/CXFGreeterEnrichTest.java | 3 +- .../CxfConsumerPayloadFaultCauseEnabledTest.java | 17 +-- .../component/cxf/CxfConsumerResponseTest.java | 5 +- .../component/cxf/CxfDispatchMessageTest.java | 2 +- .../component/cxf/CxfDispatchPayloadTest.java | 2 +- .../cxf/CxfGreeterCXFMessageRouterTest.java| 3 +- .../CxfGreeterCXFMessageWithoutSEIRouterTest.java | 3 +- .../cxf/CxfGreeterConverterRouterTest.java | 3 +- .../cxf/CxfGreeterMessageCamelHttpRouterTest.java | 3 +- .../component/cxf/CxfGreeterMessageRouterTest.java | 3 +- .../component/cxf/CxfGreeterPayLoadRouterTest.java | 3 +- .../CxfGreeterPayLoadWithFeatureRouterTest.java| 5 +- .../cxf/CxfGreeterWSDLOnlyRouterTest.java | 3 +- .../cxf/CxfPayLoadMessageXmlBindingRouterTest.java | 35 +- .../cxf/CxfPayLoadSoapHeaderSpringTest.java| 133 + .../CxfPayloadConsumerNamespaceOnEnvelopeTest.java | 29 ++--- .../CxfPayloadProducerNamespaceOnEnvelopeTest.java | 29 ++--- .../cxf/CxfPayloadProviderRouterTest.java | 3 +- .../cxf/CxfPayloadRouterContentLengthTest.java | 22 ++-- .../cxf/CxfSpringCustomizedExceptionTest.java | 20 +--- .../camel/component/cxf/CxfSpringRouterTest.java | 84 +++-- .../camel/component/cxf/DefaultCxfBindingTest.java | 11 +- .../camel/component/cxf/FailOverFeatureTest.java | 4 +- .../component/cxf/LoadDistributorFeatureTest.java | 4 +- .../cxf/converter/PayLoadConvertToPOJOTest.java| 27 + .../cxf/jaxrs/CxfRsAsyncProducerSessionTest.java | 1 - .../cxf/jaxrs/CxfRsAsyncProducerTest.java | 2 - .../jaxrs/CxfRsProducerClientFactoryBeanTest.java | 33 ++--- .../jaxrs/CxfRsProducerClientFactoryCacheTest.java | 41 ++- .../cxf/jaxrs/CxfRsProducerHeaderTest.java | 2 +- .../cxf/jaxrs/CxfRsProducerSessionTest.java| 1 - .../component/cxf/jaxrs/CxfRsProducerTest.java | 8 +- .../cxf/jaxrs/CxfRsSpringConsumerTest.java | 1 + .../cxf/jaxrs/CxfRsSslAsyncProducerTest.java | 6 +- .../component/cxf/jaxrs/CxfRsStreamCacheTest.java | 2 +- .../cxf/jms/CxfEndpointJMSConsumerTest.java| 35 +- .../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 2 +- .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 4 +- .../CxfMtomDisabledConsumerPayloadModeTest.java| 4 +- .../CxfMtomDisabledProducerPayloadModeTest.java| 4 +- .../cxf/mtom/CxfMtomPOJOProducerTest.java | 3 +- .../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 4 +- .../component/cxf/multipart/CXFMultiPartTest.java | 33 + .../cxf/util/CxfEndpointUtilsWithSpringTest.java | 92 +- .../cxf/wssecurity/camel/WSSecurityRouteTest.java | 25 +--- .../component/cxf/jaxrs/JettyCxfRsSpringRouter.xml | 2 +- 52 files changed, 418 insertions(+), 454 deletions(-) diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java index 230c028..3dee199 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java @@ -67,6 +67,7 @@ import org.apache.cxf.binding.soap.SoapBindingConstants; import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.SoapVersion; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Endpoint; @@ -78,7 +79,6 @@ import org.apache.cxf.jaxws.context.WrappedMessageContext; import org.apache.cxf.message.Attachment; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageContentsList; -import org.apache.cxf.message.MessageUtils; import org.apache.cxf.security.LoginSecurityContext; import org.apache.cxf.security.SecurityContext;
[camel] branch regen_bot updated (ca417ae -> 2ce5b58)
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 ca417ae Regen for commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8 add 2ce5b58 Fix the javadoc paths (#6729) No new revisions were added by this update. Summary of changes: components/camel-mock/src/main/docs/mock-component.adoc | 2 +- components/camel-spring-xml/pom.xml | 4 ++-- .../src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc | 2 +- .../src/main/docs/modules/eips/pages/process-eip.adoc | 2 +- docs/user-manual/modules/ROOT/pages/book-getting-started.adoc | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
[camel] branch regen_bot updated (0105dac -> ca417ae)
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 0105dac Regen for commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8 add ca417ae Regen for commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8 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 (0105dac) \ N -- N -- N refs/heads/regen_bot (ca417ae) 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:
[GitHub] [camel] davsclaus commented on a change in pull request #6728: [CAMEL-17481] Caffeine cache improvements
davsclaus commented on a change in pull request #6728: URL: https://github.com/apache/camel/pull/6728#discussion_r783413976 ## File path: components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc ## @@ -83,5 +83,13 @@ CaffeineConstants.ACTION_HAS_RESULT CaffeineConstants.ACTION_SUCCEEDED +== Cache invalidation + +Please note that before Camel 3.15 the invalidate all action (CaffeineConstants.ACTION_INVALIDATE_ALL) does not +delete anything in case that CaffeineConstants.KEYS header is either missing or contains an empty set. + +Starting vom Camel 3.15 the invalidate all action does not delete anything in case the CaffeineConstants.KEYS header Review comment: Ah yeah that is better as if you use camel 3.14 or older then you read the docs for that version which does not have this change. So yeah this should be moved to the 3.15 upgrade guide in the root/docs folder -- 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
[GitHub] [camel-website] essobedo closed pull request #752: DO NOT MERGE PREVIEW ONLY: Preview of apache/camel#6729
essobedo closed pull request #752: URL: https://github.com/apache/camel-website/pull/752 -- 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
[GitHub] [camel] davsclaus merged pull request #6729: Fix the javadoc paths
davsclaus merged pull request #6729: URL: https://github.com/apache/camel/pull/6729 -- 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: Fix the javadoc paths (#6729)
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 2ce5b58 Fix the javadoc paths (#6729)
2ce5b58 is described below
commit 2ce5b583babb1844b2e9904ef6a30bda390e3999
Author: Nicolas Filotto
AuthorDate: Wed Jan 12 21:15:45 2022 +0100
Fix the javadoc paths (#6729)
---
components/camel-mock/src/main/docs/mock-component.adoc | 2 +-
components/camel-spring-xml/pom.xml | 4 ++--
.../src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc | 2 +-
.../src/main/docs/modules/eips/pages/process-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/book-getting-started.adoc | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-mock/src/main/docs/mock-component.adoc
b/components/camel-mock/src/main/docs/mock-component.adoc
index 7d3475e..a6b3b0f 100644
--- a/components/camel-mock/src/main/docs/mock-component.adoc
+++ b/components/camel-mock/src/main/docs/mock-component.adoc
@@ -190,7 +190,7 @@ resultEndpoint.expectedBodiesReceived("firstMessageBody",
"secondMessageBody", "
== Adding expectations to specific messages
In addition, you can use the
-http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/component/mock/MockEndpoint.html#message(int)[`message(int
+http://javadoc.io/doc/org.apache.camel/camel-mock/latest/org/apache/camel/component/mock/MockEndpoint.html#message-int-[`message(int
messageIndex)`] method to add assertions about a specific message that is
received.
diff --git a/components/camel-spring-xml/pom.xml
b/components/camel-spring-xml/pom.xml
index 2771ad6..91593c1 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -619,8 +619,8 @@
http://download.oracle.com/javase/7/docs/api/
http://download.oracle.com/javaee/7/api/
http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/
-
http://camel.apache.org/maven/current/camel-core-model/apidocs/
-
http://camel.apache.org/maven/current/camel-core-engine/apidocs/
+
http://javadoc.io/doc/org.apache.camel/camel-core-model/latest/
+
http://javadoc.io/doc/org.apache.camel/camel-core-engine/latest/
true
256m
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc
index 4485f54..e38df06 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/eventDrivenConsumer-eip.adoc
@@ -14,7 +14,7 @@ TIP: The alternative consumer mode is
xref:pollEnrich-eip.adoc[Polling Consumer]
image::eip/EventDrivenConsumerSolution.gif[image]
The Event Driven Consumer is implemented by consumers implementing the
-http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
+http://javadoc.io/doc/org.apache.camel/camel-api/latest/org/apache/camel/Processor.html[Processor]
interface which is invoked by the xref:message-endpoint.adoc[Message Endpoint]
when a xref:message.adoc[Message] is available for processing.
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
index 1fb3edd..aac9e84 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
@@ -5,7 +5,7 @@
:since:
:supportlevel: Stable
-The
http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
+The
http://javadoc.io/doc/org.apache.camel/camel-api/latest/org/apache/camel/Processor.html[Processor]
is used for processing message xref:manual::exchange.adoc[Exchanges].
The processor is a core Camel concept that represents a node capable of using,
creating,
diff --git a/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc
b/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc
index b316c79..16906cb 100644
--- a/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc
+++ b/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc
@@ -158,9 +158,9 @@ xref:book-getting-started.adoc[Section ("Online Javadoc
documentation")], Camel provides a separate Javadoc hierarchy for each
communications technology supported by Camel. Because of this, you will
find documentation on, say, the `JmsEndpoint` class in the
[camel-quarkus] branch 2.2.x updated: Ban log4j 1.x #3451
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/2.2.x by this push: new 9371f7e Ban log4j 1.x #3451 9371f7e is described below commit 9371f7ea075edbcc08f3815485606c24edf0401c Author: Peter Palaga AuthorDate: Wed Jan 12 17:05:16 2022 +0100 Ban log4j 1.x #3451 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a1b604d..4c74fcf 100644 --- a/pom.xml +++ b/pom.xml @@ -654,6 +654,7 @@ commons-logging:commons-logging-api javax.activation:activation javax.enterprise:cdi-api + log4j:log4j org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jms_2.0_spec
[camel-quarkus] branch main updated: Ban log4j 1.x #3451
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 8f3eb21 Ban log4j 1.x #3451 8f3eb21 is described below commit 8f3eb2118fa02a5e95074cc512008cf0f6721997 Author: Peter Palaga AuthorDate: Wed Jan 12 17:05:16 2022 +0100 Ban log4j 1.x #3451 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f0cc01f..ae0f396 100644 --- a/pom.xml +++ b/pom.xml @@ -668,6 +668,7 @@ commons-logging:commons-logging-api javax.activation:activation javax.enterprise:cdi-api + log4j:log4j org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jms_2.0_spec
[GitHub] [camel-quarkus] ppalaga merged pull request #3453: Backport ban log4j 1.x
ppalaga merged pull request #3453: URL: https://github.com/apache/camel-quarkus/pull/3453 -- 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
[GitHub] [camel-quarkus] ppalaga closed issue #3451: Ban log4j 1.x
ppalaga closed issue #3451: URL: https://github.com/apache/camel-quarkus/issues/3451 -- 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
[GitHub] [camel-quarkus] ppalaga merged pull request #3452: Ban log4j 1.x
ppalaga merged pull request #3452: URL: https://github.com/apache/camel-quarkus/pull/3452 -- 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
[GitHub] [camel-quarkus] davsclaus commented on issue #3251: Camel Rest DSL - Expose Rest DSL services to quarkus openapi
davsclaus commented on issue #3251: URL: https://github.com/apache/camel-quarkus/issues/3251#issuecomment-1011372494 Yeah its general Camel from the XML DSL -- 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 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ca417ae Regen for commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8
ca417ae is described below
commit ca417ae4a7dc68032c69f6cc290eb87224f7c830
Author: jeremyross
AuthorDate: Wed Jan 12 19:06:39 2022 +
Regen for commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8
Signed-off-by: GitHub
---
.../apache/camel/catalog/models/claimCheck.json| 4 ++--
.../apache/camel/catalog/schemas/camel-spring.xsd | 24 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/claimCheck.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/claimCheck.json
index b3d6662..97c8c01 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/claimCheck.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/claimCheck.json
@@ -12,9 +12,9 @@
"output": false
},
"properties": {
-"operation": { "kind": "attribute", "displayName": "Operation",
"required": false, "type": "enum", "javaType":
"org.apache.camel.model.ClaimCheckOperation", "enum": [ "Get", "GetAndRemove",
"Set", "Push", "Pop" ], "deprecated": false, "autowired": false, "secret":
false, "description": "The claim check operation to use. The following
operations is supported: Get - Gets (does not remove) the claim check by the
given key. GetAndRemove - Gets and remove the claim check by the given key.
[...]
+"operation": { "kind": "attribute", "displayName": "Operation",
"required": false, "type": "enum", "javaType":
"org.apache.camel.model.ClaimCheckOperation", "enum": [ "Get", "GetAndRemove",
"Set", "Push", "Pop" ], "deprecated": false, "autowired": false, "secret":
false, "description": "The claim check operation to use. The following
operations are supported: Get - Gets (does not remove) the claim check by the
given key. GetAndRemove - Gets and removes the claim check by the given ke [...]
"key": { "kind": "attribute", "displayName": "Key", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To use a specific key for
claim check id (for dynamic keys use simple language syntax as the key)." },
-"filter": { "kind": "attribute", "displayName": "Filter", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Specified a filter to
control what data gets merging data back from the claim check repository. The
following syntax is supported: body - to aggregate the message body attachments
- to aggregate all the message attachments headers - to aggregate all the
message headers header:pattern - [...]
+"filter": { "kind": "attribute", "displayName": "Filter", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Specify a filter to
control what data gets merged data back from the claim check repository. The
following syntax is supported: body - to aggregate the message body attachments
- to aggregate all the message attachments headers - to aggregate all the
message headers header:pattern - to [...]
"strategyRef": { "kind": "attribute", "displayName": "Strategy Ref",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom AggregationStrategy instead of the default implementation. Notice
you cannot use both custom aggregation strategy and configure data at the same
time. The value can either refer to a bean to lookup, or to lookup a singleton
bean by its type, or to create a new [...]
"strategyMethodName": { "kind": "attribute", "displayName": "Strategy
Method Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
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 f8c2110..7a283c4 100644
---
[GitHub] [camel] oscerd merged pull request #6730: Generated sources regen
oscerd merged pull request #6730: URL: https://github.com/apache/camel/pull/6730 -- 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 (f1bcff0 -> 0105dac)
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 f1bcff0 CAMEL-17479: configuring beans with {{?foo}} supported.
add 029c2f0 Polish claim check docs.
add 0105dac Regen for commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/models/claimCheck.json| 4 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 24 ++---
.../docs/modules/eips/pages/claimCheck-eip.adoc| 42 +++---
.../org/apache/camel/model/claimCheck.json | 4 +--
.../apache/camel/model/ClaimCheckDefinition.java | 22 ++--
5 files changed, 48 insertions(+), 48 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6730: Generated sources regen
github-actions[bot] opened a new pull request #6730: URL: https://github.com/apache/camel/pull/6730 Regen bot :robot: found some uncommited changes after running build on :camel: main. 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
[GitHub] [camel-k] zroubalik commented on a change in pull request #2838: Add support for KEDA
zroubalik commented on a change in pull request #2838:
URL: https://github.com/apache/camel-k/pull/2838#discussion_r783336961
##
File path: addons/keda/keda.go
##
@@ -0,0 +1,551 @@
+/*
+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 keda
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "sort"
+ "strings"
+ "text/template"
+
+ kedav1alpha1 "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
+ camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/pkg/kamelet/repository"
+ "github.com/apache/camel-k/pkg/metadata"
+ "github.com/apache/camel-k/pkg/platform"
+ "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/pkg/util/property"
+ "github.com/apache/camel-k/pkg/util/source"
+ "github.com/apache/camel-k/pkg/util/uri"
+ "github.com/pkg/errors"
+ scase "github.com/stoewer/go-strcase"
+ v1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+const (
+ // kameletURNMetadataPrefix allows binding Kamelet properties to KEDA
metadata.
+ kameletURNMetadataPrefix = "urn:keda:metadata:"
+ // kameletURNAuthenticationPrefix allows binding Kamelet properties to
KEDA authentication options.
+ kameletURNAuthenticationPrefix = "urn:keda:authentication:"
+ // kameletURNRequiredTag is used to mark properties required by KEDA.
+ kameletURNRequiredTag = "urn:keda:required"
+
+ // kameletAnnotationType indicates the scaler type associated to a
Kamelet.
+ kameletAnnotationType = "camel.apache.org/keda.type"
+ // kameletAnnotationMetadataPrefix is used to define virtual metadata
fields computed from Kamelet properties.
+ kameletAnnotationMetadataPrefix = "camel.apache.org/keda.metadata."
+ // kameletAnnotationAuthenticationPrefix is used to define virtual
authentication fields computed from Kamelet properties.
+ kameletAnnotationAuthenticationPrefix =
"camel.apache.org/keda.authentication."
+)
+
+// The KEDA trait can be used for automatic integration with KEDA autoscalers.
+// The trait can be either manually configured using the `triggers` option or
automatically configured
+// via markers in the Kamelets.
+//
+// For information on how to use KEDA enabled Kamelets with the KEDA trait,
refer to
+// xref:ROOT:kamelets/kamelets-user.adoc#kamelet-keda-user[the KEDA section in
the Kamelets user guide].
+// If you want to create Kamelets that contain KEDA metadata, refer to
+// xref:ROOT:kamelets/kamelets-dev.adoc#kamelet-keda-dev[the KEDA section in
the Kamelets development guide].
+//
+// The KEDA trait is disabled by default.
+//
+// +camel-k:trait=keda.
+type kedaTrait struct {
+ trait.BaseTrait `property:",squash"`
+ // Enables automatic configuration of the trait. Allows the trait to
infer KEDA triggers from the Kamelets.
+ Auto *bool `property:"auto" json:"auto,omitempty"`
+ // Convert metadata properties to camelCase (needed because Camel K
trait properties use kebab-case from command line). Disabled by default.
+ CamelCaseConversion *bool `property:"camel-case-conversion"
json:"camelCaseConversion,omitempty"`
+ // Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow KEDA to recognize it as a scalable resource.
Review comment:
Yeah, the field is mandatory as per:
https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#scale-subresource
--
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: Polish claim check docs.
This is an automated email from the ASF dual-hosted git repository. jeremyross 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 029c2f0 Polish claim check docs. 029c2f0 is described below commit 029c2f083d6d4fb33b444d2bcbd74c0a44a3e3a8 Author: Jeremy Ross AuthorDate: Wed Jan 12 12:14:31 2022 -0600 Polish claim check docs. --- .../docs/modules/eips/pages/claimCheck-eip.adoc| 42 +++--- .../org/apache/camel/model/claimCheck.json | 4 +-- .../apache/camel/model/ClaimCheckDefinition.java | 22 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc index b24d2e6..48498e3 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/claimCheck-eip.adoc @@ -27,7 +27,7 @@ include::partial$eip-options.adoc[] When using this EIP you must specify the operation to use which can be of the following: * *Get* - Gets (does not remove) the claim check by the given key. -* *GetAndRemove* - Gets and remove the claim check by the given key. +* *GetAndRemove* - Gets and removes the claim check by the given key. * *Set* - Sets a new (will override if key already exists) claim check with the given key. * *Push* - Sets a new claim check on the stack (does not use key). * *Pop* - Gets the latest claim check from the stack (does not use key). @@ -41,19 +41,19 @@ The `Push` and `Pop` operations do *not* use a key but stores the data in a stac == Merging data using get or pop operation The `Get`, `GetAndRemove` and `Pop` operations will claim data back from the claim check repository. -The data is then merged with the current data on the exchange, this is done with an `AggregationStrategy`. +The data is then merged with the current data on the exchange. This is done with an `AggregationStrategy`. The default strategy uses the `filter` option to easily specify what data to merge back. The `filter` option takes a `String` value with the following syntax: -* `body` = to aggregate the message body -* `attachments` = to aggregate all the message attachments -* `headers` = to aggregate all the message headers -* `header:pattern` = to aggregate all the message headers that matches the pattern. +* `body` - to aggregate the message body. +* `attachments` - to aggregate all the message attachments. +* `headers` - to aggregate all the message headers. +* `header:pattern` - to aggregate all the message headers that matches the pattern. -The pattern rule supports wildcard and regular expression: +The pattern rule supports wildcards and regular expressions: -* wildcard match (pattern ends with a `*, and the name starts with the pattern) +* wildcard match (pattern ends with a `*`, and the name starts with the pattern) * regular expression match You can specify multiple rules separated by comma. @@ -97,15 +97,15 @@ header:foo If the filter rule is specified as empty or as wildcard then everything is merged. -Notice that when merging back data, then any existing data is overwritten, and any other existing data is preserved. +Notice that when merging back data, any data in the Message that is not overwritten is preserved. === Filtering with include and exclude patterns -The syntax also supports the following prefixes which can be used to specify include,exclude, or remove +The syntax also supports the following prefixes which can be used to specify include, exclude, or remove -* `+` = to include (which is the default mode) -* `-` = to exclude (exclude takes precedence over include) -* `--` = to remove (remove takes precedence) +* `+` to include (which is the default mode) +* `-` to exclude (exclude takes precedence over include) +* `--` to remove (remove takes precedence) For example to skip the message body, and merge back everything else @@ -114,14 +114,14 @@ For example to skip the message body, and merge back everything else -body -Or to skip the message header foo, and merge back everything else +Or to skip the message header foo and merge back everything else [source,text] -header:foo -You can also instruct removing headers when merging data back, for example to remove all headers starting with _bar_: +You can also remove headers when merging data back. For example, to remove all headers starting with _bar_: [source,text] @@ -132,8 +132,8 @@ Note you cannot have both include (`+`) and exclude (`-`) `header:pattern` at th == Dynamic keys -The claim check key are static, but you can use the `simple` language syntax to define dynamic keys, -for example to use a header from the message named `myKey`: +The claim check keys
[camel] branch regen_bot updated (2ff600f -> f1bcff0)
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 2ff600f Regen for commit c648a6c34a9e53d5fed005d3a9e8ab424b7a1314
add 3131d46 CAMEL-17479: configuring beans with {{?foo}} supported. Added
unit test.
add 9d2ffe2 CAMEL-17479: configuring beans with {{?foo}} supported.
add f1bcff0 CAMEL-17479: configuring beans with {{?foo}} supported.
No new revisions were added by this update.
Summary of changes:
...va => OptionalPropertyPlaceholderBeanTest.java} | 51 --
core/camel-main/src/main/docs/main.adoc| 25 +++
...> PropertyBindingSupportOptionalValueTest.java} | 35 ---
.../camel/support/PropertyBindingSupport.java | 19 +++-
4 files changed, 100 insertions(+), 30 deletions(-)
copy
core/camel-core/src/test/java/org/apache/camel/component/properties/{ComponentResolvePropertyPlaceholdersTest.java
=> OptionalPropertyPlaceholderBeanTest.java} (51%)
copy
core/camel-main/src/test/java/org/apache/camel/main/{PropertyBindingSupportRootArrayTest.java
=> PropertyBindingSupportOptionalValueTest.java} (59%)
[camel] branch regen_bot_3.14.x updated (69886f4 -> 155437d)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot_3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 69886f4 CAMEL-17479: configuring beans with {{?foo}} supported.
add 155437d CAMEL-17479: configuring beans with {{?foo}} supported.
No new revisions were added by this update.
Summary of changes:
core/camel-main/src/main/docs/main.adoc| 25
...> PropertyBindingSupportOptionalValueTest.java} | 35 ++
2 files changed, 54 insertions(+), 6 deletions(-)
copy
core/camel-main/src/test/java/org/apache/camel/main/{PropertyBindingSupportRootArrayTest.java
=> PropertyBindingSupportOptionalValueTest.java} (59%)
[GitHub] [camel-kamelets] oscerd opened a new issue #709: Kamelet Action: Add a separated section in docs on how to use them
oscerd opened a new issue #709: URL: https://github.com/apache/camel-kamelets/issues/709 This relates to #673 We should add more examples and make the actions a bit more usable in terms of documentation. Let's try to do this on 0.7.0. -- 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
[GitHub] [camel-kamelets] oscerd opened a new issue #708: Align camel-k model to the latest release of Kubernetes client..
oscerd opened a new issue #708: URL: https://github.com/apache/camel-kamelets/issues/708 once this PR https://github.com/fabric8io/kubernetes-client/pull/3739/ will be merged and released -- 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
[GitHub] [camel-kamelets] oscerd commented on issue #703: make user and password properties of elasticsearch-index-sink optional with ?
oscerd commented on issue #703: URL: https://github.com/apache/camel-kamelets/issues/703#issuecomment-1011290892 It seems to be a duplicate of #704 -- 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
[GitHub] [camel] essobedo commented on pull request #6729: Fix the javadoc paths
essobedo commented on pull request #6729: URL: https://github.com/apache/camel/pull/6729#issuecomment-1011286848 Sorry since my commit was not signed and the build failed for something that is not related, I pushed a new commit to relaunch the build and sign it -- 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
[GitHub] [camel-quarkus] navinyashende commented on issue #3251: Camel Rest DSL - Expose Rest DSL services to quarkus openapi
navinyashende commented on issue #3251: URL: https://github.com/apache/camel-quarkus/issues/3251#issuecomment-1011285128 Does quarkus support camel rest dsl in xml? -- 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
[GitHub] [camel] oscerd commented on a change in pull request #6726: Google OAuth2 with service account scenario (2LO OAuth2)
oscerd commented on a change in pull request #6726:
URL: https://github.com/apache/camel/pull/6726#discussion_r783281114
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -38,6 +38,8 @@
org.apache.camel.component.google.mail
org.apache.camel.component.google.mail.internal
org.apache.camel.component.google.mail.internal
+1.32.1
Review comment:
This needs to be parent/pom
##
File path:
components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
##
@@ -124,4 +133,38 @@ public void setApplicationName(String applicationName) {
this.applicationName = applicationName;
}
+public String getFilename() {
+return filename;
+}
+
+/**
+ * Filename "*.json" with credentials for Service account
+ */
+public void setFilename(String filename) {
Review comment:
This filename option should use the usual approach we have in other
component so it should be resolved from classpath, file, http etc. You have
multiple examples in the codebase
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -83,6 +85,11 @@
google-api-services-gmail
${google-api-services-mail-version}
+
Review comment:
+1
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -38,6 +38,8 @@
org.apache.camel.component.google.mail
org.apache.camel.component.google.mail.internal
org.apache.camel.component.google.mail.internal
+1.32.1
+
v1-rev20211108-1.32.1
Review comment:
This needs to be parent/pom
--
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
[GitHub] [camel] oscerd commented on a change in pull request #6728: [CAMEL-17481] Caffeine cache improvements
oscerd commented on a change in pull request #6728:
URL: https://github.com/apache/camel/pull/6728#discussion_r783279670
##
File path:
components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpoint.java
##
@@ -64,27 +64,37 @@ public Producer createProducer() throws Exception {
@Override
protected void doStart() throws Exception {
-cache = CamelContextHelper.lookup(getCamelContext(), cacheName,
Cache.class);
-if (cache == null) {
-Caffeine builder = Caffeine.newBuilder();
-if (configuration.getEvictionType() == EvictionType.SIZE_BASED) {
-builder.initialCapacity(configuration.getInitialCapacity());
-builder.maximumSize(configuration.getMaximumSize());
-} else if (configuration.getEvictionType() ==
EvictionType.TIME_BASED) {
-
builder.expireAfterAccess(configuration.getExpireAfterAccessTime(),
TimeUnit.SECONDS);
-
builder.expireAfterWrite(configuration.getExpireAfterWriteTime(),
TimeUnit.SECONDS);
-}
-if (configuration.isStatsEnabled()) {
-if (ObjectHelper.isEmpty(configuration.getStatsCounter())) {
-builder.recordStats();
+
+synchronized (this) {
+cache = CamelContextHelper.lookup(getCamelContext(), cacheName,
Cache.class);
+if (cache == null) {
+if (configuration.isCreateCacheIfNotExist()) {
+Caffeine builder = Caffeine.newBuilder();
+if (configuration.getEvictionType() ==
EvictionType.SIZE_BASED) {
+
builder.initialCapacity(configuration.getInitialCapacity());
+builder.maximumSize(configuration.getMaximumSize());
+} else if (configuration.getEvictionType() ==
EvictionType.TIME_BASED) {
+
builder.expireAfterAccess(configuration.getExpireAfterAccessTime(),
TimeUnit.SECONDS);
+
builder.expireAfterWrite(configuration.getExpireAfterWriteTime(),
TimeUnit.SECONDS);
+}
+if (configuration.isStatsEnabled()) {
+if
(ObjectHelper.isEmpty(configuration.getStatsCounter())) {
+builder.recordStats();
+} else {
+
builder.recordStats(configuration::getStatsCounter);
+}
+}
+if
(ObjectHelper.isNotEmpty(configuration.getRemovalListener())) {
+
builder.removalListener(configuration.getRemovalListener());
+}
+cache = builder.build();
+getCamelContext().getRegistry().bind(cacheName,
Cache.class, cache);
Review comment:
If you don't set the cache in the registry before the endpoint has been
started, there is no mean of doing this after you create it in the doStart. If
you don't set the cache instance in the registry, you'll use the cache created
in the doStart for the lifecycle of the endpoint.
The toF examples are an attempt to explain that if you use a pure to without
a cache in the registry you'll get just a cache created in the lifecycle of the
endpoint, this means you won't be able to reuse it in a different endpoint.
Binding the cache to the registry in the doStart is wrong in my opinion.
##
File path: components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
##
@@ -83,5 +83,13 @@ CaffeineConstants.ACTION_HAS_RESULT
CaffeineConstants.ACTION_SUCCEEDED
+== Cache invalidation
+
+Please note that before Camel 3.15 the invalidate all action
(CaffeineConstants.ACTION_INVALIDATE_ALL) does not
+delete anything in case that CaffeineConstants.KEYS header is either missing
or contains an empty set.
+
+Starting vom Camel 3.15 the invalidate all action does not delete anything in
case the CaffeineConstants.KEYS header
Review comment:
I think we should move this section to the migration guide, since we are
producing docs for each of the active branches
##
File path:
components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpoint.java
##
@@ -64,27 +65,36 @@ public Producer createProducer() throws Exception {
@Override
protected void doStart() throws Exception {
-cache = CamelContextHelper.lookup(getCamelContext(), cacheName,
LoadingCache.class);
-if (cache == null) {
-Caffeine builder = Caffeine.newBuilder();
-if (configuration.getEvictionType() == EvictionType.SIZE_BASED) {
-builder.initialCapacity(configuration.getInitialCapacity());
-builder.maximumSize(configuration.getMaximumSize());
-} else if
[GitHub] [camel] davsclaus commented on a change in pull request #6726: Google OAuth2 with service account scenario (2LO OAuth2)
davsclaus commented on a change in pull request #6726:
URL: https://github.com/apache/camel/pull/6726#discussion_r783278721
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -83,6 +85,11 @@
google-api-services-gmail
${google-api-services-mail-version}
+
Review comment:
Ah okay there is a
google-mail-guava-version in parent/pom.xml that was previously in use. Can
you update that to 20, and use this placeholder
--
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
[GitHub] [camel] bvfalcon commented on a change in pull request #6726: Google OAuth2 with service account scenario (2LO OAuth2)
bvfalcon commented on a change in pull request #6726:
URL: https://github.com/apache/camel/pull/6726#discussion_r783274701
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -83,6 +85,11 @@
google-api-services-gmail
${google-api-services-mail-version}
+
Review comment:
com.google.http-client:google-api-client:1.39.2 (his
[pom.xml](https://github.com/googleapis/google-http-java-client/blob/v1.39.2/google-http-client/pom.xml#L135))
With guava ver. 19.0 we have an error
Caused by: java.lang.NoSuchMethodError:
com.google.common.io.ByteStreams.exhaust(Ljava/io/InputStream;)J
Caused by: java.lang.NoSuchMethodError:
com.google.common.io.ByteStreams.exhaust(Ljava/io/InputStream;)J
at
com.google.api.client.http.ConsumingInputStream.close(ConsumingInputStream.java:40)
at
java.base/java.util.zip.InflaterInputStream.close(InflaterInputStream.java:232)
at
java.base/java.util.zip.GZIPInputStream.close(GZIPInputStream.java:137)
at
java.base/sun.nio.cs.StreamDecoder.implClose(StreamDecoder.java:378)
at java.base/sun.nio.cs.StreamDecoder.close(StreamDecoder.java:193)
at
java.base/java.io.InputStreamReader.close(InputStreamReader.java:200)
at com.google.gson.stream.JsonReader.close(JsonReader.java:1220)
at
com.google.api.client.json.gson.GsonParser.close(GsonParser.java:53)
at com.google.api.client.json.JsonParser.parse(JsonParser.java:363)
at com.google.api.client.json.JsonParser.parse(JsonParser.java:335)
at
com.google.api.client.json.JsonObjectParser.parseAndClose(JsonObjectParser.java:79)
at
com.google.api.client.json.JsonObjectParser.parseAndClose(JsonObjectParser.java:73)
at
com.google.api.client.http.HttpResponse.parseAs(HttpResponse.java:456)
at
com.google.api.client.auth.oauth2.TokenRequest.execute(TokenRequest.java:324)
at
com.google.api.client.googleapis.auth.oauth2.GoogleCredential.executeRefreshToken(GoogleCredential.java:384)
at
com.google.api.client.auth.oauth2.Credential.refreshToken(Credential.java:470)
at
org.apache.camel.component.google.mail.BatchGoogleMailClientFactory.authorizeServiceAccount(BatchGoogleMailClientFactory.java:89)
at
org.apache.camel.component.google.mail.BatchGoogleMailClientFactory.makeClient(BatchGoogleMailClientFactory.java:76)
at
org.apache.camel.component.google.mail.GoogleMailComponent.getClient(GoogleMailComponent.java:62)
at
org.apache.camel.component.google.mail.GoogleMailEndpoint.getClient(GoogleMailEndpoint.java:117)
at
org.apache.camel.component.google.mail.GoogleMailEndpoint.afterConfigureProperties(GoogleMailEndpoint.java:103)
at
org.apache.camel.support.component.AbstractApiEndpoint.configureProperties(AbstractApiEndpoint.java:138)
at
org.apache.camel.support.DefaultComponent.setProperties(DefaultComponent.java:425)
at
org.apache.camel.support.component.AbstractApiComponent.createEndpoint(AbstractApiComponent.java:90)
at
org.apache.camel.support.DefaultComponent.createEndpoint(DefaultComponent.java:171)
at
org.apache.camel.impl.engine.AbstractCamelContext.doGetEndpoint(AbstractCamelContext.java:934)
at
org.apache.camel.impl.engine.AbstractCamelContext.getEndpoint(AbstractCamelContext.java:850)
--
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
[GitHub] [camel] bvfalcon commented on a change in pull request #6726: Google OAuth2 with service account scenario (2LO OAuth2)
bvfalcon commented on a change in pull request #6726:
URL: https://github.com/apache/camel/pull/6726#discussion_r783274701
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -83,6 +85,11 @@
google-api-services-gmail
${google-api-services-mail-version}
+
Review comment:
com.google.http-client:google-api-client:1.39.2 (his
[pom.xml](https://github.com/googleapis/google-http-java-client/blob/main/google-http-client/pom.xml#L140))
With guava ver. 19.0 we have an error
Caused by: java.lang.NoSuchMethodError:
com.google.common.io.ByteStreams.exhaust(Ljava/io/InputStream;)J
Caused by: java.lang.NoSuchMethodError:
com.google.common.io.ByteStreams.exhaust(Ljava/io/InputStream;)J
at
com.google.api.client.http.ConsumingInputStream.close(ConsumingInputStream.java:40)
at
java.base/java.util.zip.InflaterInputStream.close(InflaterInputStream.java:232)
at
java.base/java.util.zip.GZIPInputStream.close(GZIPInputStream.java:137)
at
java.base/sun.nio.cs.StreamDecoder.implClose(StreamDecoder.java:378)
at java.base/sun.nio.cs.StreamDecoder.close(StreamDecoder.java:193)
at
java.base/java.io.InputStreamReader.close(InputStreamReader.java:200)
at com.google.gson.stream.JsonReader.close(JsonReader.java:1220)
at
com.google.api.client.json.gson.GsonParser.close(GsonParser.java:53)
at com.google.api.client.json.JsonParser.parse(JsonParser.java:363)
at com.google.api.client.json.JsonParser.parse(JsonParser.java:335)
at
com.google.api.client.json.JsonObjectParser.parseAndClose(JsonObjectParser.java:79)
at
com.google.api.client.json.JsonObjectParser.parseAndClose(JsonObjectParser.java:73)
at
com.google.api.client.http.HttpResponse.parseAs(HttpResponse.java:456)
at
com.google.api.client.auth.oauth2.TokenRequest.execute(TokenRequest.java:324)
at
com.google.api.client.googleapis.auth.oauth2.GoogleCredential.executeRefreshToken(GoogleCredential.java:384)
at
com.google.api.client.auth.oauth2.Credential.refreshToken(Credential.java:470)
at
org.apache.camel.component.google.mail.BatchGoogleMailClientFactory.authorizeServiceAccount(BatchGoogleMailClientFactory.java:89)
at
org.apache.camel.component.google.mail.BatchGoogleMailClientFactory.makeClient(BatchGoogleMailClientFactory.java:76)
at
org.apache.camel.component.google.mail.GoogleMailComponent.getClient(GoogleMailComponent.java:62)
at
org.apache.camel.component.google.mail.GoogleMailEndpoint.getClient(GoogleMailEndpoint.java:117)
at
org.apache.camel.component.google.mail.GoogleMailEndpoint.afterConfigureProperties(GoogleMailEndpoint.java:103)
at
org.apache.camel.support.component.AbstractApiEndpoint.configureProperties(AbstractApiEndpoint.java:138)
at
org.apache.camel.support.DefaultComponent.setProperties(DefaultComponent.java:425)
at
org.apache.camel.support.component.AbstractApiComponent.createEndpoint(AbstractApiComponent.java:90)
at
org.apache.camel.support.DefaultComponent.createEndpoint(DefaultComponent.java:171)
at
org.apache.camel.impl.engine.AbstractCamelContext.doGetEndpoint(AbstractCamelContext.java:934)
at
org.apache.camel.impl.engine.AbstractCamelContext.getEndpoint(AbstractCamelContext.java:850)
--
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 camel-3.14.x updated: CAMEL-17479: configuring beans with {{?foo}} supported.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 155437d CAMEL-17479: configuring beans with {{?foo}} supported.
155437d is described below
commit 155437d7b6d08a1880136fa8aa25bf94d386f70f
Author: Claus Ibsen
AuthorDate: Wed Jan 12 18:02:41 2022 +0100
CAMEL-17479: configuring beans with {{?foo}} supported.
---
core/camel-main/src/main/docs/main.adoc| 25 +++
.../PropertyBindingSupportOptionalValueTest.java | 86 ++
2 files changed, 111 insertions(+)
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index ffc7eee..3b3c318 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -408,6 +408,31 @@ camel.beans.foo.?company = Acme
Then the company parameter is only set if `MyBean` has this option (silent
ignore if no option present).
Otherwise, if a parameter is set, and the bean does not have such a parameter,
then an exception is thrown by Camel.
+=== Optional parameter values on beans
+
+If a parameter value on a bean is configured using
xref:manual:ROOT:using-propertyplaceholder.adoc[Property Placeholder]
+and the placeholder is optional, then the placeholder can be marked as
optional using `?` syntax, as shown:
+
+[source,properties]
+
+camel.beans.foo = #class:com.foo.MyBean("Hello World", true, 123)
+camel.beans.foo.company = {{?companyName}}
+
+
+Then the company parameter is only set if there is a property placeholder with
the key _companyName_ (silent ignore if no option present).
+
+ Default parameter values on beans
+
+It is possible to supply a default value (using `:defaultValue`) if the
placeholder does not exist as shown:
+
+[source,properties]
+
+camel.beans.foo = #class:com.foo.MyBean("Hello World", true, 123)
+camel.beans.foo.company = {{?companyName:Acme}}
+
+
+Here the default value is _Acme_ that will be used if there is no property
placeholder with the key _companyName_.
+
=== Nested parameters on beans
You can configure nested parameters separating them via `.` (dot).
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/PropertyBindingSupportOptionalValueTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/PropertyBindingSupportOptionalValueTest.java
new file mode 100644
index 000..c1f42d0
--- /dev/null
+++
b/core/camel-main/src/test/java/org/apache/camel/main/PropertyBindingSupportOptionalValueTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.main;
+
+import java.util.Properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.BeanIntrospection;
+import org.apache.camel.support.PropertyBindingSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Unit test for PropertyBindingSupport
+ */
+public class PropertyBindingSupportOptionalValueTest {
+
+@Test
+public void testOptionalValue() throws Exception {
+CamelContext context = new DefaultCamelContext();
+
+BeanIntrospection bi =
context.adapt(ExtendedCamelContext.class).getBeanIntrospection();
+bi.setExtendedStatistics(true);
+
+Properties prop = new Properties();
+prop.setProperty("barOne", "Jack");
+prop.setProperty("luckyNumber", "42");
+prop.setProperty("barTwo", "Murphy");
+context.getPropertiesComponent().setInitialProperties(prop);
+
+context.start();
+
+MySecondFoo target = new MySecondFoo();
+
+PropertyBindingSupport.build()
+.withCamelContext(context)
+.withTarget(target)
+.withProperty("bars[0]", "#class:" +
MySecondBar.class.getName())
+.withProperty("bars[0].names[0]", "{{?barOne:John}}")
+.withProperty("bars[0].names[1]", "{{?barTwo}}")
+
[camel] branch main updated: CAMEL-17479: configuring beans with {{?foo}} supported.
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 f1bcff0 CAMEL-17479: configuring beans with {{?foo}} supported.
f1bcff0 is described below
commit f1bcff0087e37837ec267490db1116a82a7c2b4a
Author: Claus Ibsen
AuthorDate: Wed Jan 12 18:02:41 2022 +0100
CAMEL-17479: configuring beans with {{?foo}} supported.
---
core/camel-main/src/main/docs/main.adoc| 25 +++
.../PropertyBindingSupportOptionalValueTest.java | 86 ++
2 files changed, 111 insertions(+)
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index 8443323..f17bbbc 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -411,6 +411,31 @@ camel.beans.foo.?company = Acme
Then the company parameter is only set if `MyBean` has this option (silent
ignore if no option present).
Otherwise, if a parameter is set, and the bean does not have such a parameter,
then an exception is thrown by Camel.
+=== Optional parameter values on beans
+
+If a parameter value on a bean is configured using
xref:manual:ROOT:using-propertyplaceholder.adoc[Property Placeholder]
+and the placeholder is optional, then the placeholder can be marked as
optional using `?` syntax, as shown:
+
+[source,properties]
+
+camel.beans.foo = #class:com.foo.MyBean("Hello World", true, 123)
+camel.beans.foo.company = {{?companyName}}
+
+
+Then the company parameter is only set if there is a property placeholder with
the key _companyName_ (silent ignore if no option present).
+
+ Default parameter values on beans
+
+It is possible to supply a default value (using `:defaultValue`) if the
placeholder does not exist as shown:
+
+[source,properties]
+
+camel.beans.foo = #class:com.foo.MyBean("Hello World", true, 123)
+camel.beans.foo.company = {{?companyName:Acme}}
+
+
+Here the default value is _Acme_ that will be used if there is no property
placeholder with the key _companyName_.
+
=== Nested parameters on beans
You can configure nested parameters separating them via `.` (dot).
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/PropertyBindingSupportOptionalValueTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/PropertyBindingSupportOptionalValueTest.java
new file mode 100644
index 000..c1f42d0
--- /dev/null
+++
b/core/camel-main/src/test/java/org/apache/camel/main/PropertyBindingSupportOptionalValueTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.main;
+
+import java.util.Properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.BeanIntrospection;
+import org.apache.camel.support.PropertyBindingSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Unit test for PropertyBindingSupport
+ */
+public class PropertyBindingSupportOptionalValueTest {
+
+@Test
+public void testOptionalValue() throws Exception {
+CamelContext context = new DefaultCamelContext();
+
+BeanIntrospection bi =
context.adapt(ExtendedCamelContext.class).getBeanIntrospection();
+bi.setExtendedStatistics(true);
+
+Properties prop = new Properties();
+prop.setProperty("barOne", "Jack");
+prop.setProperty("luckyNumber", "42");
+prop.setProperty("barTwo", "Murphy");
+context.getPropertiesComponent().setInitialProperties(prop);
+
+context.start();
+
+MySecondFoo target = new MySecondFoo();
+
+PropertyBindingSupport.build()
+.withCamelContext(context)
+.withTarget(target)
+.withProperty("bars[0]", "#class:" +
MySecondBar.class.getName())
+.withProperty("bars[0].names[0]", "{{?barOne:John}}")
+.withProperty("bars[0].names[1]", "{{?barTwo}}")
+
[GitHub] [camel-website] essobedo opened a new pull request #752: DO NOT MERGE: Preview of https://github.com/apache/camel/pull/6729
essobedo opened a new pull request #752: URL: https://github.com/apache/camel-website/pull/752 Just following the process https://camel.apache.org/manual/improving-the-documentation.html#_creating_a_documentation_pull_request to validate the doc 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
[GitHub] [camel] essobedo opened a new pull request #6729: Fix the javadoc paths
essobedo opened a new pull request #6729:
URL: https://github.com/apache/camel/pull/6729
## Motivation
While reading the getting started page, I realized that some links pointed
to the Javadoc were broken.
## Modifications:
* Replace URLs of type
`http://camel.apache.org/maven/current/${component-name}/apidocs` with
`http://javadoc.io/doc/org.apache.camel/${component-name}/latest` everywhere in
the project
--
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
[GitHub] [camel] davsclaus commented on a change in pull request #6726: Google OAuth2 with service account scenario (2LO OAuth2)
davsclaus commented on a change in pull request #6726:
URL: https://github.com/apache/camel/pull/6726#discussion_r783254371
##
File path: components/camel-google/camel-google-mail/pom.xml
##
@@ -83,6 +85,11 @@
google-api-services-gmail
${google-api-services-mail-version}
+
Review comment:
What is using guava?
--
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
[GitHub] [camel] davsclaus commented on a change in pull request #6728: [CAMEL-17481] Caffeine cache improvements
davsclaus commented on a change in pull request #6728:
URL: https://github.com/apache/camel/pull/6728#discussion_r783248671
##
File path:
components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
##
@@ -54,5 +54,13 @@ include::partial$component-endpoint-options.adoc[]
// endpoint options: END
+== Cache invalidation
+
+Please note that before Camel 3.15 the invalidate all action
(CaffeineConstants.ACTION_INVALIDATE_ALL) does not
+delete anything in case that CaffeineConstants.KEYS header is either missing
or contains an empty set.
+
+Starting vom Camel 3.15 the invalidate all action does not delete anything in
case the CaffeineConstants.KEYS header
Review comment:
same here
##
File path:
components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpoint.java
##
@@ -64,27 +64,37 @@ public Producer createProducer() throws Exception {
@Override
protected void doStart() throws Exception {
-cache = CamelContextHelper.lookup(getCamelContext(), cacheName,
Cache.class);
-if (cache == null) {
-Caffeine builder = Caffeine.newBuilder();
-if (configuration.getEvictionType() == EvictionType.SIZE_BASED) {
-builder.initialCapacity(configuration.getInitialCapacity());
-builder.maximumSize(configuration.getMaximumSize());
-} else if (configuration.getEvictionType() ==
EvictionType.TIME_BASED) {
-
builder.expireAfterAccess(configuration.getExpireAfterAccessTime(),
TimeUnit.SECONDS);
-
builder.expireAfterWrite(configuration.getExpireAfterWriteTime(),
TimeUnit.SECONDS);
-}
-if (configuration.isStatsEnabled()) {
-if (ObjectHelper.isEmpty(configuration.getStatsCounter())) {
-builder.recordStats();
+
+synchronized (this) {
Review comment:
Is there a reason for using sync block here? A given endpoint instance
is started only once and not concurrently
##
File path: components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
##
@@ -83,5 +83,13 @@ CaffeineConstants.ACTION_HAS_RESULT
CaffeineConstants.ACTION_SUCCEEDED
+== Cache invalidation
+
+Please note that before Camel 3.15 the invalidate all action
(CaffeineConstants.ACTION_INVALIDATE_ALL) does not
+delete anything in case that CaffeineConstants.KEYS header is either missing
or contains an empty set.
+
+Starting vom Camel 3.15 the invalidate all action does not delete anything in
case the CaffeineConstants.KEYS header
Review comment:
vom -> from
--
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-quarkus] 06/10: Improve handling of quarkus.*.enabled configuration properties
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 266460de43a86138a32fef63bc5a34c84bc84e53
Author: James Netherton
AuthorDate: Mon Sep 13 16:00:33 2021 +0100
Improve handling of quarkus.*.enabled configuration properties
Fixes #3091
---
...afkaClientFactoryDisabledViaPropertiesTest.java | 53
...nfiguration-disable-service-binding.properties} | 1 +
.../src/test/resources/application.properties | 1 +
.../kafka/KafkaClientFactoryProducer.java | 2 +-
extensions/micrometer/deployment/pom.xml | 6 ++
.../micrometer/deployment/MicrometerProcessor.java | 7 +-
.../MicrometerMetricsConfigDefaultsTest.java} | 37 ++--
.../MicrometerMetricsConfigOverrideTest.java} | 10 +--
.../deployment/MicrometerMetricsDisabledTest.java} | 18 ++--
extensions/microprofile-health/deployment/pom.xml | 6 ++
.../deployment/MicroProfileHealthProcessor.java| 99 +-
...roProfileHealthDisabledViaCameQuarkusTest.java} | 44 --
...icroProfileHealthDisabledViaCamelMainTest.java} | 44 --
...oProfileHealthDisabledViaMicroProfileTest.java} | 44 --
.../deployment/MicroProfileHealthEnabledTest.java | 60 +
.../MicroProfileMetricsConfigDefaultsTest.java | 25 +-
.../MicroProfileMetricsConfigOverrideTest.java | 2 -
extensions/opentelemetry/deployment/pom.xml| 6 ++
.../deployment/OpenTelemetryProcessor.java | 3 +-
.../deployment/OpenTelemetryDisabledTest.java} | 31 ++-
.../deployment/OpenTelemetryEnabledTest.java | 52
.../opentelemetry/CamelOpenTelemetryConfig.java| 7 --
extensions/opentracing/deployment/pom.xml | 6 ++
.../deployment/OpenTracingDisabledTest.java} | 31 ++-
.../deployment/OpenTracingEnabledTest.java | 47 ++
25 files changed, 393 insertions(+), 249 deletions(-)
diff --git
a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java
b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java
new file mode 100644
index 000..d9ba414
--- /dev/null
+++
b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.quarkus.component.kafka.deployment;
+
+import java.util.Arrays;
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.QuarkusUnitTest;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.kafka.KafkaClientFactory;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class QuarkusKafkaClientFactoryDisabledViaPropertiesTest {
+
+@RegisterExtension
+static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
+
.withConfigurationResource("application-configuration-disable-service-binding.properties")
+.setForcedDependencies(Arrays.asList(
+new AppArtifact("io.quarkus",
"quarkus-kubernetes-service-binding", Version.getVersion(
+.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+@Inject
+CamelContext context;
+
+@Test
+public void quarkusKafkaClientFactoryRegistryBeanNull() {
+Set factories =
context.getRegistry().findByType(KafkaClientFactory.class);
+assertTrue(factories.isEmpty());
+}
+}
diff --git
a/extensions/kafka/deployment/src/test/resources/application.properties
b/extensions/kafka/deployment/src/test/resources/application-configuration-disable-service-binding.properties
[camel-quarkus] 09/10: Register CDI event bridges only when required
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7ea0f3b4df993b26717352625e759168f6f11676
Author: James Netherton
AuthorDate: Mon Oct 4 10:36:14 2021 +0100
Register CDI event bridges only when required
Fixes #3149
---
.../ROOT/pages/reference/extensions/core.adoc | 8 ++
.../core/deployment/CamelContextProcessor.java | 55 ++
.../core/deployment/main/CamelMainProcessor.java | 30 ++
.../CamelMainEventBridgeDisabledConfigTest.java} | 97 -
.../main/CamelMainEventBridgeDisabledTest.java | 59 +++
.../CamelEventBridgeDisabledConfigTest.java| 116 +
.../core/runtime/CamelEventBridgeDisabledTest.java | 36 +++
...bserversTest.java => CamelEventBridgeTest.java} | 24 +++--
...est.java => CamelLifecycleEventBridgeTest.java} | 22 ++--
...st.java => CamelManagementEventBridgeTest.java} | 66 +---
.../org/apache/camel/quarkus/core/CamelConfig.java | 23
.../camel/quarkus/core/CamelContextRecorder.java | 14 ++-
.../quarkus/core/CamelLifecycleEventBridge.java| 43 +---
.../quarkus/core/CamelManagementEventBridge.java | 9 +-
.../camel/quarkus/main/CamelMainEventBridge.java | 33 --
.../camel/quarkus/main/CamelMainRecorder.java | 6 +-
.../MicrometerMetricsConfigDefaultsTest.java | 2 +-
.../MicrometerMetricsConfigOverrideTest.java | 9 --
.../deployment/MicrometerMetricsDisabledTest.java | 8 --
.../MicroProfileMetricsConfigDefaultsTest.java | 2 +-
.../MicroProfileMetricsConfigOverrideTest.java | 9 --
21 files changed, 487 insertions(+), 184 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc
b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index 5c575df..3a0c5aa 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc
@@ -239,6 +239,14 @@ What to do if it is not possible to extract CSimple
expressions from a route def
| `org.apache.camel.quarkus.core.CamelConfig.FailureRemedy`
| `warn`
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.event-bridge.enabled]]`link:#quarkus.camel.event-bridge.enabled[quarkus.camel.event-bridge.enabled]`
+
+Whether to enable the bridging of Camel events to CDI events.
+ This allows CDI observers to be configured for Camel events. E.g. those
belonging to the `org.apache.camel.quarkus.core.events`,
`org.apache.camel.quarkus.main.events` & `org.apache.camel.impl.event`
packages.
+ Note that this configuration item only has any effect when observers
configured for Camel events are present in the application.
+| `boolean`
+| `true`
+
|icon:lock[title=Fixed at build time]
[[quarkus.camel.main.enabled]]`link:#quarkus.camel.main.enabled[quarkus.camel.main.enabled]`
If `true` all `camel-main` features are enabled; otherwise no `camel-main`
features are enabled. See described the
xref:user-guide/configuration.adoc[Configuration] section of Camel Quarkus
documentation for more details.
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
index e5b3add..73aa229 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
@@ -16,9 +16,14 @@
*/
package org.apache.camel.quarkus.core.deployment;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import java.util.function.BooleanSupplier;
+import java.util.stream.Collectors;
import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.BeanDiscoveryFinishedBuildItem;
import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.Consume;
@@ -163,4 +168,54 @@ public class CamelContextProcessor {
recorder.createRuntime(beanContainer.getValue(),
context.getCamelContext()),
config.bootstrap.enabled);
}
+
+/**
+ * Registers Camel CDI event bridges if
quarkus.camel.event-bridge.enabled=true and if
+ * the relevant events have CDI observers configured for them.
+ *
+ * @param beanDiscovery build item containing the results of bean discovery
+ * @param context build item containing the CamelContext instance
+ * @param recorder the CamelContext recorder instance
+ */
+@Record(ExecutionTime.STATIC_INIT)
+@BuildStep(onlyIf = EventBridgeEnabled.class)
+public void
[camel-quarkus] 10/10: Check whether service binding is enabled before creating QuarkusKafkaClientFactory
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 529160cbc988e8a3f23b0eed33d5f227ba07c64b
Author: James Netherton
AuthorDate: Wed Oct 6 09:27:17 2021 +0100
Check whether service binding is enabled before creating
QuarkusKafkaClientFactory
Fixes #3154
---
...onfiguration-disable-service-binding.properties | 4
.../kafka/KafkaClientFactoryProducer.java | 23 --
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git
a/extensions/kafka/deployment/src/test/resources/application-configuration-disable-service-binding.properties
b/extensions/kafka/deployment/src/test/resources/application-configuration-disable-service-binding.properties
index f1b2374..f27c317 100644
---
a/extensions/kafka/deployment/src/test/resources/application-configuration-disable-service-binding.properties
+++
b/extensions/kafka/deployment/src/test/resources/application-configuration-disable-service-binding.properties
@@ -16,3 +16,7 @@
## ---
quarkus.kafka.devservices.enabled=false
quarkus.kubernetes-service-binding.enabled=false
+
+kafka.bootstrap.servers=localhost:9092
+kafka.client.id=camel-quarkus-client
+kafka.request.timeout.ms=1000
diff --git
a/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/KafkaClientFactoryProducer.java
b/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/KafkaClientFactoryProducer.java
index 822d330..4d23b3f 100644
---
a/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/KafkaClientFactoryProducer.java
+++
b/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/KafkaClientFactoryProducer.java
@@ -17,6 +17,7 @@
package org.apache.camel.quarkus.component.kafka;
import java.util.Map;
+import java.util.Optional;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
@@ -25,6 +26,7 @@ import javax.inject.Singleton;
import io.quarkus.arc.DefaultBean;
import io.smallrye.common.annotation.Identifier;
import org.apache.camel.component.kafka.KafkaClientFactory;
+import org.eclipse.microprofile.config.Config;
@Singleton
public class KafkaClientFactoryProducer {
@@ -33,13 +35,30 @@ public class KafkaClientFactoryProducer {
@Identifier("default-kafka-broker")
Map kafkaConfig;
+@Inject
+CamelKafkaRuntimeConfig camelKafkaRuntimeConfig;
+
+@Inject
+Config config;
+
@Produces
@Singleton
@DefaultBean
-public KafkaClientFactory kafkaClientFactory(CamelKafkaRuntimeConfig
config) {
-if (kafkaConfig != null && !kafkaConfig.isEmpty() &&
config.kubernetesServiceBinding.mergeConfiguration) {
+public KafkaClientFactory kafkaClientFactory() {
+if (isQuarkusKafkaClientFactoryRequired()) {
return new QuarkusKafkaClientFactory(kafkaConfig);
}
return null;
}
+
+private boolean isQuarkusKafkaClientFactoryRequired() {
+Optional serviceBindingEnabled = config.getOptionalValue(
+"quarkus.kubernetes-service-binding.enabled",
+Boolean.class);
+return kafkaConfig != null
+&& !kafkaConfig.isEmpty()
+&&
camelKafkaRuntimeConfig.kubernetesServiceBinding.mergeConfiguration
+&& serviceBindingEnabled.isPresent()
+&& serviceBindingEnabled.get();
+}
}
[camel-quarkus] 07/10: Improve native support for org.apache.http.impl.client.BasicAuthCache
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 425fdfa3374d55256f1b71ee6c1c7cc04ae8bf65
Author: James Netherton
AuthorDate: Wed Sep 15 13:54:20 2021 +0100
Improve native support for org.apache.http.impl.client.BasicAuthCache
Fixes #3079
---
extensions-support/httpclient/runtime/pom.xml | 5
.../httpclient/graalvm}/BasicAuthCacheAlias.java | 2 +-
extensions/couchdb/runtime/pom.xml | 5
.../quarkus/component/http/it/HttpProducers.java | 28 ++
.../quarkus/component/http/it/HttpResource.java| 17 +
.../camel/quarkus/component/http/it/HttpTest.java | 12 ++
6 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/extensions-support/httpclient/runtime/pom.xml
b/extensions-support/httpclient/runtime/pom.xml
index 44c7271..6803b6e 100644
--- a/extensions-support/httpclient/runtime/pom.xml
+++ b/extensions-support/httpclient/runtime/pom.xml
@@ -63,6 +63,11 @@
+
+org.graalvm.nativeimage
+svm
+provided
+
diff --git
a/extensions/couchdb/runtime/src/main/java/org/apache/camel/quarkus/couchdb/BasicAuthCacheAlias.java
b/extensions-support/httpclient/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient/graalvm/BasicAuthCacheAlias.java
similarity index 97%
rename from
extensions/couchdb/runtime/src/main/java/org/apache/camel/quarkus/couchdb/BasicAuthCacheAlias.java
rename to
extensions-support/httpclient/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient/graalvm/BasicAuthCacheAlias.java
index 371c6d2..b040af5 100644
---
a/extensions/couchdb/runtime/src/main/java/org/apache/camel/quarkus/couchdb/BasicAuthCacheAlias.java
+++
b/extensions-support/httpclient/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient/graalvm/BasicAuthCacheAlias.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.couchdb;
+package org.apache.camel.quarkus.support.httpclient.graalvm;
import java.util.Map;
diff --git a/extensions/couchdb/runtime/pom.xml
b/extensions/couchdb/runtime/pom.xml
index 61f38de..ae91235 100644
--- a/extensions/couchdb/runtime/pom.xml
+++ b/extensions/couchdb/runtime/pom.xml
@@ -59,11 +59,6 @@
org.apache.camel
camel-couchdb
-
-org.graalvm.nativeimage
-svm
-provided
-
diff --git
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpProducers.java
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpProducers.java
index 53ad9fc..1cc7cda 100644
---
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpProducers.java
+++
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpProducers.java
@@ -19,6 +19,15 @@ package org.apache.camel.quarkus.component.http.it;
import javax.inject.Named;
import org.apache.camel.component.netty.ClientInitializerFactory;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.protocol.HttpContext;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;
@@ -58,4 +67,23 @@ public class HttpProducers {
return new DefaultAsyncHttpClient(config);
}
+
+@Named
+HttpContext basicAuthContext() {
+Integer port =
ConfigProvider.getConfig().getValue("quarkus.http.test-port", Integer.class);
+
+UsernamePasswordCredentials credentials = new
UsernamePasswordCredentials(USER_ADMIN, USER_ADMIN_PASSWORD);
+CredentialsProvider provider = new BasicCredentialsProvider();
+provider.setCredentials(AuthScope.ANY, credentials);
+
+BasicAuthCache authCache = new BasicAuthCache();
+BasicScheme basicAuth = new BasicScheme();
+authCache.put(new HttpHost("localhost", port), basicAuth);
+
+HttpClientContext context = HttpClientContext.create();
+context.setAuthCache(authCache);
+context.setCredentialsProvider(provider);
+
+return context;
+}
}
diff --git
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
[GitHub] [camel-quarkus] ppalaga merged pull request #3449: 2.2.x backports
ppalaga merged pull request #3449: URL: https://github.com/apache/camel-quarkus/pull/3449 -- 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-quarkus] 01/10: Remove false in the release profile
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 619bff3cd6b97147128c2f7a58bbd88412acb6e2
Author: Peter Palaga
AuthorDate: Tue Jan 11 17:38:22 2022 +0100
Remove false in the release profile
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2c98092..17571b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1027,7 +1027,6 @@
${cq.commit.message.prefix}
${project.version}
-false
