[GitHub] [camel-k-runtime] squakez commented on a change in pull request #761: deps: upgrade camel-quarkus to v2.6.0
squakez commented on a change in pull request #761: URL: https://github.com/apache/camel-k-runtime/pull/761#discussion_r772157213 ## File path: pom.xml ## @@ -382,6 +382,17 @@ + Review comment: Any reason why we are enabling the apache snapshot repo? -- 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] lburgazzoli commented on a change in pull request #761: deps: upgrade camel-quarkus to v2.6.0
lburgazzoli commented on a change in pull request #761: URL: https://github.com/apache/camel-k-runtime/pull/761#discussion_r772159675 ## File path: pom.xml ## @@ -382,6 +382,17 @@ + Review comment: This is the staging one (the name is wrong but it is temporary till ca gets released) About the real snapshot repo, I think we can remove it (I'll do that once moving the PR to ready for review) -- 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-website] branch asf-site updated (058d277 -> aa820e9)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard 058d277 Website updated to c42cc8163e891e9b4293acc29be231cf30f8fa70 discard b997448 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new d907d17 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new aa820e9 Website updated to d2e3677377cdb1273904478da5926db9c191f2ec 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 (058d277) \ N -- N -- N refs/heads/asf-site (aa820e9) 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 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: sitemap-camel-k.xml | 822 ++-- sitemap-camel-kafka-connector.xml | 2218 +-- sitemap-camel-kamelets.xml| 586 +-- sitemap-camel-karaf.xml | 84 +- sitemap-camel-quarkus.xml | 2078 +- sitemap-camel-spring-boot.xml | 62 +- sitemap-components.xml| 7884 ++--- sitemap-manual.xml| 384 +- 8 files changed, 7059 insertions(+), 7059 deletions(-)
[camel] branch main updated: Update camel-jbang.adoc
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 730319a Update camel-jbang.adoc 730319a is described below commit 730319ac65a7761aba1de49f4a7a592487165808 Author: Claus Ibsen AuthorDate: Mon Dec 20 10:12:54 2021 +0100 Update camel-jbang.adoc --- .../modules/ROOT/pages/camel-jbang.adoc| 38 -- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 410ec33..2d3ddd0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -26,6 +26,8 @@ jbang CamelJBang@apache/camel [command] All the commands support the `--help` and will display the appropriate help if that flag is provided. +However if you have installed CamelJBang with `jbang app install` then you can use `CamelJBang` instead of `jbang CamelJBang@apache/camel` + === Troubleshooting When using https://www.jbang.dev/[JBang] then JBang stores state in `~/.jbang` directory. @@ -72,7 +74,7 @@ Execute the following command to run this route: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run jms-amqp-10-sink-binding.yaml +CamelJBang run jms-amqp-10-sink-binding.yaml NOTE: it is necessary to have a AMQP 1.0 broker, such as Apache Artemis, running locally and listening on port 61616. Adjust the route accordingly if using a different address for the broker. @@ -83,28 +85,28 @@ You can run more than 1 file, for example to run two YAML files you can do: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run one.yaml two.yaml +CamelJBang run one.yaml two.yaml You can also mix different xref:dsl.adoc[DSLs] such as yaml and Java: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run one.yaml hello.java +CamelJBang run one.yaml hello.java You can also use wildcards (i.e. `*`) to match multiple files, such as running all the yaml files: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run *.yaml +CamelJBang run *.yaml Or you can run all files starting with foo* [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run foo* +CamelJBang run foo* TIP: The run goal can also detect files that are `properties`. @@ -116,7 +118,7 @@ using the `--reload` options as shown: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run jms-amqp-10-sink-binding.yaml --reload +CamelJBang run jms-amqp-10-sink-binding.yaml --reload Then while the Camel application is running, you can update the YAML route and update when saving. @@ -132,7 +134,7 @@ For example to run one of the Camel K examples you can do: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run run github:apache:camel-k:examples/languages/routes.yaml +CamelJBang run run github:apache:camel-k:examples/languages/routes.yaml === Running local Kamelets @@ -141,7 +143,7 @@ You can also use Camel JBang to try local Kamelets, without the need to publish [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run --local-kamelet-dir=/path/to/local/kamelets earthquake.yaml +CamelJBang run --local-kamelet-dir=/path/to/local/kamelets earthquake.yaml === Running Camel K integrations or bindings @@ -177,7 +179,7 @@ Can be run with CamelJBang: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run joke.yaml +CamelJBang run joke.yaml === Using platform-http component @@ -198,7 +200,7 @@ Can be run with [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel run server.yaml +CamelJBang run server.yaml And you can call the HTTP service with: @@ -215,7 +217,7 @@ You can debug both CamelJBang@apache/camel and your integration scripts by makin [source,bash] -jbang --debug CamelJBang@apache/camel run /path/to/integration.java +CamelJBang --debug run /path/to/integration.java [jbang] Building jar... Listening for transport dt_socket at address: 4004 @@ -228,21 +230,21 @@ You can use the CLI to search for kamelets, components, languages and miscellane [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel search --help +CamelJBang search --help For example, to search for kamelets named `jms`, you can use: [source,bash] -jbang -Dcamel.jbang.version=3.14.0 CamelJBang@apache/camel search kamelets --search-term=jms +CamelJBang search kamelets --search-term=jms To list all the kamelets, just run the command without any search term:
[camel] branch main updated: camel-nitrite - should not depende on camel-core-engine directly but use camel-support
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 586cce5 camel-nitrite - should not depende on camel-core-engine directly but use camel-support 586cce5 is described below commit 586cce590208db4789d0f70dfb427cfd19c25849 Author: Claus Ibsen AuthorDate: Mon Dec 20 10:38:19 2021 +0100 camel-nitrite - should not depende on camel-core-engine directly but use camel-support --- components/camel-nitrite/pom.xml | 3 ++- .../component/nitrite/operation/AbstractPayloadAwareOperation.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/camel-nitrite/pom.xml b/components/camel-nitrite/pom.xml index 4f9bed6..22c3902 100644 --- a/components/camel-nitrite/pom.xml +++ b/components/camel-nitrite/pom.xml @@ -33,9 +33,10 @@ Camel Nitrite component + org.apache.camel - camel-core-engine + camel-support diff --git a/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/operation/AbstractPayloadAwareOperation.java b/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/operation/AbstractPayloadAwareOperation.java index b4076dc..c944e2d 100644 --- a/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/operation/AbstractPayloadAwareOperation.java +++ b/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/operation/AbstractPayloadAwareOperation.java @@ -18,9 +18,9 @@ package org.apache.camel.component.nitrite.operation; import org.apache.camel.Exchange; import org.apache.camel.Expression; -import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.component.nitrite.AbstractNitriteOperation; import org.apache.camel.component.nitrite.NitriteEndpoint; +import org.apache.camel.support.builder.ExpressionBuilder; import org.dizitart.no2.Document; public abstract class AbstractPayloadAwareOperation extends AbstractNitriteOperation {
[camel] branch main updated: Upgrade stringtemplate
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 d5c41bc Upgrade stringtemplate d5c41bc is described below commit d5c41bc7bc4b6024c926f79121d6ff6ce7ebcaa3 Author: Claus Ibsen AuthorDate: Mon Dec 20 10:47:50 2021 +0100 Upgrade stringtemplate --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index ce764f8..ce02f38 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -531,7 +531,7 @@ 2.7.0 1.0.1 1.19 -4.3 +4.3.1 27.1-jre 1.0.51 1.6.2 diff --git a/parent/pom.xml b/parent/pom.xml index 3c2a67a..30e78a4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -526,7 +526,7 @@ 27.1-jre 1.1.16 1.0.1 -4.3 +4.3.1 1.2.1 1.0.0 1.16.2
[camel-examples] 02/02: CAMEL-17355: camel-examples - Reduce number of cdi examples
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-examples.git commit 49b955a137912462f8006b14968d0ad7dde14b91 Author: Claus Ibsen AuthorDate: Mon Dec 20 11:06:52 2021 +0100 CAMEL-17355: camel-examples - Reduce number of cdi examples --- examples/README.adoc | 23 +-- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/examples/README.adoc b/examples/README.adoc index f80f23d..ab55954 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,7 +11,7 @@ View the individual example READMEs for details. == Examples // examples: START -Number of Examples: 97 (0 deprecated) +Number of Examples: 87 (0 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -33,8 +33,6 @@ Number of Examples: 97 (0 deprecated) | link:cdi/README.adoc[CDI] (cdi) | Beginner | An example showing how to work with Camel and CDI for dependency injection -| link:cdi-properties/README.adoc[CDI Properties] (cdi-properties) | Beginner | DeltaSpike configuration properties CDI example - | link:cdi-xml/README.adoc[CDI Camel XML] (cdi-xml) | Beginner | CDI and Camel XML example | link:console/README.adoc[Console] (console) | Beginner | An example that reads input from the console @@ -104,16 +102,10 @@ Number of Examples: 97 (0 deprecated) | link:cassandra-kubernetes/README.adoc[Cassandra Kubernetes] (cassandra-kubernetes) | Cloud | An example with Camel and Cassandra running on Kubernetes -| link:cdi-kubernetes/README.adoc[CDI Kubernetes] (cdi-kubernetes) | Cloud | An example running Camel CDI on Kubernetes - -| link:cdi-minio/README.adoc[CDI Minio] (cdi-minio) | Cloud | Minio CDI example - | link:hazelcast-kubernetes/README.adoc[Hazelcast Kubernetes] (hazelcast-kubernetes) | Cloud | An example with Camel and Hazelcast running on Kubernetes | link:main-endpointdsl-aws2/README.adoc[Main Endpointdsl Aws2] (main-endpointdsl-aws2) | Cloud | An example for showing standalone Camel with multiple AWS2 components -| link:cdi-cassandraql/README.adoc[CDI Cassandra] (cdi-cassandraql) | Database | Cassandraql CDI example - | link:debezium/README.adoc[Debezium] (debezium) | Database | An example for Debezium Component | link:debezium-eventhubs-blob/README.adoc[Debezium Eventhubs Blob] (debezium-eventhubs-blob) | Database | An example for Debezium Component with Azure Event Hubs and Azure Storage Blob @@ -148,23 +140,16 @@ Number of Examples: 97 (0 deprecated) route dynamically based on the flow of messages -| link:widget-gadget-cdi/README.adoc[Widget Gadget CDI] (widget-gadget-cdi) | EIP | The widget and gadget example from the EIP book - | link:widget-gadget-java/README.adoc[Widget Gadget Java] (widget-gadget-java) | EIP | The widget and gadget example from the EIP book | link:widget-gadget-xml/README.adoc[Widget Gadget XML] (widget-gadget-xml) | EIP | The widget and gadget example from the EIP book | link:fhir/README.adoc[FHIR] (fhir) | Health Care | An example running Camel FHIR using Camel CDI -| link:transformer-cdi/README.adoc[Transformer CDI] (transformer-cdi) | Input/Output Type Contract | An example demonstrating declarative transformation along data type declaration using Java DSL and CDI - - | link:transformer-demo/README.adoc[Transformer and Validator Spring XML] (transformer-demo) | Input/Output Type Contract | An example demonstrating declarative transformation and validation along data type declaration using Spring DSL -| link:cdi-metrics/README.adoc[CDI Metrics] (cdi-metrics) | Management and Monitoring | Dropwizard Metrics CDI example - | link:flight-recorder/README.adoc[Flight Recorder] (flight-recorder) | Management and Monitoring | Diagnosing Camel with Java Flight Recorder | link:jmx/README.adoc[JMX] (jmx) | Management and Monitoring | An example showing how to work with Camel and JMX @@ -195,12 +180,6 @@ Number of Examples: 97 (0 deprecated) | link:reactive-executor-vertx/README.adoc[Reactive Executor Vertx] (reactive-executor-vertx) | Reactive | An example for showing using VertX as reactive executor with standalone Camel -| link:cdi-rest-servlet/README.adoc[CDI Rest] (cdi-rest-servlet) | Rest | Rest DSL using Servlet with CDI example - -| link:openapi-cdi/README.adoc[OpenApi CDI] (openapi-cdi) | Rest | An example using REST DSL and OpenApi Java with CDI - -| link:swagger-cdi/README.adoc[Swagger CDI] (swagger-cdi) | Rest | An example using REST DSL and Swagger Java with CDI - | link:spring-security/README.adoc[Spring Security] (spring-security) | Security | An example showing how to work with Camel and Spring Security | link:salesforce-consumer/README.adoc[Salesforce Consumer] (salesforce-consumer) | Social | An example that uses Salesforce Rest Streaming API
[camel-examples] branch main updated (a4a939c -> 49b955a)
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-examples.git. from a4a939c Prepare for next release new 7a1d992 CAMEL-17355: camel-examples - Reduce number of cdi examples new 49b955a CAMEL-17355: camel-examples - Reduce number of cdi examples The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: examples/README.adoc | 23 +-- examples/cdi-cassandraql/README.adoc | 166 examples/cdi-cassandraql/pom.xml | 135 - .../camel/example/cdi/cassandraql/Application.java | 71 --- .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../META-INF/apache-deltaspike.properties | 21 -- .../src/main/resources/META-INF/beans.xml | 20 -- .../src/main/resources/log4j2.properties | 23 --- examples/cdi-kubernetes/README.adoc| 90 - examples/cdi-kubernetes/pom.xml| 118 .../camel/example/cdi/kubernetes/Application.java | 99 -- .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../src/main/resources/META-INF/beans.xml | 20 -- .../src/main/resources/application.properties | 24 --- .../src/main/resources/log4j2.properties | 23 --- examples/cdi-metrics/README.adoc | 93 - examples/cdi-metrics/pom.xml | 156 --- .../camel/example/cdi/metrics/Application.java | 121 .../example/cdi/metrics/UnreliableService.java | 37 .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../src/main/resources/META-INF/beans.xml | 20 -- .../src/main/resources/log4j2.properties | 23 --- .../camel/example/cdi/metrics/CdiMetricsTest.java | 72 --- examples/cdi-minio/README.adoc | 45 - examples/cdi-minio/pom.xml | 104 -- .../camel/example/cdi/minio/Application.java | 60 -- .../camel/example/cdi/minio/MinioExampleUtils.java | 51 - .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../src/main/resources/META-INF/beans.xml | 20 -- .../cdi-minio/src/main/resources/log4j2.properties | 22 --- .../src/main/resources/minio_key.properties| 20 -- examples/cdi-properties/README.adoc| 74 --- examples/cdi-properties/pom.xml| 149 -- .../camel/example/cdi/properties/Application.java | 75 .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../META-INF/apache-deltaspike.properties | 19 -- .../src/main/resources/META-INF/beans.xml | 26 --- .../src/main/resources/log4j2.properties | 23 --- .../example/cdi/properties/CdiPropertiesTest.java | 71 --- examples/cdi-rest-servlet/README.adoc | 98 -- examples/cdi-rest-servlet/pom.xml | 214 - .../example/cdi/rest/servlet/Application.java | 57 -- .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../src/main/resources/log4j2.properties | 23 --- .../src/main/webapp/WEB-INF/beans.xml | 26 --- .../src/main/webapp/WEB-INF/web.xml| 44 - .../cdi/rest/servlet/CdiRestServletTest.java | 64 -- examples/openapi-cdi/README.adoc | 58 -- examples/openapi-cdi/pom.xml | 136 - .../java/org/apache/camel/example/cdi/User.java| 47 - .../apache/camel/example/cdi/UserRouteBuilder.java | 70 --- .../org/apache/camel/example/cdi/UserService.java | 79 .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../src/main/resources/META-INF/beans.xml | 20 -- .../src/main/resources/log4j2.properties | 23 --- examples/pom.xml | 10 - examples/swagger-cdi/README.adoc | 67 --- examples/swagger-cdi/pom.xml | 142 -- .../java/org/apache/camel/example/cdi/User.java
[camel] branch regen_bot updated (3429334 -> 730319a)
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 3429334 Update log 4js version to 2.17 (#6560) add 730319a Update camel-jbang.adoc No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-jbang.adoc| 38 -- 1 file changed, 20 insertions(+), 18 deletions(-)
[GitHub] [camel-kamelets] neel24 opened a new pull request #642: Update Log4j to 2.17.0 to address CVE-2021-45105
neel24 opened a new pull request #642: URL: https://github.com/apache/camel-kamelets/pull/642 Updating Log4j version to 2.17.0 because of CVE-2021-45105 vulnerability. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-45105 -- 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: Update Log4j version to 2.17.0
This is an automated email from the ASF dual-hosted git repository. lburgazzoli 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 c5c1b4c Update Log4j version to 2.17.0 c5c1b4c is described below commit c5c1b4cc34ed3ed6a0b58fddf6532fdaef198b9a Author: Neel Gopaul AuthorDate: Mon Dec 20 14:15:52 2021 +0400 Update Log4j version to 2.17.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffcbb22..be3f578 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 3.12.0 1.7.30 -2.13.3 +2.17.0 2.12.5 5.10.1 2.11.0
[GitHub] [camel-kamelets] lburgazzoli merged pull request #642: Update Log4j to 2.17.0 to address CVE-2021-45105
lburgazzoli merged pull request #642: URL: https://github.com/apache/camel-kamelets/pull/642 -- 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] lburgazzoli commented on pull request #642: Update Log4j to 2.17.0 to address CVE-2021-45105
lburgazzoli commented on pull request #642: URL: https://github.com/apache/camel-kamelets/pull/642#issuecomment-997798636 thx -- 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 regen_bot updated (09128c8 -> c5c1b4c)
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 09128c8 Fixed update-kamelets.xml ant file add c5c1b4c Update Log4j version to 2.17.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot updated (586cce5 -> d5c41bc)
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 586cce5 camel-nitrite - should not depende on camel-core-engine directly but use camel-support add d5c41bc Upgrade stringtemplate No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (730319a -> 586cce5)
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 730319a Update camel-jbang.adoc add 586cce5 camel-nitrite - should not depende on camel-core-engine directly but use camel-support No new revisions were added by this update. Summary of changes: components/camel-nitrite/pom.xml | 3 ++- .../component/nitrite/operation/AbstractPayloadAwareOperation.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
[GitHub] [camel] Croway opened a new pull request #6567: CAMEL-17352: Add plain option
Croway opened a new pull request #6567: URL: https://github.com/apache/camel/pull/6567 -- 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] Croway commented on pull request #6567: CAMEL-17352: Add plain option
Croway commented on pull request #6567: URL: https://github.com/apache/camel/pull/6567#issuecomment-997854024 Seems like camel-log cannot be tested due to cyclic references, like `org.apache.camel:camel-management:3.15.0-SNAPSHOT --> org.apache.camel:camel-log:3.15.0-SNAPSHOT --> org.apache.camel:camel-test-junit5:3.15.0-SNAPSHOT`, is there another way to test it? I'd like to use `CamelTestSupport` features like other components. -- 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: Regen
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 170b972 Regen 170b972 is described below commit 170b972bdd933f2cbb7ce34ca9cbb07daedd9b5c Author: Claus Ibsen AuthorDate: Mon Dec 20 13:04:54 2021 +0100 Regen --- camel-dependencies/pom.xml | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e3f4964..a9c7bb4 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> 4.0.0 org.apache @@ -87,18 +88,18 @@ 0.9.5.5 2.9.2 2.6.5 - - + + false ${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version} $${replace;{local-packages};;;\;} false ${camel.osgi.import.pkg} - - + + version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))" [$(version;==;$(@)),$(version;+;$(@))) - + org.apache.camel.*;${camel.osgi.import.camel.version}, ${camel.osgi.import.before.defaults}, ${camel.osgi.import.defaults}, @@ -107,8 +108,8 @@ version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))" ${project.build.outputDirectory}/META-INF/MANIFEST.MF !* - - + + ${project.groupId}.${project.artifactId} version=${project.version} -XX:+ExitOnOutOfMemoryError @@ -163,9 +164,9 @@ [3.4,4.0) 3.3.1 3.3.1 - + once - + 2.1.4 8.0.27 1.7.1.Final
[GitHub] [camel] davsclaus commented on pull request #6567: CAMEL-17352: Add plain option
davsclaus commented on pull request #6567: URL: https://github.com/apache/camel/pull/6567#issuecomment-997868399 You put tests inside core/camel-core for regular tests, and jmx tests in camel-management -- 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] Croway commented on pull request #6567: CAMEL-17352: Add plain option
Croway commented on pull request #6567: URL: https://github.com/apache/camel/pull/6567#issuecomment-997883993 > You put tests inside core/camel-core for regular tests, and jmx tests in camel-management I see, thanks for advice! -- 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
svn commit: r51632 - in /dev/camel/camel-kamelets: camel-kamelets-parent-0.6.0-source-release.zip camel-kamelets-parent-0.6.0-source-release.zip.asc camel-kamelets-parent-0.6.0-source-release.zip.sha5
Author: acosentino Date: Mon Dec 20 13:13:55 2021 New Revision: 51632 Log: Camel-Kamelets 0.6.0 import. Added: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip (with props) dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.asc (with props) dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.sha512 Added: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip -- svn:mime-type = application/zip Added: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.sha512 == --- dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.sha512 (added) +++ dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.sha512 Mon Dec 20 13:13:55 2021 @@ -0,0 +1 @@ +0a49090ccbad09eb81dbb6e9d25afbab669dca25ef3275a47025d81cf3baca93fd8cec596f8a406bbdd15165c40bf1d7cd7530c23f239e34cbf8aece2a4dc029 camel-kamelets-parent-0.6.0-source-release.zip
svn commit: r51634 - /dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.asc
Author: acosentino Date: Mon Dec 20 13:16:33 2021 New Revision: 51634 Log: Wrong import Removed: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.asc
svn commit: r51633 - /dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip
Author: acosentino Date: Mon Dec 20 13:15:56 2021 New Revision: 51633 Log: Wrong import Removed: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip
svn commit: r51635 - /dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.sha512
Author: acosentino Date: Mon Dec 20 13:16:41 2021 New Revision: 51635 Log: Wrong import Removed: dev/camel/camel-kamelets/camel-kamelets-parent-0.6.0-source-release.zip.sha512
svn commit: r51636 - in /dev/camel/camel-kamelets/0.6.0: ./ camel-kamelets-parent-0.6.0-source-release.zip camel-kamelets-parent-0.6.0-source-release.zip.asc camel-kamelets-parent-0.6.0-source-release
Author: acosentino Date: Mon Dec 20 13:17:16 2021 New Revision: 51636 Log: Camel-Kamelets 0.6.0 import. Added: dev/camel/camel-kamelets/0.6.0/ dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip (with props) dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.asc (with props) dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.sha512 Added: dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip -- svn:mime-type = application/zip Added: dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.sha512 == --- dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.sha512 (added) +++ dev/camel/camel-kamelets/0.6.0/camel-kamelets-parent-0.6.0-source-release.zip.sha512 Mon Dec 20 13:17:16 2021 @@ -0,0 +1 @@ +0a49090ccbad09eb81dbb6e9d25afbab669dca25ef3275a47025d81cf3baca93fd8cec596f8a406bbdd15165c40bf1d7cd7530c23f239e34cbf8aece2a4dc029 camel-kamelets-parent-0.6.0-source-release.zip
[camel] branch main updated (d5c41bc -> e1e234e)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from d5c41bc Upgrade stringtemplate new 0de88e9 CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage new b8dfa2f CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage new e1e234e Regen 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: .../camel/catalog/archetypes/archetype-catalog.xml | 16 .../functions/GoogleCloudFunctionsClientFactory.java | 7 +-- 2 files changed, 13 insertions(+), 10 deletions(-)
[camel] 03/03: Regen
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 commit e1e234ece629e053ab8449e7d44ff173c1f93f2e Author: Andrea Cosentino AuthorDate: Mon Dec 20 14:25:55 2021 +0100 Regen --- .../camel/catalog/archetypes/archetype-catalog.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml index e37d8e7..08b1427 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml @@ -4,49 +4,49 @@ org.apache.camel.archetypes camel-archetype-api-component - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel component that wraps one or more API proxies. org.apache.camel.archetypes camel-archetype-cdi - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel project using CDI. org.apache.camel.archetypes camel-archetype-component - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel component. org.apache.camel.archetypes camel-archetype-dataformat - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel data format. org.apache.camel.archetypes camel-archetype-endpointdsl - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel project using Endpoint DSL. org.apache.camel.archetypes camel-archetype-java - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel project using Java DSL. org.apache.camel.archetypes camel-archetype-main - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel project using standalone Camel Main. org.apache.camel.archetypes camel-archetype-spring - 3.15.0-SNAPSHOT + 3.14.0-SNAPSHOT Creates a new Camel project with added Spring DSL support.
[camel] 01/03: CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage
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 commit 0de88e913b3593e3297f7c4ccc002f465d6c0298 Author: Andrea Cosentino AuthorDate: Mon Dec 20 14:21:57 2021 +0100 CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage --- .../google/functions/GoogleCloudFunctionsClientFactory.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java b/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java index 354c543..32ad7c2 100644 --- a/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java +++ b/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java @@ -17,6 +17,7 @@ package org.apache.camel.component.google.functions; import java.io.FileInputStream; +import java.io.InputStream; import com.google.api.gax.core.FixedCredentialsProvider; import com.google.auth.Credentials; @@ -25,6 +26,7 @@ import com.google.cloud.functions.v1.CloudFunctionsServiceClient; import com.google.cloud.functions.v1.CloudFunctionsServiceSettings; import com.google.common.base.Strings; import org.apache.camel.CamelContext; +import org.apache.camel.support.ResourceHelper; public final class GoogleCloudFunctionsClientFactory { /** @@ -39,8 +41,10 @@ public final class GoogleCloudFunctionsClientFactory { throws Exception { CloudFunctionsServiceClient cloudFunctionsClient = null; if (!Strings.isNullOrEmpty(configuration.getServiceAccountKey())) { +InputStream resolveMandatoryResourceAsInputStream += ResourceHelper.resolveMandatoryResourceAsInputStream(context, configuration.getServiceAccountKey()); Credentials myCredentials = ServiceAccountCredentials -.fromStream(new FileInputStream(configuration.getServiceAccountKey())); +.fromStream(resolveMandatoryResourceAsInputStream); CloudFunctionsServiceSettings settings = CloudFunctionsServiceSettings.newBuilder() .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials)).build(); cloudFunctionsClient = CloudFunctionsServiceClient.create(settings);
[camel] 02/03: CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage
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 commit b8dfa2f2e2aef134f794ef1cdb4ac884975010dc Author: Andrea Cosentino AuthorDate: Mon Dec 20 14:23:44 2021 +0100 CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage --- .../component/google/functions/GoogleCloudFunctionsClientFactory.java| 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java b/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java index 32ad7c2..02b7796 100644 --- a/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java +++ b/components/camel-google/camel-google-functions/src/main/java/org/apache/camel/component/google/functions/GoogleCloudFunctionsClientFactory.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.google.functions; -import java.io.FileInputStream; import java.io.InputStream; import com.google.api.gax.core.FixedCredentialsProvider;
[GitHub] [camel-karavan] davsclaus opened a new issue #150: Upgrade to camel-kamelets 0.6.0
davsclaus opened a new issue #150: URL: https://github.com/apache/camel-karavan/issues/150 When its released later this week -- 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-spring-boot] branch main updated: Remove cruft
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 35ff4eb Remove cruft 35ff4eb is described below commit 35ff4eb552eb0bc94c871b9fc88f8128de77cd58 Author: Claus Ibsen AuthorDate: Mon Dec 20 14:37:16 2021 +0100 Remove cruft --- tooling/camel-starter-parent/pom.xml | 10 -- 1 file changed, 10 deletions(-) diff --git a/tooling/camel-starter-parent/pom.xml b/tooling/camel-starter-parent/pom.xml index 250f9e2..dbea045 100644 --- a/tooling/camel-starter-parent/pom.xml +++ b/tooling/camel-starter-parent/pom.xml @@ -32,16 +32,6 @@ Camel SB Tooling :: Starter Parent - - - - - - - - - - org.apache.camel.springboot
[camel-spring-boot] branch main updated: camel-huaweicloud-obs: log4j-core is not needed only the log4j-api
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 4bcb49e camel-huaweicloud-obs: log4j-core is not needed only the log4j-api 4bcb49e is described below commit 4bcb49e49661d340bd98c865b35a1522b2f7270a Author: Claus Ibsen AuthorDate: Mon Dec 20 14:39:43 2021 +0100 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api --- components-starter/camel-huaweicloud-obs-starter/pom.xml | 8 1 file changed, 8 deletions(-) diff --git a/components-starter/camel-huaweicloud-obs-starter/pom.xml b/components-starter/camel-huaweicloud-obs-starter/pom.xml index 4c34d47..1c43dae 100644 --- a/components-starter/camel-huaweicloud-obs-starter/pom.xml +++ b/components-starter/camel-huaweicloud-obs-starter/pom.xml @@ -37,14 +37,6 @@ org.apache.camel camel-huaweicloud-obs ${camel-version} - - - - org.apache.logging.log4j - log4j-core - - -
[camel] branch main updated: camel-huaweicloud-obs: log4j-core is not needed only the log4j-api
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 23d4660 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api 23d4660 is described below commit 23d466090fa72100cfc8a70b2ca4dccf4ae6defd Author: Claus Ibsen AuthorDate: Mon Dec 20 14:37:51 2021 +0100 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api --- components/camel-huawei/camel-huaweicloud-obs/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/components/camel-huawei/camel-huaweicloud-obs/pom.xml b/components/camel-huawei/camel-huaweicloud-obs/pom.xml index 33326df..5f95e85 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-obs/pom.xml @@ -51,6 +51,12 @@ com.huaweicloud esdk-obs-java ${huaweicloud-obs-version} + + + org.apache.logging.log4j + log4j-core + +
[camel-karaf] branch main updated: Upgrade Karaf to version 4.3.4
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-karaf.git The following commit(s) were added to refs/heads/main by this push: new 491c8e1 Upgrade Karaf to version 4.3.4 491c8e1 is described below commit 491c8e166dcbdbfa003983c4c400c3d5a873255e Author: Andrea Cosentino AuthorDate: Mon Dec 20 14:33:21 2021 +0100 Upgrade Karaf to version 4.3.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a78193..24fa48c 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,7 @@ 4.11_1 1.1.3_2 2.8.1_1 -4.3.3 +4.3.4 2.3.0_3 2.13.0 8.12.38_1
[camel] branch camel-3.14.x updated: camel-huaweicloud-obs: log4j-core is not needed only the log4j-api
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 5517ad1 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api 5517ad1 is described below commit 5517ad115cc35561b2c5afde65e354934fbe9fce Author: Claus Ibsen AuthorDate: Mon Dec 20 14:37:51 2021 +0100 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api --- components/camel-huawei/camel-huaweicloud-obs/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/components/camel-huawei/camel-huaweicloud-obs/pom.xml b/components/camel-huawei/camel-huaweicloud-obs/pom.xml index 45a2e36..ffb2d25 100644 --- a/components/camel-huawei/camel-huaweicloud-obs/pom.xml +++ b/components/camel-huawei/camel-huaweicloud-obs/pom.xml @@ -51,6 +51,12 @@ com.huaweicloud esdk-obs-java ${huaweicloud-obs-version} + + + org.apache.logging.log4j + log4j-core + +
[camel-spring-boot] 02/02: camel-huaweicloud-obs: log4j-core is not needed only the log4j-api
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit a38f2a5cb5ac18bd649b5033357991129e277683 Author: Claus Ibsen AuthorDate: Mon Dec 20 14:39:43 2021 +0100 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api --- components-starter/camel-huaweicloud-obs-starter/pom.xml | 8 1 file changed, 8 deletions(-) diff --git a/components-starter/camel-huaweicloud-obs-starter/pom.xml b/components-starter/camel-huaweicloud-obs-starter/pom.xml index ef05704..c2a0053 100644 --- a/components-starter/camel-huaweicloud-obs-starter/pom.xml +++ b/components-starter/camel-huaweicloud-obs-starter/pom.xml @@ -37,14 +37,6 @@ org.apache.camel camel-huaweicloud-obs ${camel-version} - - - - org.apache.logging.log4j - log4j-core - - -
[camel-spring-boot] branch camel-spring-boot-3.14.x updated (98ba1c5 -> a38f2a5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 98ba1c5 Set documentation version to 3.14.x new c23bcca Remove cruft new a38f2a5 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: components-starter/camel-huaweicloud-obs-starter/pom.xml | 8 tooling/camel-starter-parent/pom.xml | 10 -- 2 files changed, 18 deletions(-)
[camel-spring-boot] 01/02: Remove cruft
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit c23bcca7b9bb35401f5a49280f55f8b741229db7 Author: Claus Ibsen AuthorDate: Mon Dec 20 14:37:16 2021 +0100 Remove cruft --- tooling/camel-starter-parent/pom.xml | 10 -- 1 file changed, 10 deletions(-) diff --git a/tooling/camel-starter-parent/pom.xml b/tooling/camel-starter-parent/pom.xml index 360c01c..c61f78f 100644 --- a/tooling/camel-starter-parent/pom.xml +++ b/tooling/camel-starter-parent/pom.xml @@ -32,16 +32,6 @@ Camel SB Tooling :: Starter Parent - - - - - - - - - - org.apache.camel.springboot
[camel] branch main updated: Use Azurite 3.15.0 image for test-infra module
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 be1045c Use Azurite 3.15.0 image for test-infra module be1045c is described below commit be1045ca02b13122154c7fb8b22415889c13955d Author: Andrea Cosentino AuthorDate: Mon Dec 20 14:57:24 2021 +0100 Use Azurite 3.15.0 image for test-infra module --- .../apache/camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java index 5c3ca5e..5dfb759 100644 --- a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java +++ b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java @@ -26,7 +26,7 @@ public class AzuriteContainer extends GenericContainer { public static final String DEFAULT_ACCOUNT_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="; -public static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.14.3"; +public static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.15.0"; public AzuriteContainer() { this(IMAGE_NAME);
[GitHub] [camel-performance-tests] oscerd merged pull request #73: Add camel-jfr to timer-http
oscerd merged pull request #73: URL: https://github.com/apache/camel-performance-tests/pull/73 -- 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-performance-tests] oscerd opened a new issue #74: Update to camel-kamelets 0.6.0
oscerd opened a new issue #74: URL: https://github.com/apache/camel-performance-tests/issues/74 When it will be available. -- 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-performance-tests] branch main updated: Add camel-jfr to timer-http
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-performance-tests.git The following commit(s) were added to refs/heads/main by this push: new d604348 Add camel-jfr to timer-http d604348 is described below commit d604348dccb8069d50651533eccedefaf62017c3 Author: Federico Mariani AuthorDate: Wed Dec 1 14:25:55 2021 +0100 Add camel-jfr to timer-http --- profiling/timer-http/pom.xml | 4 profiling/timer-http/src/main/resources/application.properties | 5 + 2 files changed, 9 insertions(+) diff --git a/profiling/timer-http/pom.xml b/profiling/timer-http/pom.xml index 3c57513..5d9010a 100644 --- a/profiling/timer-http/pom.xml +++ b/profiling/timer-http/pom.xml @@ -64,6 +64,10 @@ org.apache.camel +camel-jfr + + +org.apache.camel camel-http diff --git a/profiling/timer-http/src/main/resources/application.properties b/profiling/timer-http/src/main/resources/application.properties index f106b44..02e164e 100644 --- a/profiling/timer-http/src/main/resources/application.properties +++ b/profiling/timer-http/src/main/resources/application.properties @@ -45,5 +45,10 @@ camel.component.http.copy-headers = false # run for about 2 minutes camel.main.duration-max-seconds = 130 +# turn on java flight recorder +camel.main.startup-recorder = jfr +camel.main.startup-recorder-profile = profile +camel.main.startup-recorder-recording = true + # properties used in the route myPeriod = 1
[GitHub] [camel] github-actions[bot] opened a new pull request #6568: Generated sources regen
github-actions[bot] opened a new pull request #6568: URL: https://github.com/apache/camel/pull/6568 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
[camel-kamelets] branch main updated: Upgrade Classgraph to version 4.8.138
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 7f8c827 Upgrade Classgraph to version 4.8.138 7f8c827 is described below commit 7f8c82791e02754b467e7450760aaba8053ed8f5 Author: Andrea Cosentino AuthorDate: Mon Dec 20 15:16:05 2021 +0100 Upgrade Classgraph to version 4.8.138 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be3f578..cfff211 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 5.10.1 2.11.0 5.8.1 -4.8.137 +4.8.138
[camel] branch regen_bot updated (d5c41bc -> 517db93)
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 d5c41bc Upgrade stringtemplate add 0de88e9 CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage add b8dfa2f CAMEL-17351 - Camel Google Functions: Make it possible to configure service account key file as we do in Pubsub and Storage add e1e234e Regen add 517db93 Regen for commit e1e234ece629e053ab8449e7d44ff173c1f93f2e No new revisions were added by this update. Summary of changes: .../google/functions/GoogleCloudFunctionsClientFactory.java| 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
[GitHub] [camel-kamelets] oscerd commented on issue #79: Organizing kamelets in sub folders or something else when we get a lot of kamelets
oscerd commented on issue #79: URL: https://github.com/apache/camel-kamelets/issues/79#issuecomment-997964172 Now they are in kamelets 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] oscerd merged pull request #6568: Generated sources regen
oscerd merged pull request #6568: URL: https://github.com/apache/camel/pull/6568 -- 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 regen_bot updated (c5c1b4c -> 7f8c827)
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 c5c1b4c Update Log4j version to 2.17.0 add 7f8c827 Upgrade Classgraph to version 4.8.138 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel-kamelets] oscerd closed issue #397: Add Pulsar sink Kamelet
oscerd closed issue #397: URL: https://github.com/apache/camel-kamelets/issues/397 -- 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 #397: Add Pulsar sink Kamelet
oscerd commented on issue #397: URL: https://github.com/apache/camel-kamelets/issues/397#issuecomment-997964800 -- 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 e1e234ece629e053ab8449e7d44ff173c1f93f2e
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 ae19602 Regen for commit e1e234ece629e053ab8449e7d44ff173c1f93f2e ae19602 is described below commit ae19602689ae3fbc730d55664da7883a1da7a7e2 Author: oscerd AuthorDate: Mon Dec 20 14:16:07 2021 + Regen for commit e1e234ece629e053ab8449e7d44ff173c1f93f2e Signed-off-by: GitHub --- .../camel/catalog/archetypes/archetype-catalog.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml index 08b1427..e37d8e7 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/archetypes/archetype-catalog.xml @@ -4,49 +4,49 @@ org.apache.camel.archetypes camel-archetype-api-component - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel component that wraps one or more API proxies. org.apache.camel.archetypes camel-archetype-cdi - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel project using CDI. org.apache.camel.archetypes camel-archetype-component - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel component. org.apache.camel.archetypes camel-archetype-dataformat - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel data format. org.apache.camel.archetypes camel-archetype-endpointdsl - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel project using Endpoint DSL. org.apache.camel.archetypes camel-archetype-java - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel project using Java DSL. org.apache.camel.archetypes camel-archetype-main - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel project using standalone Camel Main. org.apache.camel.archetypes camel-archetype-spring - 3.14.0-SNAPSHOT + 3.15.0-SNAPSHOT Creates a new Camel project with added Spring DSL support.
[GitHub] [camel-kamelets] davsclaus commented on issue #79: Organizing kamelets in sub folders or something else when we get a lot of kamelets
davsclaus commented on issue #79: URL: https://github.com/apache/camel-kamelets/issues/79#issuecomment-997972238 Yeah lets close this for now -- 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] davsclaus closed issue #79: Organizing kamelets in sub folders or something else when we get a lot of kamelets
davsclaus closed issue #79: URL: https://github.com/apache/camel-kamelets/issues/79 -- 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] github-actions[bot] opened a new pull request #6569: Generated sources regen
github-actions[bot] opened a new pull request #6569: URL: https://github.com/apache/camel/pull/6569 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
[camel] branch regen_bot updated (517db93 -> 25c8a0c)
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 517db93 Regen for commit e1e234ece629e053ab8449e7d44ff173c1f93f2e add 23d4660 camel-huaweicloud-obs: log4j-core is not needed only the log4j-api add 25c8a0c Regen for commit 23d466090fa72100cfc8a70b2ca4dccf4ae6defd 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 (517db93) \ N -- N -- N refs/heads/regen_bot (25c8a0c) 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: components/camel-huawei/camel-huaweicloud-obs/pom.xml | 6 ++ 1 file changed, 6 insertions(+)
[GitHub] [camel] oscerd merged pull request #6569: Generated sources regen
oscerd merged pull request #6569: URL: https://github.com/apache/camel/pull/6569 -- 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 created (now ae19602)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. at ae19602 Regen for commit e1e234ece629e053ab8449e7d44ff173c1f93f2e No new revisions were added by this update.
[GitHub] [camel] cunningt opened a new pull request #6570: Upgrade log4j to 2.17.0
cunningt opened a new pull request #6570: URL: https://github.com/apache/camel/pull/6570 Upgrade log4j to 2.17.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
[camel-spring-boot] branch main updated: Polished
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 e3f37cb Polished e3f37cb is described below commit e3f37cb643bbd96f2aadf650b0ad28a0c9f93c31 Author: Claus Ibsen AuthorDate: Mon Dec 20 15:56:23 2021 +0100 Polished --- .../java/org/apache/camel/spring/boot/CamelConfigurationProperties.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java index 23723b0..90b13ed 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java @@ -20,7 +20,6 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.ManagementStatisticsLevel; import org.apache.camel.StartupSummaryLevel; import org.apache.camel.main.DefaultConfigurationProperties; -import org.apache.camel.spi.Metadata; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.Map;
[camel] branch regen_bot updated (25c8a0c -> ab03fe7)
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 25c8a0c Regen for commit 23d466090fa72100cfc8a70b2ca4dccf4ae6defd add be1045c Use Azurite 3.15.0 image for test-infra module add ab03fe7 Regen for commit be1045ca02b13122154c7fb8b22415889c13955d 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 (25c8a0c) \ N -- N -- N refs/heads/regen_bot (ab03fe7) 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: .../apache/camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6571: Generated sources regen
github-actions[bot] opened a new pull request #6571: URL: https://github.com/apache/camel/pull/6571 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] github-actions[bot] closed pull request #6571: Generated sources regen
github-actions[bot] closed pull request #6571: URL: https://github.com/apache/camel/pull/6571 -- 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 (ab03fe7 -> ae19602)
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. discard ab03fe7 Regen for commit be1045ca02b13122154c7fb8b22415889c13955d add ae19602 Regen for commit e1e234ece629e053ab8449e7d44ff173c1f93f2e 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 (ab03fe7) \ N -- N -- N refs/heads/regen_bot (ae19602) 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 #6567: CAMEL-17352: Add plain option
davsclaus commented on a change in pull request #6567: URL: https://github.com/apache/camel/pull/6567#discussion_r772474344 ## File path: components/camel-log/src/main/java/org/apache/camel/component/log/LogEndpoint.java ## @@ -118,6 +118,8 @@ @UriParam(label = "formatting", enums = "Default,Tab,Fixed", defaultValue = "Default", description = "Sets the outputs style to use.") private DefaultExchangeFormatter.OutputStyle style = DefaultExchangeFormatter.OutputStyle.Default; +@UriParam(defaultValue = "false", description = "Log exchange body as-is (ex. log(\"${body}\").") Review comment: Lets use the same description: ``` If enabled only the body will be printed out ``` To make it stand out that all the other options are not considered then -- 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-website] branch asf-site updated (aa820e9 -> 099fe80)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard aa820e9 Website updated to d2e3677377cdb1273904478da5926db9c191f2ec discard d907d17 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new d2f8022 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 099fe80 Website updated to d2e3677377cdb1273904478da5926db9c191f2ec 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 (aa820e9) \ N -- N -- N refs/heads/asf-site (099fe80) 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 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: manual/camel-jbang.html | 12 +- sitemap-camel-k.xml | 822 ++-- sitemap-camel-kafka-connector.xml | 2218 +-- sitemap-camel-kamelets.xml| 586 +-- sitemap-camel-karaf.xml | 84 +- sitemap-camel-quarkus.xml | 2078 +- sitemap-camel-spring-boot.xml | 62 +- sitemap-components.xml| 7884 ++--- sitemap-manual.xml| 384 +- 9 files changed, 7065 insertions(+), 7065 deletions(-)
[GitHub] [camel] cunningt opened a new pull request #6572: Upgrade to log4j 2.17.0
cunningt opened a new pull request #6572: URL: https://github.com/apache/camel/pull/6572 Upgrade to log4j 2.17.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
svn commit: r51651 - /dev/camel/camel-kamelets/0.6.0/
Author: acosentino Date: Mon Dec 20 16:55:01 2021 New Revision: 51651 Log: Wrong import Removed: dev/camel/camel-kamelets/0.6.0/
svn commit: r51652 - in /dev/camel/camel-kamelets/0.6.0: ./ camel-kamelets-sources-0.6.0.tar.gz camel-kamelets-sources-0.6.0.tar.gz.asc camel-kamelets-sources-0.6.0.tar.gz.sha512
Author: acosentino Date: Mon Dec 20 16:55:52 2021 New Revision: 51652 Log: Camel-Kamelets 0.6.0 import. Added: dev/camel/camel-kamelets/0.6.0/ dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz (with props) dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.asc (with props) dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.sha512 Added: dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz -- svn:mime-type = application/x-gzip Added: dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.sha512 == --- dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.sha512 (added) +++ dev/camel/camel-kamelets/0.6.0/camel-kamelets-sources-0.6.0.tar.gz.sha512 Mon Dec 20 16:55:52 2021 @@ -0,0 +1 @@ +fae4132c91a532969eb3dd93840373c019128538ce3db9268db64e1c03d63e009e4556de69f31500e7cd104c4304b87c7e30a2f6e3697c38562a09c892744b11 *camel-kamelets-sources-0.6.0.tar.gz
[GitHub] [camel] djencks merged pull request #6561: [Docs] See cq #3396 Main remove cq bits
djencks merged pull request #6561: URL: https://github.com/apache/camel/pull/6561 -- 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] djencks merged pull request #6558: 3.14.x local/partial build setup
djencks merged pull request #6558: URL: https://github.com/apache/camel/pull/6558 -- 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] djencks merged pull request #6557: 3.13.x local/partial build setup
djencks merged pull request #6557: URL: https://github.com/apache/camel/pull/6557 -- 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] djencks merged pull request #6556: 3.12.x local/partial build setup
djencks merged pull request #6556: URL: https://github.com/apache/camel/pull/6556 -- 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] djencks merged pull request #6555: 3.11.x local/partial build setup
djencks merged pull request #6555: URL: https://github.com/apache/camel/pull/6555 -- 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] djencks merged pull request #6554: 3.7.x local/partial build setup
djencks merged pull request #6554: URL: https://github.com/apache/camel/pull/6554 -- 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] djencks merged pull request #6562: [Docs] See cq #3396 Camel 3.14.x remove cq bits
djencks merged pull request #6562: URL: https://github.com/apache/camel/pull/6562 -- 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] djencks merged pull request #6563: [Docs] See cq #3396 Camel 3.13.x remove cq bits
djencks merged pull request #6563: URL: https://github.com/apache/camel/pull/6563 -- 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] djencks merged pull request #6564: [Docs] See cq #3396 Camel 3.12.x remove cq bits
djencks merged pull request #6564: URL: https://github.com/apache/camel/pull/6564 -- 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] djencks merged pull request #6565: [Docs] See cq #3396 Camel 3.11.x remove cq bits
djencks merged pull request #6565: URL: https://github.com/apache/camel/pull/6565 -- 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] djencks merged pull request #6566: [Docs] See cq #3396 Camel 3.7.x remove cq bits
djencks merged pull request #6566: URL: https://github.com/apache/camel/pull/6566 -- 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] djencks merged pull request #3398: See #3396 2.5.x content-as tables
djencks merged pull request #3398: URL: https://github.com/apache/camel-quarkus/pull/3398 -- 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] djencks merged pull request #3397: See #3396 Main content-as tables
djencks merged pull request #3397: URL: https://github.com/apache/camel-quarkus/pull/3397 -- 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] djencks merged pull request #3399: See #3396 2.4.x content-as tables
djencks merged pull request #3399: URL: https://github.com/apache/camel-quarkus/pull/3399 -- 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] djencks merged pull request #3400: See #3396 2.6.x content-as tables
djencks merged pull request #3400: URL: https://github.com/apache/camel-quarkus/pull/3400 -- 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/04: base component tables on yml rather than attributes
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-quarkus.git commit c0fab16ac3416229dc73e368602d148e17d71b19 Author: David Jencks AuthorDate: Wed Dec 15 18:51:32 2021 -0800 base component tables on yml rather than attributes --- docs/antora.yml| 4 ++- docs/modules/ROOT/examples/js/quarkus.js | 35 ++ docs/modules/ROOT/pages/reference/components.adoc | 2 +- docs/modules/ROOT/pages/reference/dataformats.adoc | 4 +-- docs/modules/ROOT/pages/reference/languages.adoc | 4 +-- docs/modules/ROOT/pages/reference/others.adoc | 4 +-- .../ROOT/partials/reference/summary-table.adoc | 4 +-- docs/source-watch.yml | 4 --- .../quarkus/maven/CheckExtensionPagesMojo.java | 32 +++- .../quarkus/maven/UpdateExtensionDocPageMojo.java | 15 ++ .../doc-templates/extensions-camel-bits.adoc | 11 --- .../doc-templates/extensions-camel-bits.yml| 11 +++ 12 files changed, 71 insertions(+), 59 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 7ef3eda..be367c8 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -24,6 +24,8 @@ nav: - modules/ROOT/nav.adoc asciidoc: attributes: +requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'" + min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.4 # replace ${target-maven-version} camel-version: 3.14.0 # replace ${camel.version} @@ -33,4 +35,4 @@ asciidoc: quarkus-examples-version: latest # indexTable common indexer-version: 3.14.x # replace ${camel.docs.components.version} -indexer-component: components +indexer-component: camel-quarkus diff --git a/docs/modules/ROOT/examples/js/quarkus.js b/docs/modules/ROOT/examples/js/quarkus.js new file mode 100644 index 000..b79af1c --- /dev/null +++ b/docs/modules/ROOT/examples/js/quarkus.js @@ -0,0 +1,35 @@ +/* + * 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. + */ + +module.exports = { + v: function (name, $) { +return $[name] + }, + + extensionRef: function ($) { +return `xref:reference/extensions/${$.cqArtifactIdBase}.adoc[${$.cqCamelPartTitle}]` + }, + + deprecatedFilter: function (items) { +return items.filter((item) => item.$.cqDeprecated === true) + }, + + jvmOnlyFilter: function (items) { +return items.filter((item) => item.$.cqNativeSupported === false) + } + +} diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/pages/reference/components.adoc index 7acc4c6..385e809 100644 --- a/docs/modules/ROOT/pages/reference/components.adoc +++ b/docs/modules/ROOT/pages/reference/components.adoc @@ -1,6 +1,6 @@ = Camel components supported on Quarkus :indexer-module: ROOT -:indexer-rel-filter: *-component.adoc +:indexer-rel-filter: components/*.yml :indexer-human-readable-kind: Component :indexer-human-readable-kind-plural: components diff --git a/docs/modules/ROOT/pages/reference/dataformats.adoc b/docs/modules/ROOT/pages/reference/dataformats.adoc index 7b48979..ebe51a0 100644 --- a/docs/modules/ROOT/pages/reference/dataformats.adoc +++ b/docs/modules/ROOT/pages/reference/dataformats.adoc @@ -1,6 +1,6 @@ = Camel data formats supported on Quarkus -:indexer-module: dataformats -:indexer-rel-filter: *-dataformat.adoc +:indexer-module: ROOT +:indexer-rel-filter: dataformats/*.yml :indexer-human-readable-kind: Data format :indexer-human-readable-kind-plural: data formats diff --git a/docs/modules/ROOT/pages/reference/languages.adoc b/docs/modules/ROOT/pages/reference/languages.adoc index 3fd908a..5e2ec89 100644 --- a/docs/modules/ROOT/pages/reference/languages.adoc +++ b/docs/modules/ROOT/pages/reference/languages.adoc @@ -1,6 +1,6 @@ = Camel languages supported on Quarkus -:indexer-module: languages -:indexer-rel-filter: *-language.adoc +:indexer-module: ROOT +:indexer-rel-filter: languages/*.yml :indexer-human-readable-kind: Language :indexer-human-readable-kind-plural: languages diff --git a/docs/modules/ROOT/pages/reference/others.adoc b/do
[camel-quarkus] 04/04: try to prevent license check plugin from objecting to generated yml files
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-quarkus.git commit d19a0f5fc9fbd244aa58816e47691581860ced6c Author: David Jencks AuthorDate: Sat Dec 18 21:36:11 2021 -0800 try to prevent license check plugin from objecting to generated yml files --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 46650d8..4003b13 100644 --- a/pom.xml +++ b/pom.xml @@ -463,6 +463,8 @@ header.txt **/*.adoc +modules/**/*.yml + src/main/resources/doc-templates/extensions-camel-bits.yml **/*.adm **/*.avsc **/*.avpr
[camel-quarkus] 01/08: base component tables on yml rather than attributes
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8e21e450c98048cf5598307e789d4d3ca118efcd Author: David Jencks AuthorDate: Wed Dec 15 18:51:32 2021 -0800 base component tables on yml rather than attributes --- docs/antora.yml| 4 ++- docs/modules/ROOT/examples/js/quarkus.js | 35 ++ docs/modules/ROOT/pages/reference/components.adoc | 2 +- docs/modules/ROOT/pages/reference/dataformats.adoc | 4 +-- docs/modules/ROOT/pages/reference/languages.adoc | 4 +-- docs/modules/ROOT/pages/reference/others.adoc | 4 +-- .../ROOT/partials/reference/summary-table.adoc | 4 +-- docs/source-watch.yml | 4 --- .../quarkus/maven/CheckExtensionPagesMojo.java | 32 +++- .../quarkus/maven/UpdateExtensionDocPageMojo.java | 15 ++ .../doc-templates/extensions-camel-bits.adoc | 11 --- .../doc-templates/extensions-camel-bits.yml| 11 +++ 12 files changed, 71 insertions(+), 59 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index afbc01d..fdf3bc5 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -24,6 +24,8 @@ nav: - modules/ROOT/nav.adoc asciidoc: attributes: +requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'" + min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.4 # replace ${target-maven-version} camel-version: 3.14.0 # replace ${camel.version} @@ -33,4 +35,4 @@ asciidoc: quarkus-examples-version: latest # indexTable common indexer-version: 3.14.x # replace ${camel.docs.components.version} -indexer-component: components +indexer-component: camel-quarkus diff --git a/docs/modules/ROOT/examples/js/quarkus.js b/docs/modules/ROOT/examples/js/quarkus.js new file mode 100644 index 000..b79af1c --- /dev/null +++ b/docs/modules/ROOT/examples/js/quarkus.js @@ -0,0 +1,35 @@ +/* + * 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. + */ + +module.exports = { + v: function (name, $) { +return $[name] + }, + + extensionRef: function ($) { +return `xref:reference/extensions/${$.cqArtifactIdBase}.adoc[${$.cqCamelPartTitle}]` + }, + + deprecatedFilter: function (items) { +return items.filter((item) => item.$.cqDeprecated === true) + }, + + jvmOnlyFilter: function (items) { +return items.filter((item) => item.$.cqNativeSupported === false) + } + +} diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/pages/reference/components.adoc index 7acc4c6..385e809 100644 --- a/docs/modules/ROOT/pages/reference/components.adoc +++ b/docs/modules/ROOT/pages/reference/components.adoc @@ -1,6 +1,6 @@ = Camel components supported on Quarkus :indexer-module: ROOT -:indexer-rel-filter: *-component.adoc +:indexer-rel-filter: components/*.yml :indexer-human-readable-kind: Component :indexer-human-readable-kind-plural: components diff --git a/docs/modules/ROOT/pages/reference/dataformats.adoc b/docs/modules/ROOT/pages/reference/dataformats.adoc index 7b48979..ebe51a0 100644 --- a/docs/modules/ROOT/pages/reference/dataformats.adoc +++ b/docs/modules/ROOT/pages/reference/dataformats.adoc @@ -1,6 +1,6 @@ = Camel data formats supported on Quarkus -:indexer-module: dataformats -:indexer-rel-filter: *-dataformat.adoc +:indexer-module: ROOT +:indexer-rel-filter: dataformats/*.yml :indexer-human-readable-kind: Data format :indexer-human-readable-kind-plural: data formats diff --git a/docs/modules/ROOT/pages/reference/languages.adoc b/docs/modules/ROOT/pages/reference/languages.adoc index 3fd908a..5e2ec89 100644 --- a/docs/modules/ROOT/pages/reference/languages.adoc +++ b/docs/modules/ROOT/pages/reference/languages.adoc @@ -1,6 +1,6 @@ = Camel languages supported on Quarkus -:indexer-module: languages -:indexer-rel-filter: *-language.adoc +:indexer-module: ROOT +:indexer-rel-filter: languages/*.yml :indexer-human-readable-kind: Language :indexer-human-readable-kind-plural: languages diff --git a/docs/modules/ROOT/pages/reference/others.adoc b/d
[camel-quarkus] 02/08: fix source-map.yml for current version
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 441a95e1b33ccceab95561a93e3091381a08448a Author: David Jencks AuthorDate: Sat Dec 18 18:10:01 2021 -0800 fix source-map.yml for current version --- docs/source-map.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source-map.yml b/docs/source-map.yml index d2f96b7..d2587d0 100644 --- a/docs/source-map.yml +++ b/docs/source-map.yml @@ -21,5 +21,5 @@ - url: 'https://github.com/apache/camel-quarkus.git' mapped-url: './../camel-quarkus' branches: -- branch: main +- branch: 2.6.x mapped-branch: HEAD
[camel-quarkus] branch main updated (7227107 -> d19a0f5)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 7227107 Updated CHANGELOG.md new c0fab16 base component tables on yml rather than attributes new 789022d remove outdated generated partials new 4554d9c add generated yml new d19a0f5 try to prevent license check plugin from objecting to generated yml files The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/antora.yml| 4 ++- docs/modules/ROOT/examples/components/activemq.yml | 13 docs/modules/ROOT/examples/components/ahc-ws.yml | 13 docs/modules/ROOT/examples/components/ahc.yml | 13 docs/modules/ROOT/examples/components/amqp.yml | 13 docs/modules/ROOT/examples/components/arangodb.yml | 13 docs/modules/ROOT/examples/components/as2.yml | 13 docs/modules/ROOT/examples/components/asterisk.yml | 13 docs/modules/ROOT/examples/components/atlasmap.yml | 13 docs/modules/ROOT/examples/components/atmos.yml| 13 docs/modules/ROOT/examples/components/atom.yml | 13 .../ROOT/examples/components/atomix-map.yml| 13 .../ROOT/examples/components/atomix-messaging.yml | 13 .../ROOT/examples/components/atomix-multimap.yml | 13 .../ROOT/examples/components/atomix-queue.yml | 13 .../ROOT/examples/components/atomix-set.yml| 13 .../ROOT/examples/components/atomix-value.yml | 13 docs/modules/ROOT/examples/components/avro.yml | 13 .../examples/components/aws-secrets-manager.yml| 13 .../ROOT/examples/components/aws2-athena.yml | 13 docs/modules/ROOT/examples/components/aws2-cw.yml | 13 docs/modules/ROOT/examples/components/aws2-ddb.yml | 13 .../ROOT/examples/components/aws2-ddbstream.yml| 13 docs/modules/ROOT/examples/components/aws2-ec2.yml | 13 docs/modules/ROOT/examples/components/aws2-ecs.yml | 13 docs/modules/ROOT/examples/components/aws2-eks.yml | 13 .../ROOT/examples/components/aws2-eventbridge.yml | 13 docs/modules/ROOT/examples/components/aws2-iam.yml | 13 .../examples/components/aws2-kinesis-firehose.yml | 13 .../ROOT/examples/components/aws2-kinesis.yml | 13 docs/modules/ROOT/examples/components/aws2-kms.yml | 13 .../ROOT/examples/components/aws2-lambda.yml | 13 docs/modules/ROOT/examples/components/aws2-mq.yml | 13 docs/modules/ROOT/examples/components/aws2-msk.yml | 13 docs/modules/ROOT/examples/components/aws2-s3.yml | 13 docs/modules/ROOT/examples/components/aws2-ses.yml | 13 docs/modules/ROOT/examples/components/aws2-sns.yml | 13 docs/modules/ROOT/examples/components/aws2-sqs.yml | 13 docs/modules/ROOT/examples/components/aws2-sts.yml | 13 .../ROOT/examples/components/aws2-translate.yml| 13 .../ROOT/examples/components/azure-cosmosdb.yml| 13 .../ROOT/examples/components/azure-eventhubs.yml | 13 .../examples/components/azure-storage-blob.yml | 13 .../examples/components/azure-storage-datalake.yml | 13 .../examples/components/azure-storage-queue.yml| 13 .../ROOT/examples/components/bean-validator.yml| 13 docs/modules/ROOT/examples/components/bean.yml | 13 .../modules/ROOT/examples/components/beanstalk.yml | 13 docs/modules/ROOT/examples/components/bonita.yml | 13 docs/modules/ROOT/examples/components/box.yml | 13 .../modules/ROOT/examples/components/braintree.yml | 13 docs/modules/ROOT/examples/components/browse.yml | 13 .../ROOT/examples/components/caffeine-cache.yml| 13 .../examples/components/caffeine-loadcache.yml | 13 .../ROOT/examples/components/chatscript.yml| 13 docs/modules/ROOT/examples/components/chunk.yml| 13 docs/modules/ROOT/examples/components/class.yml| 13 docs/modules/ROOT/examples/components/cm-sms.yml | 13 docs/modules/ROOT/examples/components/cmis.yml | 13 docs/modules/ROOT/examples/components/coap.yml | 13 docs/modules/ROOT/examples/components/cometd.yml | 13 docs/modules/ROOT/examples/components/consul.yml | 13 .../ROOT/examples/components/controlbus.yml| 13 docs/modules/ROOT/examples/components/corda.yml| 13 .../modules/ROOT/examples/components/couchbase.yml | 13
[camel-quarkus] branch 2.6.x updated (4082ac2 -> daa03c9)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 4082ac2 [maven-release-plugin] Set next development version 2.6.1-SNAPSHOT new 8e21e45 base component tables on yml rather than attributes new 441a95e fix source-map.yml for current version new 2b92523 remove outdated generated partials new 7177cf5 add generated yml new d58baba generated change of version in qute.json extension new f35d711 claim version 2.6.x and prevent scripts from changing it new 0e184dd try to prevent license check plugin from objecting to generated yml files new daa03c9 formatting change from ./mvnw cq:sync-versions The 8 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: docs/antora.yml| 8 ++-- docs/modules/ROOT/examples/components/activemq.yml | 13 +++ docs/modules/ROOT/examples/components/ahc-ws.yml | 13 +++ docs/modules/ROOT/examples/components/ahc.yml | 13 +++ docs/modules/ROOT/examples/components/amqp.yml | 13 +++ docs/modules/ROOT/examples/components/arangodb.yml | 13 +++ docs/modules/ROOT/examples/components/as2.yml | 13 +++ docs/modules/ROOT/examples/components/asterisk.yml | 13 +++ docs/modules/ROOT/examples/components/atlasmap.yml | 13 +++ docs/modules/ROOT/examples/components/atmos.yml| 13 +++ docs/modules/ROOT/examples/components/atom.yml | 13 +++ .../ROOT/examples/components/atomix-map.yml| 13 +++ .../ROOT/examples/components/atomix-messaging.yml | 13 +++ .../ROOT/examples/components/atomix-multimap.yml | 13 +++ .../ROOT/examples/components/atomix-queue.yml | 13 +++ .../ROOT/examples/components/atomix-set.yml| 13 +++ .../ROOT/examples/components/atomix-value.yml | 13 +++ docs/modules/ROOT/examples/components/avro.yml | 13 +++ .../examples/components/aws-secrets-manager.yml| 13 +++ .../ROOT/examples/components/aws2-athena.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-cw.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-ddb.yml | 13 +++ .../ROOT/examples/components/aws2-ddbstream.yml| 13 +++ docs/modules/ROOT/examples/components/aws2-ec2.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-ecs.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-eks.yml | 13 +++ .../ROOT/examples/components/aws2-eventbridge.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-iam.yml | 13 +++ .../examples/components/aws2-kinesis-firehose.yml | 13 +++ .../ROOT/examples/components/aws2-kinesis.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-kms.yml | 13 +++ .../ROOT/examples/components/aws2-lambda.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-mq.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-msk.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-s3.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-ses.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-sns.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-sqs.yml | 13 +++ docs/modules/ROOT/examples/components/aws2-sts.yml | 13 +++ .../ROOT/examples/components/aws2-translate.yml| 13 +++ .../ROOT/examples/components/azure-cosmosdb.yml| 13 +++ .../ROOT/examples/components/azure-eventhubs.yml | 13 +++ .../examples/components/azure-storage-blob.yml | 13 +++ .../examples/components/azure-storage-datalake.yml | 13 +++ .../examples/components/azure-storage-queue.yml| 13 +++ .../ROOT/examples/components/bean-validator.yml| 13 +++ docs/modules/ROOT/examples/components/bean.yml | 13 +++ .../modules/ROOT/examples/components/beanstalk.yml | 13 +++ docs/modules/ROOT/examples/components/bonita.yml | 13 +++ docs/modules/ROOT/examples/components/box.yml | 13 +++ .../modules/ROOT/examples/components/braintree.yml | 13 +++ docs/modules/ROOT/examples/components/browse.yml | 13 +++ .../ROOT/examples/components/caffeine-cache.yml| 13 +++ .../examples/components/caffeine-loadcache.yml | 13 +++ .../ROOT/examples/components/chatscript.yml| 13 +++ docs/modules/ROOT/examples/components/chunk.yml| 13 +++ docs/modules/ROOT/examples/components/class.yml| 13 +++ docs/modules/ROOT/examples/components/cm-sms.yml | 13 +++ docs/modules/ROOT/examples/components/cmis.yml | 13 +++ docs/modules/ROOT/examples/components/coap.yml | 13 +++ docs/modules/ROOT/examples/components/cometd.yml | 13 +++
[camel-quarkus] 06/08: claim version 2.6.x and prevent scripts from changing it
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f35d711d308a44d8b9404d75a33e187ed03e14b7 Author: David Jencks AuthorDate: Sat Dec 18 19:13:56 2021 -0800 claim version 2.6.x and prevent scripts from changing it --- docs/antora.yml | 4 +-- pom.xml | 40 ++--- tooling/scripts/update-antora-config.groovy | 12 - tooling/scripts/update-antora-yaml.groovy | 2 +- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index fdf3bc5..f820b57 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -17,9 +17,7 @@ name: camel-quarkus title: Camel Quarkus -version: latest -prerelease: true -display-version: Next (Pre-release) +version: 2.6.x nav: - modules/ROOT/nav.adoc asciidoc: diff --git a/pom.xml b/pom.xml index 884de47..c0e8ece 100644 --- a/pom.xml +++ b/pom.xml @@ -988,26 +988,26 @@ commit-release-changes - -org.codehaus.gmaven -groovy-maven-plugin - - -update-antora-yaml -false - -execute - -validate - - file://${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy - - ${maven.multiModuleProjectDirectory} - - - - - + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-scm-plugin diff --git a/tooling/scripts/update-antora-config.groovy b/tooling/scripts/update-antora-config.groovy index a9340cd..5f5bb0b 100644 --- a/tooling/scripts/update-antora-config.groovy +++ b/tooling/scripts/update-antora-config.groovy @@ -58,12 +58,12 @@ replaceInFiles.each { path -> String newContentString = newContent.toString() // This can only work on main branch or during a release. Otherwise it will break antora.yml. -if (path.getFileName().toString().equals('antora.yml')) { -final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'next' : project.version) -println ' - setting '+ versionReplacement -final Pattern versionPattern = ~'version: [^\\s]+' -newContentString = versionPattern.matcher(newContentString).replaceFirst(versionReplacement) -} +//if (path.getFileName().toString().equals('antora.yml')) { +//final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'next' : project.version) +//println ' - setting '+ versionReplacement +//final Pattern versionPattern = ~'version: [^\\s]+' +//newContentString = versionPattern.matcher(newContentString).replaceFirst(versionReplacement) +//} if (!newContentString.equals(content)) { println 'Updated ' + path diff --git a/tooling/scripts/update-antora-yaml.groovy b/tooling/scripts/update-antora-yaml.groovy index e7dba01..e3760c9 100644 --- a/tooling/scripts/update-antora-yaml.groovy +++ b/tooling/scripts/update-antora-yaml.groovy @@ -34,7 +34,7 @@ final Path path = treeRootDir.resolve('docs/antora.yml') println 'Updating ' + path final String content = path.getText('UTF-8') final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'latest' : project.version) -println ' - seting '+ versionReplacement +println ' - setting '+ versionReplacement final Pattern versionPattern = ~'version: [^\\s]+' final String newContentString = versionPattern.matcher(content).replaceFirst(versionReplacement)
[camel-quarkus] 05/08: generated change of version in qute.json extension
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d58baba2700ee042421f7bce0e402f3b8112a50f Author: David Jencks AuthorDate: Sat Dec 18 19:07:15 2021 -0800 generated change of version in qute.json extension --- .../src/generated/resources/org/apache/camel/component/qute/qute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json index 03ed996..bd045b6 100644 --- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json @@ -11,7 +11,7 @@ "supportLevel": "Preview", "groupId": "org.apache.camel.quarkus", "artifactId": "camel-quarkus-qute-component", -"version": "2.6.0-SNAPSHOT", +"version": "2.6.1-SNAPSHOT", "scheme": "qute", "extendsScheme": "", "syntax": "qute:resourceUri",
[camel-quarkus] 07/08: try to prevent license check plugin from objecting to generated yml files
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 0e184ddb2c3ee887240395730baa034df04a29c8 Author: David Jencks AuthorDate: Sat Dec 18 21:36:11 2021 -0800 try to prevent license check plugin from objecting to generated yml files --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index c0e8ece..c1b986b 100644 --- a/pom.xml +++ b/pom.xml @@ -463,6 +463,8 @@ header.txt **/*.adoc +modules/**/*.yml + src/main/resources/doc-templates/extensions-camel-bits.yml **/*.adm **/*.avsc **/*.avpr
[camel-quarkus] 01/05: local build setup
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8949c54d86981471f7d0d5596ea0488da63a8999 Author: David Jencks AuthorDate: Tue Dec 14 16:49:12 2021 -0800 local build setup fix tooling enough so it doesn't break build --- docs/antora-playbook-dev.yml| 62 -- docs/antora-playbook.yml| 80 - docs/local-build.sh | 37 + docs/pom.xml| 78 ++-- docs/source-map.yml | 25 + docs/source-watch.yml | 33 tooling/scripts/update-antora-config.groovy | 2 - 7 files changed, 134 insertions(+), 183 deletions(-) diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml deleted file mode 100644 index 97ac4b9..000 --- a/docs/antora-playbook-dev.yml +++ /dev/null @@ -1,62 +0,0 @@ -# -# 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. -# - -site: - title: Apache Camel extensions for Quarkus - url: https://camel.apache.org - start_page: camel-quarkus::index.adoc -content: - sources: - - url: ./../ -branches: HEAD -start_path: docs - - url: g...@github.com:apache/camel.git -branches: - - camel-3.13.x # replace ${camel.docs.branch} -start_paths: - - docs/components - - url: g...@github.com:apache/camel.git -branches: - - main -start_paths: - - docs/user-manual - - docs/components - - core/camel-core-engine/src/main/docs -branches: HEAD -start_path: docs/components - #- url: ./../../camel-quarkus-examples - - url: g...@github.com:apache/camel-quarkus-examples.git -branches: HEAD -start_path: docs - - url: g...@github.com:apache/camel-spring-boot.git -branches: main -start_path: docs - -asciidoc: - extensions: -- "@djencks/asciidoctor-antora-indexer" - attributes: -eip-vc: latest@components - -ui: - bundle: -url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/master/raw/build/ui-bundle.zip?job=bundle-stable -snapshot: true -output: - dir: ./target/site -urls: - redirect_facility: httpd diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml deleted file mode 100644 index da9b4b1..000 --- a/docs/antora-playbook.yml +++ /dev/null @@ -1,80 +0,0 @@ -# -# 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. -# - -site: - title: Apache Camel extensions for Quarkus - url: https://camel.apache.org - start_page: camel-quarkus::index.adoc - -content: - sources: - - url: ./../ -branches: HEAD -start_path: docs - - - url: https://github.com/apache/camel-quarkus-examples.git -branches: main -start_path: docs - -# The version/branch of main camel 'components' this version of camel-quarkus uses - - url: https://github.com/apache/camel.git -branches: - - camel-3.13.x # replace ${camel.docs.branch} -start_paths: - # eip - - core/camel-core-engine/src/main/docs - # main components doc - - docs/components - -# There is only one version of the user manual - - url: https://github.com/apache/camel.git -branches: - - main -start_paths: - - docs/user-manual - -# The camel-spring-boot version corresponding to the main camel 'components' version/branch - - url: https://github.com/apa
[camel-quarkus] 08/08: formatting change from ./mvnw cq:sync-versions
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit daa03c9dca09035c89bb2f32833a8beb9f500536 Author: David Jencks AuthorDate: Sun Dec 19 09:26:42 2021 -0800 formatting change from ./mvnw cq:sync-versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1b986b..9298f86 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ ${maven-shade-plugin.version} - +
[camel-quarkus] branch 2.5.x updated (2061e65 -> 2dbf2a8)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 2061e65 :memo: Set documentation version to Camel Quarkus 2.5.x (#3339) new 8949c54 local build setup new bc3e671 base component tables on yml rather than attributes new 9d9917a remove outdated generated partials new 430ae23 add generated yml new 2dbf2a8 try to prevent license check plugin from objecting to generated yml files The 5 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: docs/antora-playbook-dev.yml | 62 - docs/antora-playbook.yml | 80 -- docs/antora.yml| 4 +- docs/local-build.sh| 37 ++ docs/modules/ROOT/examples/components/activemq.yml | 13 docs/modules/ROOT/examples/components/ahc-ws.yml | 13 docs/modules/ROOT/examples/components/ahc.yml | 13 docs/modules/ROOT/examples/components/amqp.yml | 13 docs/modules/ROOT/examples/components/arangodb.yml | 13 docs/modules/ROOT/examples/components/as2.yml | 13 docs/modules/ROOT/examples/components/asterisk.yml | 13 docs/modules/ROOT/examples/components/atlasmap.yml | 13 docs/modules/ROOT/examples/components/atmos.yml| 13 docs/modules/ROOT/examples/components/atom.yml | 13 .../ROOT/examples/components/atomix-map.yml| 13 .../ROOT/examples/components/atomix-messaging.yml | 13 .../ROOT/examples/components/atomix-multimap.yml | 13 .../ROOT/examples/components/atomix-queue.yml | 13 .../ROOT/examples/components/atomix-set.yml| 13 .../ROOT/examples/components/atomix-value.yml | 13 docs/modules/ROOT/examples/components/avro.yml | 13 .../examples/components/aws-secrets-manager.yml| 13 .../ROOT/examples/components/aws2-athena.yml | 13 docs/modules/ROOT/examples/components/aws2-cw.yml | 13 docs/modules/ROOT/examples/components/aws2-ddb.yml | 13 .../ROOT/examples/components/aws2-ddbstream.yml| 13 docs/modules/ROOT/examples/components/aws2-ec2.yml | 13 docs/modules/ROOT/examples/components/aws2-ecs.yml | 13 docs/modules/ROOT/examples/components/aws2-eks.yml | 13 .../ROOT/examples/components/aws2-eventbridge.yml | 13 docs/modules/ROOT/examples/components/aws2-iam.yml | 13 .../examples/components/aws2-kinesis-firehose.yml | 13 .../ROOT/examples/components/aws2-kinesis.yml | 13 docs/modules/ROOT/examples/components/aws2-kms.yml | 13 .../ROOT/examples/components/aws2-lambda.yml | 13 docs/modules/ROOT/examples/components/aws2-mq.yml | 13 docs/modules/ROOT/examples/components/aws2-msk.yml | 13 docs/modules/ROOT/examples/components/aws2-s3.yml | 13 docs/modules/ROOT/examples/components/aws2-ses.yml | 13 docs/modules/ROOT/examples/components/aws2-sns.yml | 13 docs/modules/ROOT/examples/components/aws2-sqs.yml | 13 docs/modules/ROOT/examples/components/aws2-sts.yml | 13 .../ROOT/examples/components/aws2-translate.yml| 13 .../ROOT/examples/components/azure-cosmosdb.yml| 13 .../ROOT/examples/components/azure-eventhubs.yml | 13 .../examples/components/azure-storage-blob.yml | 13 .../examples/components/azure-storage-datalake.yml | 13 .../examples/components/azure-storage-queue.yml| 13 .../ROOT/examples/components/bean-validator.yml| 13 docs/modules/ROOT/examples/components/bean.yml | 13 .../modules/ROOT/examples/components/beanstalk.yml | 13 docs/modules/ROOT/examples/components/bonita.yml | 13 docs/modules/ROOT/examples/components/box.yml | 13 .../modules/ROOT/examples/components/braintree.yml | 13 docs/modules/ROOT/examples/components/browse.yml | 13 .../ROOT/examples/components/caffeine-cache.yml| 13 .../examples/components/caffeine-loadcache.yml | 13 .../ROOT/examples/components/chatscript.yml| 13 docs/modules/ROOT/examples/components/chunk.yml| 13 docs/modules/ROOT/examples/components/class.yml| 13 docs/modules/ROOT/examples/components/cm-sms.yml | 13 docs/modules/ROOT/examples/components/cmis.yml | 13 docs/modules/ROOT/examples/components/coap.yml | 13 docs/modules/ROOT/examples/components/cometd.yml | 13 docs/modules/ROOT/examples/components/consul.yml | 13 .../ROOT/examples/components/controlbus.yml| 13 docs/modules/ROOT/examples/components/corda.yml| 13 .../
[camel-quarkus] 02/05: base component tables on yml rather than attributes
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit bc3e671e930104024c4d6f493093c7ec750e870d Author: David Jencks AuthorDate: Wed Dec 15 18:51:32 2021 -0800 base component tables on yml rather than attributes --- docs/antora.yml| 4 ++- docs/modules/ROOT/examples/js/quarkus.js | 35 ++ docs/modules/ROOT/pages/reference/components.adoc | 2 +- docs/modules/ROOT/pages/reference/dataformats.adoc | 4 +-- docs/modules/ROOT/pages/reference/languages.adoc | 4 +-- docs/modules/ROOT/pages/reference/others.adoc | 4 +-- .../ROOT/partials/reference/summary-table.adoc | 4 +-- .../quarkus/maven/CheckExtensionPagesMojo.java | 32 +++- .../quarkus/maven/UpdateExtensionDocPageMojo.java | 15 ++ .../doc-templates/extensions-camel-bits.adoc | 11 --- .../doc-templates/extensions-camel-bits.yml| 11 +++ 11 files changed, 71 insertions(+), 55 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 4276472..08f7bb1 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -22,6 +22,8 @@ nav: - modules/ROOT/nav.adoc asciidoc: attributes: +requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'" + min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.1 # replace ${target-maven-version} camel-version: 3.13.0 # replace ${camel.version} @@ -31,4 +33,4 @@ asciidoc: quarkus-examples-version: latest # indexTable common indexer-version: 3.13.x # replace ${camel.docs.components.version} -indexer-component: components +indexer-component: camel-quarkus diff --git a/docs/modules/ROOT/examples/js/quarkus.js b/docs/modules/ROOT/examples/js/quarkus.js new file mode 100644 index 000..b79af1c --- /dev/null +++ b/docs/modules/ROOT/examples/js/quarkus.js @@ -0,0 +1,35 @@ +/* + * 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. + */ + +module.exports = { + v: function (name, $) { +return $[name] + }, + + extensionRef: function ($) { +return `xref:reference/extensions/${$.cqArtifactIdBase}.adoc[${$.cqCamelPartTitle}]` + }, + + deprecatedFilter: function (items) { +return items.filter((item) => item.$.cqDeprecated === true) + }, + + jvmOnlyFilter: function (items) { +return items.filter((item) => item.$.cqNativeSupported === false) + } + +} diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/pages/reference/components.adoc index 7acc4c6..385e809 100644 --- a/docs/modules/ROOT/pages/reference/components.adoc +++ b/docs/modules/ROOT/pages/reference/components.adoc @@ -1,6 +1,6 @@ = Camel components supported on Quarkus :indexer-module: ROOT -:indexer-rel-filter: *-component.adoc +:indexer-rel-filter: components/*.yml :indexer-human-readable-kind: Component :indexer-human-readable-kind-plural: components diff --git a/docs/modules/ROOT/pages/reference/dataformats.adoc b/docs/modules/ROOT/pages/reference/dataformats.adoc index 7b48979..ebe51a0 100644 --- a/docs/modules/ROOT/pages/reference/dataformats.adoc +++ b/docs/modules/ROOT/pages/reference/dataformats.adoc @@ -1,6 +1,6 @@ = Camel data formats supported on Quarkus -:indexer-module: dataformats -:indexer-rel-filter: *-dataformat.adoc +:indexer-module: ROOT +:indexer-rel-filter: dataformats/*.yml :indexer-human-readable-kind: Data format :indexer-human-readable-kind-plural: data formats diff --git a/docs/modules/ROOT/pages/reference/languages.adoc b/docs/modules/ROOT/pages/reference/languages.adoc index 3fd908a..5e2ec89 100644 --- a/docs/modules/ROOT/pages/reference/languages.adoc +++ b/docs/modules/ROOT/pages/reference/languages.adoc @@ -1,6 +1,6 @@ = Camel languages supported on Quarkus -:indexer-module: languages -:indexer-rel-filter: *-language.adoc +:indexer-module: ROOT +:indexer-rel-filter: languages/*.yml :indexer-human-readable-kind: Language :indexer-human-readable-kind-plural: languages diff --git a/docs/modules/ROOT/pages/reference/others.adoc b/docs/modules/ROOT/pages/reference/others.adoc index 523f982..1
[camel-quarkus] 05/05: try to prevent license check plugin from objecting to generated yml files
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 2dbf2a88cf9ef75825f934cb1548314dd784df6a Author: David Jencks AuthorDate: Sat Dec 18 21:36:11 2021 -0800 try to prevent license check plugin from objecting to generated yml files --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 238e833..0962843 100644 --- a/pom.xml +++ b/pom.xml @@ -455,6 +455,8 @@ header.txt **/*.adoc +modules/**/*.yml + src/main/resources/doc-templates/extensions-camel-bits.yml **/*.adm **/*.avsc **/*.avpr
[camel] 01/03: tooling/config changes to remove cq adoc bits
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.git commit 59934239ec1c67b730969e787bf2cecd63acfaf7 Author: David Jencks AuthorDate: Sun Dec 19 10:49:59 2021 -0800 tooling/config changes to remove cq adoc bits --- docs/components/antora.yml | 1 - .../java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java| 7 --- 2 files changed, 8 deletions(-) diff --git a/docs/components/antora.yml b/docs/components/antora.yml index 16debba..9f6c302 100644 --- a/docs/components/antora.yml +++ b/docs/components/antora.yml @@ -36,4 +36,3 @@ asciidoc: attributes: index-table-format: width="100%",cols="4,3,3,3,6",options="header" # | Data Format | Artifact | Support Level | Since | Description -cq-version: next diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java index 59dad536..cc55c1b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java @@ -505,13 +505,6 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { } } -// quarkus include pages should not be for EIP models -if (!"model".equals(model.getKind())) { -newLines.add( - "include::{cq-version}@camel-quarkus:ROOT:partial$reference/" + kind + "s/" + name - + ".adoc[opts=optional]"); -} - if (!manualAttributes.isEmpty()) { newLines.add("//Manually maintained attributes"); for (Map.Entry entry : manualAttributes.entrySet()) {
[camel] 03/03: non-generated removal of cq adoc bits
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.git commit 30edf846fe22896dd8009f060a14db06e2d8e78d Author: David Jencks AuthorDate: Sun Dec 19 15:13:18 2021 -0800 non-generated removal of cq adoc bits --- components/camel-openapi-java/src/main/docs/springdoc.adoc | 1 - dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/docs/groovy-dsl.adoc | 1 - dsl/camel-java-joor-dsl/src/main/docs/java-joor-dsl.adoc| 1 - dsl/camel-js-dsl/src/main/docs/js-dsl.adoc | 1 - dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc | 1 - dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc | 1 - dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc | 1 - dsl/camel-xml-jaxb-dsl/src/main/docs/java-xml-jaxb-dsl.adoc | 1 - dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/docs/yaml-dsl.adoc | 1 - 9 files changed, 9 deletions(-) diff --git a/components/camel-openapi-java/src/main/docs/springdoc.adoc b/components/camel-openapi-java/src/main/docs/springdoc.adoc index 4eb0cfe..2f0aa1b 100644 --- a/components/camel-openapi-java/src/main/docs/springdoc.adoc +++ b/components/camel-openapi-java/src/main/docs/springdoc.adoc @@ -6,7 +6,6 @@ :description: Springdoc Swagger UI for openapi-java in spring boot :since: 3.14 //:supportlevel: Stable -//include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/openapi-java.adoc[opts=optional] //Manually maintained attributes :camel-spring-boot-name: springdoc :starter-artifactid: camel-springdoc-starter diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/docs/groovy-dsl.adoc b/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/docs/groovy-dsl.adoc index af6a7a4..a9e48b0 100644 --- a/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/docs/groovy-dsl.adoc +++ b/dsl/camel-groovy-dsl/camel-groovy-dsl/src/main/docs/groovy-dsl.adoc @@ -6,7 +6,6 @@ :description: Camel DSL with Groovy :supportlevel: Experimental/Preview :since: 3 -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/groovy-dsl.adoc[opts=optional] //Manually maintained attributes :group: DSL diff --git a/dsl/camel-java-joor-dsl/src/main/docs/java-joor-dsl.adoc b/dsl/camel-java-joor-dsl/src/main/docs/java-joor-dsl.adoc index 53304dc..f07aad3 100644 --- a/dsl/camel-java-joor-dsl/src/main/docs/java-joor-dsl.adoc +++ b/dsl/camel-java-joor-dsl/src/main/docs/java-joor-dsl.adoc @@ -6,7 +6,6 @@ :description: Camel DSL with YAML :supportlevel: Stable/Preview :since: 3 -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/java-joor-dsl.adoc[opts=optional] //Manually maintained attributes :group: DSL diff --git a/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc b/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc index 9185d97..c1fba81 100644 --- a/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc +++ b/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc @@ -6,7 +6,6 @@ :description: Camel DSL with JavaScript :supportlevel: Experimental/Preview :since: 3 -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/js-dsl.adoc[opts=optional] //Manually maintained attributes :group: DSL diff --git a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc index 871f6b8..3376d8e 100644 --- a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc +++ b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc @@ -6,7 +6,6 @@ :description: Main to run Kamelet standalone :since: 3.11 :supportlevel: Preview -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/kamelet-main.adoc[opts=optional] //Manually maintained attributes :group: DSL diff --git a/dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc b/dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc index 4ddabc8..cfc87aa 100644 --- a/dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc +++ b/dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc @@ -6,7 +6,6 @@ :description: Camel DSL with Kotlin :supportlevel: Experimental/Preview :since: 3 -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/kotlin-dsl.adoc[opts=optional] //Manually maintained attributes :group: DSL diff --git a/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc b/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc index 1e0d0f9..d544ef4 100644 --- a/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc +++ b/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc @@ -5,7 +5,6 @@ :artifactid: camel-xml-io-dsl :description: Camel DSL with YAML :supportlevel: Stable -include::{cq-version}@camel-quarkus:ROOT:partial$reference/others/xml-io-dsl.adoc[opts=optional] //Manually maintained attributes :group: DSL diff --git a/dsl/camel-xml-jaxb-dsl/src/main/docs/java-xml-jaxb-dsl.adoc b/dsl/camel-xml-jaxb-dsl/src/main/docs/java-xml-jaxb-dsl.adoc index 27bb25c..0284783 100644 ---