[camel] branch main updated: Polished docs

[davsclaus]

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 1d3a2df  Polished docs
1d3a2df is described below

commit 1d3a2df46f593175f3acf713cabcbe12fd4512e8
Author: Claus Ibsen 
AuthorDate: Mon Nov 15 09:44:40 2021 +0100

Polished docs
---
 .../src/main/docs/modules/eips/pages/pollEnrich-eip.adoc| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc 
b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
index 04de57e..65ad333 100644
--- 
a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
+++ 
b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
@@ -136,14 +136,16 @@ for example download a file from 
xref:ROOT:aws2-s3-component.adoc[AWS S3] as the
 Report REST API
 
 
-
-
aws-s3:xavier-dev?amazonS3Client=#s3client&deleteAfterRead=false&fileName=report-file.pdf
+
+
aws-s3:xavier-dev?amazonS3Client=#s3client&deleteAfterRead=false&fileName=report-file.pdf
 
 
 
 
 
 
+Notice that the enriched endpoint is a constant, however Camel also supports 
dynamic endpoints which is covered next.
+
 === Poll Enrich with Dynamic Endpoints
 
 Both `enrich` and `pollEnrich` supports using dynamic uris computed based on 
information from the current `Exchange`.

[camel] branch main updated: Polished

[davsclaus]

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 daf613d  Polished
daf613d is described below

commit daf613d068a8fbe5ce93064e7b0ab573d9c328bc
Author: Claus Ibsen 
AuthorDate: Wed Nov 10 16:40:18 2021 +0100

Polished
---
 .../org/apache/camel/support/cache/DefaultProducerCache.java   | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
index a5b0509..97152e4 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
@@ -133,13 +133,15 @@ public class DefaultProducerCache extends ServiceSupport 
implements ProducerCach
 .build())
 .build();
 
-StopWatch watch = new StopWatch();
+StopWatch watch = LOG.isDebugEnabled() ? new StopWatch() : null;
 if (!task.run(service::isStarting)) {
-LOG.warn("The producer did not finish starting");
+LOG.warn("The producer: {} did not finish starting in {} ms", 
service, ACQUIRE_WAIT_TIME);
 }
 
-LOG.debug("Waited {} ms for producer to finish starting: {} state: 
{}", watch.taken(), service,
-service.getStatus());
+if (LOG.isDebugEnabled()) {
+LOG.debug("Waited {} ms for producer to finish starting: {} state: 
{}", watch.taken(), service,
+service.getStatus());
+}
 }
 
 @Override

[camel] branch main updated: Polished

[davsclaus]

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 cf3b5c2  Polished
cf3b5c2 is described below

commit cf3b5c2b47542339649a29fe0f4b91da5d7bdfac
Author: Claus Ibsen 
AuthorDate: Sat Oct 30 09:10:17 2021 +0200

Polished
---
 .../org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
index 3d77a6a..a3f67db 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Default {@link ScheduledBatchPollingConsumer}.
+ * The default scheduler for {@link ScheduledPollConsumer}.
  */
 public class DefaultScheduledPollConsumerScheduler extends ServiceSupport 
implements ScheduledPollConsumerScheduler {
 

[camel] branch main updated: Polished

[davsclaus]

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 ce8f3c6  Polished
ce8f3c6 is described below

commit ce8f3c664c9393fe533ef047d45fdaf14d6c455e
Author: Claus Ibsen 
AuthorDate: Wed Oct 27 09:11:20 2021 +0200

Polished
---
 .../ROOT/pages/camel-3x-upgrade-guide-3_13.adoc| 41 +++---
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc
index 07942dc..25758d8 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_13.adoc
@@ -51,33 +51,19 @@ bootstrap process, but are of importance for event 
notifiers to be able to react
 
 === Using custom Debugger
 
-Previously when setting a custom org.apache.camel.spi.Debugger, then Camel 
would automatically
+Previously when setting a custom `org.apache.camel.spi.Debugger`, then Camel 
would automatically
 enable debug mode. Now debugging must be enabled by setting 
`setDebugging(true)` on `CamelContext`.
 
-=== Using transactions
+=== Using Transactions
 
 The routing engine has been changed to route exchanges in a different order
 when using transactions (`.transacted()`). When an `Exchange` is continued
 routed a task is scheduled to the `ReactiveExecutor`. This fixed issues
 with could lead to `StackOverflowException`.
 
-=== camel-hazelcast-starter
-
-The `camel-hazelcast-starter` for Spring Boot no longer has _customer_ auto 
configuration options for all its components
-
-eg the following configuration keys have been removed
-
-- ...customizer.hazelcast-instance.enabled
-- ...customizer.hazelcast-instance.override
-
-Any Camel component can be customized by using the 
`org.apache.camel.spi.ComponentCustomizer` SPI.
-
-=== camel-openapi-java
-
-When using Rest DSL and the `restConfiguration` has a `contextPath` 
configured, then this value
-is used as leading base path for all API services that are in the generated 
api-docs.
+=== camel-couchdb
 
-This is i.e. needed when using `camel-servlet` which runs under a specific 
`context-path`.
+The `since` configuration was replaced by the `resumeStrategy`. Integrations 
can now manage the last update sequence for tracking the changes directly. 
Check the samples section on the component documentation page for a sample.
 
 === camel-file
 
@@ -90,6 +76,17 @@ In order to reduce memory pressure, the component was 
modified to avoid using Li
 
 The `FtpConsumer`, `FtpOperations`, `SftConsumer` and `SftpOperations` classes 
were modified to comply with the API changes on the `camel-file` component.
 
+=== camel-hazelcast-starter
+
+The `camel-hazelcast-starter` for Spring Boot no longer has _customer_ auto 
configuration options for all its components
+
+eg the following configuration keys have been removed
+
+- `...customizer.hazelcast-instance.enabled`
+- `...customizer.hazelcast-instance.override`
+
+Any Camel component can be customized by using the 
`org.apache.camel.spi.ComponentCustomizer` SPI.
+
 === camel-jsch
 
 The `ScpOperations` class were modified to comply with the API changes on the 
`camel-file` component.
@@ -109,9 +106,11 @@ their applications when upgrading to ensure this continues 
to work.
 
 === camel-openapi-java / camel-swagger-java
 
+When using Rest DSL and the `restConfiguration` has a `contextPath` 
configured, then this value
+is used as leading base path for all API services that are in the generated 
api-docs.
+
+This is i.e. needed when using `camel-servlet` which runs under a specific 
`context-path`.
+
 Support for rendering api docs by discovering other CamelContext via JMX in 
the same JVM has been removed.
 Rendering of api docs is now only supported for the same CamelContext.
 
-=== camel-couchdb
-
-The `since` configuration was replaced by the `resumeStrategy`. Integrations 
can now manage the last update sequence for tracking the changes directly. 
Check the samples section on the component documentation page for a sample.

[camel] branch main updated: Polished

[davsclaus]

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 63ed1d3  Polished
63ed1d3 is described below

commit 63ed1d34237490c070023403f769ab4eb5fe292e
Author: Claus Ibsen 
AuthorDate: Sat Oct 9 17:53:46 2021 +0200

Polished
---
 .../java/org/apache/camel/openapi/OpenApiRestProducerFactory.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
 
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
index e727d30..0933d19 100644
--- 
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
+++ 
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
@@ -102,7 +102,9 @@ public class OpenApiRestProducerFactory implements 
RestProducerFactory {
 final ObjectMapper mapper = new ObjectMapper();
 try {
 final JsonNode node = mapper.readTree(is);
-LOG.debug("Loaded openApi api-doc:\n{}", node.toPrettyString());
+if (LOG.isDebugEnabled()) {
+LOG.debug("Loaded openApi api-doc:\n{}", 
node.toPrettyString());
+}
 return (OasDocument) Library.readDocument(node);
 
 } finally {

[camel] branch main updated: Polished

[davsclaus]

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 3c2942de Polished
3c2942de is described below

commit 3c2942de26498e83f41de7ee5a17ac6de5c54156
Author: Claus Ibsen 
AuthorDate: Wed Sep 29 13:49:01 2021 +0200

Polished
---
 .../src/main/java/org/apache/camel/builder/AdviceWith.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java 
b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
index 7e6596a..e85ef70 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
@@ -243,7 +243,7 @@ public final class AdviceWith {
 if (beforeAsXml != null && logRoutesAsXml && LOG.isInfoEnabled()) {
 try {
 String afterAsXml = 
ecc.getModelToXMLDumper().dumpModelAsXml(camelContext, merged);
-LOG.info("Adviced route before/after as XML:\n{}\n{}", 
beforeAsXml, afterAsXml);
+LOG.info("Adviced route before/after as XML:\n{}\n\n{}", 
beforeAsXml, afterAsXml);
 } catch (Throwable e) {
 // ignore, it may be due jaxb is not on classpath etc
 }

[camel] branch main updated: Polished

[davsclaus]

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 1f0e2a1  Polished
1f0e2a1 is described below

commit 1f0e2a1eb2226f092f7b18fc60f6974514142177
Author: Claus Ibsen 
AuthorDate: Thu Sep 23 12:39:26 2021 +0200

Polished
---
 .../ROOT/pages/camel-3x-upgrade-guide-3_12.adoc| 29 +-
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_12.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_12.adoc
index 4169181..b47ed73 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_12.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_12.adoc
@@ -21,22 +21,18 @@ use the methods that take `String` as type.
 
 === Data Formats
 
-The `camel-asn1` data format has renamed the option `clazzName` to 
`unmarshalType`.
-The `camel-avro` data format has renamed the option `collectionTypeName` to 
`collectionType`.
-The `camel-avro` data format has renamed the option `jsonViewTypeName` to 
`jsonView`.
-The `camel-avro` data format has renamed the option `unmarshalTypeName` to 
`unmarshalType`.
-The `camel-cbor` data format has renamed the option `collectionTypeName` to 
`collectionType`.
-The `camel-cbor` data format has renamed the option `unmarshalTypeName` to 
`unmarshalType`.
-The `camel-jacksonxml` data format has renamed the option `collectionTypeName` 
to `collectionType`.
-The `camel-jacksonxml` data format has renamed the option `jsonViewTypeName` 
to `jsonView`.
-The `camel-jacksonxml` data format has renamed the option `unmarshalTypeName` 
to `unmarshalType`.
-The `camel-json` data format has renamed the option `collectionTypeName` to 
`collectionType`.
-The `camel-json` data format has renamed the option `jsonViewTypeName` to 
`jsonView`.
-The `camel-json` data format has renamed the option `unmarshalTypeName` to 
`unmarshalType`.
-The `camel-protobuf` data format has renamed the option `collectionTypeName` 
to `collectionType`.
-The `camel-protobuf` data format has renamed the option `jsonViewTypeName` to 
`jsonView`.
-The `camel-protobuf` data format has renamed the option `unmarshalTypeName` to 
`unmarshalType`.
-The `camel-yaml` data format has renamed the option `unmarshalTypeName` to 
`unmarshalType`.
+We had to fix all the data-formats options that take a Java classname to 
support
+using the `.class` type in Java vs using a string value in XML/YAML.
+
+This means the following options has been renamed:
+
+- `camel-asn1` renamed `clazzName` to `unmarshalType`
+- `camel-avro` renamed `collectionTypeName` to `collectionType`, and 
`jsonViewTypeName` to `jsonView`, and `unmarshalTypeName` to `unmarshalType`
+- `camel-cbor` renamed `collectionTypeName` to `collectionType`, and 
`unmarshalTypeName` to `unmarshalType`
+- `camel-jacksonxml` renamed `collectionTypeName` to `collectionType`, and 
`jsonViewTypeName` to `jsonView`, and `unmarshalTypeName` to `unmarshalType`
+- `camel-json` renamed `collectionTypeName` to `collectionType`, and 
`jsonViewTypeName` to `jsonView`, and `unmarshalTypeName` to `unmarshalType`
+- `camel-protobuf` renamed `collectionTypeName` to `collectionType`, and 
`jsonViewTypeName` to `jsonView`, and `unmarshalTypeName` to `unmarshalType`
+- `camel-yaml` renamed `unmarshalTypeName` to `unmarshalType`
 
 === camel-catalog
 
@@ -69,7 +65,6 @@ Before the value in use may be from an ENV variable with the 
same name.
 
 The `camel-kafka` component was refactored to avoid blocking API calls in the 
Kafka consumer. As part of the refactoring the configuration `consumerStreams` 
was removed. In previous versions this setting configured the size thread pool 
used by the component to create Kafka consumers. As of 3.12, the size of the 
thread pool is set to be the same as the number of concurrent consumers (set by 
`consumersCount`).
 
-
 === camel-spark
 
 The `camel-spark` component has been upgraded from Spark 2.x to 3.x.

[camel] branch main updated: Polished

[davsclaus]

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 3ef807a  Polished
3ef807a is described below

commit 3ef807a22296671453e7e2cfd9ceda32ffbe00a0
Author: Claus Ibsen 
AuthorDate: Wed Sep 22 08:49:32 2021 +0200

Polished
---
 .../main/java/org/apache/camel/management/mbean/ManagedCamelContext.java | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
 
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index ef5facf..6dabc6d 100644
--- 
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ 
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -412,7 +412,6 @@ public class ManagedCamelContext extends 
ManagedPerformanceCounter implements Ti
 return null;
 }
 
-// use a routes definition to dump the rests
 RestsDefinition def = new RestsDefinition();
 def.setRests(rests);
 

[camel] branch main updated: Polished

[davsclaus]

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 c7b9ccf  Polished
c7b9ccf is described below

commit c7b9ccf10eb550e09c68b8f7898b65f5f8e8a839
Author: Claus Ibsen 
AuthorDate: Fri Sep 10 09:01:48 2021 +0200

Polished
---
 README.md | 47 +++
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 780251b..55823fd4 100644
--- a/README.md
+++ b/README.md
@@ -7,16 +7,11 @@
 
[![Twitter](https://img.shields.io/twitter/follow/ApacheCamel.svg?label=Follow&style=social)](https://twitter.com/ApacheCamel)
 
 
-[Apache Camel](https://camel.apache.org/) is a powerful, open-source 
integration framework based on prevalent 
-Enterprise Integration Patterns with powerful bean integration.
+[Apache Camel](https://camel.apache.org/) is an Open Source integration 
framework that empowers you to quickly and easily integrate various systems 
consuming or producing data.
 
 ### Introduction
 
-Camel enables the creation of the Enterprise Integration Patterns to implement 
routing
-and mediation rules in either a Java-based Domain Specific Language (or Fluent 
API),
-via Spring or Blueprint based Xml Configuration files, or via the Scala DSL.
-That means you get smart completion of routing rules in your IDE whether
-in your Java, Scala, or XML editor.
+Camel empowers you to define routing and mediation rules in a variety of 
domain-specific languages (DSL, such as Java, XML, Groovy, Kotlin, and YAML). 
This means you get smart completion of routing rules in your IDE, whether in a 
Java or XML editor.
 
 Apache Camel uses URIs to enable easier integration with all kinds of
 transport or messaging model including HTTP, ActiveMQ, JMS, JBI, SCA, MINA
@@ -27,7 +22,7 @@ transport type, making it possible to interact with all the 
components provided
 with a good understanding of the API.
 
 Apache Camel has powerful Bean Binding and integrated seamlessly with
-popular frameworks such as Spring, CDI, and Blueprint.
+popular frameworks such as Spring, Quarkus, and CDI.
 
 Apache Camel has extensive testing support allowing you to easily
 unit test your routes.
@@ -113,39 +108,3 @@ The Camel riders!
 The terms for software licensing are detailed in the `LICENSE.txt` file,  
 located in the working directory.
 
-This distribution includes cryptographic software.  The country in
-which you currently reside may levy restrictions on the import,
-possession, use, and re-export to foreign countries of
-encryption software.  BEFORE using any encryption software, please
-check your country's laws, regulations, and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted.  See  for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS) has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms.  The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
-
-* **camel-ahc** can be configured to use https.
-* **camel-atmosphere-websocket** can be used for secure communications.
-* **camel-crypto** can be used for secure communications.
-* **camel-cxf** can be configured for secure communications.
-* **camel-ftp** can be configured for secure communications.
-* **camel-http** can be configured to use https.
-* **camel-infinispan** can be configured for secure communications.
-* **camel-jasypt** can be used for secure communications.
-* **camel-jetty** can be configured to use https.
-* **camel-mail** can be configured for secure communications.
-* **camel-nagios** can be configured for secure communications.
-* **camel-netty-http** can be configured to use https.
-* **camel-undertow** can be configured to use https.
-* **camel-xmlsecurity** can be configured for secure communications.

[camel] branch main updated: Polished

[davsclaus]

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 d44a485  Polished
d44a485 is described below

commit d44a48596c5a1939f5cbb6c700fe3f87c9de5586
Author: Claus Ibsen 
AuthorDate: Fri Sep 3 10:48:26 2021 +0200

Polished
---
 components/camel-jasypt/src/main/docs/jasypt.adoc | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/camel-jasypt/src/main/docs/jasypt.adoc 
b/components/camel-jasypt/src/main/docs/jasypt.adoc
index 8f461f2..14a4089 100644
--- a/components/camel-jasypt/src/main/docs/jasypt.adoc
+++ b/components/camel-jasypt/src/main/docs/jasypt.adoc
@@ -51,7 +51,7 @@ tooling to encrypt or decrypt values.
 
 The console output the syntax and which options it provides:
 
-[source,java]
+[source,text]
 --
 Apache Camel Jasypt takes the following options
 
@@ -67,7 +67,7 @@ parameters. In the apache camel kit, you cd into the lib 
folder and run
 the following java cmd, where __ is where you have
 downloaded and extract the Camel distribution.
 
-[source,java]
+[source,bash]
 
 $ cd /lib
 $ java -jar camel-jasypt-2.5.0.jar -c encrypt -p secret -i tiger
@@ -75,7 +75,7 @@ $ java -jar camel-jasypt-2.5.0.jar -c encrypt -p secret -i 
tiger
 
 Which outputs the following result
 
-[source,java]
+[source,text]
 
 Encrypted text: qaEEacuW7BUti8LcMgyjKw==
 
@@ -90,7 +90,7 @@ correct original value.
 So you can test it by running the tooling using the following
 parameters:
 
-[source,java]
+[source,bash]
 
---
 $ cd /lib
 $ java -jar camel-jasypt-2.5.0.jar -c decrypt -p secret -i 
qaEEacuW7BUti8LcMgyjKw==
@@ -98,7 +98,7 @@ $ java -jar camel-jasypt-2.5.0.jar -c decrypt -p secret -i 
qaEEacuW7BUti8LcMgyjK
 
 Which outputs the following result:
 
-[source,java]
+[source,text]
 -
 Decrypted text: tiger
 -
@@ -117,14 +117,14 @@ When running jasypt tooling, if you come across 
`java.lang.NoClassDefFoundError:
 The options below are exclusive for the Jasypt
 component.
 
-[width="100%",cols="10%,10%,10%,70%",options="header",]
+[width="100%",cols="10%m,10%m,10%m,70%",options="header",]
 |===
 |Name |Default Value |Type |Description
 
-|`password` |`null` |`String` |Specifies the master password to use for 
decrypting. This option is
+| password |  | string |Specifies the master password to use for decrypting. 
This option is
 mandatory. See below for more details.
 
-|`algorithm` |`null` |`String` |Name of an optional algorithm to use.
+| algorithm |  | string |Name of an optional algorithm to use.
 |===
 
 
@@ -142,7 +142,7 @@ system property.
 For example you could provided the password before you start the
 application
 
-[source,java]
+[source,bash]
 -
 $ export CAMEL_ENCRYPTION_PASSWORD=secret
 -
@@ -151,7 +151,7 @@ Then start the application, such as running the start 
script.
 
 When the application is up and running you can unset the environment
 
-[source,java]
+[source,bash]
 -
 $ unset CAMEL_ENCRYPTION_PASSWORD
 -
@@ -198,7 +198,7 @@ inside the `` tag which is shown below. 
Notice how we use
 the `propertiesParserRef` attribute to refer to
 Jasypt.
 
-[source,java]
+[source,xml]
 
--
 
 

[camel] branch main updated: Polished doc

[davsclaus]

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 f6c197f  Polished doc
f6c197f is described below

commit f6c197f1cc670e495e06ca2819f8ad934fe58cea
Author: Claus Ibsen 
AuthorDate: Thu Sep 2 15:50:54 2021 +0200

Polished doc
---
 .../generated/resources/org/apache/camel/catalog/models/choice.json   | 2 +-
 .../resources/org/apache/camel/catalog/models/convertBodyTo.json  | 1 +
 .../resources/org/apache/camel/catalog/models/dynamicRouter.json  | 4 ++--
 .../resources/org/apache/camel/catalog/models/recipientList.json  | 2 +-
 .../src/main/docs/modules/eips/pages/choice-eip.adoc  | 3 +--
 .../src/main/docs/modules/eips/pages/convertBodyTo-eip.adoc   | 3 ++-
 .../src/main/docs/modules/eips/pages/dynamicRouter-eip.adoc   | 4 ++--
 .../src/main/docs/modules/eips/pages/recipientList-eip.adoc   | 2 +-
 .../src/generated/resources/org/apache/camel/model/choice.json| 2 +-
 .../src/generated/resources/org/apache/camel/model/dynamicRouter.json | 2 +-
 .../src/generated/resources/org/apache/camel/model/recipientList.json | 2 +-
 .../src/main/java/org/apache/camel/model/ChoiceDefinition.java| 2 +-
 .../src/main/java/org/apache/camel/model/DynamicRouterDefinition.java | 2 +-
 .../src/main/java/org/apache/camel/model/RecipientListDefinition.java | 2 +-
 14 files changed, 17 insertions(+), 16 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/choice.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/choice.json
index 4a1e131..e227b1b 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/choice.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/choice.json
@@ -3,7 +3,7 @@
 "kind": "model",
 "name": "choice",
 "title": "Choice",
-"description": "Routes messages based on a series of predicates",
+"description": "Route messages based on a series of predicates",
 "deprecated": false,
 "label": "eip,routing",
 "javaType": "org.apache.camel.model.ChoiceDefinition",
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/convertBodyTo.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/convertBodyTo.json
index 448e03b..4b84803 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/convertBodyTo.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/convertBodyTo.json
@@ -12,6 +12,7 @@
   },
   "properties": {
 "type": { "kind": "attribute", "displayName": "Type", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "The java type to convert 
to" },
+"mandatory": { "kind": "attribute", "displayName": "Mandatory", 
"required": false, "type": "boolean", "javaType": "java.lang.Boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true, 
"description": "When mandatory then the conversion must return a value (cannot 
be null), if this is not possible then NoTypeConversionAvailableException is 
thrown. Setting this to false could mean conversion is not possible and the 
value is null." },
 "charset": { "kind": "attribute", "displayName": "Charset", "required": 
false, "type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "To use a specific charset 
when converting" },
 "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
 "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dynamicRouter.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dynamicRouter.json
index 67431d9..3025197 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dynamicRouter.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/dynamicRouter.json
@@ -3,7 +3,7 @@
 "kind": "model",
 "name": "dynamicRouter",
 "title": "Dynamic Router",
-"description": "Routes messages based on dynamic rules",
+"description": "Route messages based on dynamic rules",

[camel] branch main updated: Polished

[davsclaus]

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 0fad4b1  Polished
0fad4b1 is described below

commit 0fad4b135ff5183fa8c1de09aeca77e845407c5a
Author: Claus Ibsen 
AuthorDate: Wed Aug 4 13:18:10 2021 +0200

Polished
---
 .../camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java 
b/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java
index b6ea264..3d20e97 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java
@@ -40,7 +40,7 @@ public interface RoutesCollector {
 CamelContext camelContext, String excludePattern, String 
includePattern);
 
 /**
- * Collects all RoutesBuilder from the given directory.
+ * Collects all {@link RoutesBuilder} from the given directory.
  *
  * @param  camelContext   the Camel Context
  * @param  excludePattern exclude pattern (see routesExcludePattern option)

[camel] branch main updated: Polished

[davsclaus]

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 ebec494  Polished
ebec494 is described below

commit ebec4943343432bd593b94c81601b6a5ab66ce20
Author: Claus Ibsen 
AuthorDate: Wed Jul 28 06:40:22 2021 +0200

Polished
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 35df786..3a95d38 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
 1.1.0
 4.0.4
 4.0.4
-1.9.4
+1.9.4
 1.15
 3.2.2
 4.4

[camel] branch main updated: Polished

[davsclaus]

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 999e86e  Polished
999e86e is described below

commit 999e86ed39227f22e034be9847e2058b19dfe4a5
Author: Claus Ibsen 
AuthorDate: Wed Jul 28 06:36:51 2021 +0200

Polished
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index adff12f..35df786 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
 1.1.0
 4.0.4
 4.0.4
-1.9.4
+1.9.4
 1.15
 3.2.2
 4.4
@@ -238,7 +238,7 @@
 4.4.14
 4.5.13
 4.1.4
-   3.21.4.1
+   3.21.4.1
 3.0.32-rc
 1.5.18
 1.0.7

[camel] branch main updated: Polished

[davsclaus]

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 6a4a4ac  Polished
6a4a4ac is described below

commit 6a4a4acca0e43809d3b086106bc81e0158ad9e42
Author: Claus Ibsen 
AuthorDate: Fri Jul 23 10:47:16 2021 +0200

Polished
---
 dsl/camel-jbang/camel-jbang-core/pom.xml | 3 ++-
 dsl/camel-jbang/camel-jbang-main/pom.xml | 4 ++--
 dsl/camel-jbang/pom.xml  | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml 
b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 4ed2fa7..5ff6dac 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -20,13 +20,14 @@
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
 
 org.apache.camel
-camel-jbang
+camel-jbang-parent
 3.12.0-SNAPSHOT
 ../pom.xml
 
 4.0.0
 
 camel-jbang-core
+Camel :: JBang :: Core
 
 
 
diff --git a/dsl/camel-jbang/camel-jbang-main/pom.xml 
b/dsl/camel-jbang/camel-jbang-main/pom.xml
index f4af4ac..696fe50 100644
--- a/dsl/camel-jbang/camel-jbang-main/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-main/pom.xml
@@ -23,7 +23,7 @@
 
 
 org.apache.camel
-camel-jbang
+camel-jbang-parent
 3.12.0-SNAPSHOT
 ../pom.xml
 
@@ -31,7 +31,7 @@
 camel-jbang-main
 jar
 
-Camel :: JBang
+Camel :: JBang :: Main
 Camel JBang
 
 
diff --git a/dsl/camel-jbang/pom.xml b/dsl/camel-jbang/pom.xml
index d9d5c11..d754897 100644
--- a/dsl/camel-jbang/pom.xml
+++ b/dsl/camel-jbang/pom.xml
@@ -27,11 +27,11 @@
 ../pom.xml
 
 
-camel-jbang
+camel-jbang-parent
 pom
 
-Camel :: DSLs :: JBang Modules
-Camel DSLs JBang Modules
+Camel :: JBang :: Parent
+Camel JBang Modules (parent)
 
 
 camel-jbang-core

[camel] branch main updated: Polished

[davsclaus]

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 e2f738c  Polished
e2f738c is described below

commit e2f738c321a16ddf138591e84d8e9bd3dd3852c4
Author: Claus Ibsen 
AuthorDate: Sun Jun 27 12:52:27 2021 +0200

Polished
---
 .../org/apache/camel/component/as2/api/AS2ServerConnection.java   | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
 
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
index 1098dd9..93fa56d 100644
--- 
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
+++ 
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
@@ -178,6 +178,7 @@ public class AS2ServerConnection {
 }
 
 private RequestListenerThread listenerThread;
+private final Object lock = new Object();
 private String as2Version;
 private String originServer;
 private String serverFqdn;
@@ -226,14 +227,12 @@ public class AS2ServerConnection {
 
 public void close() {
 if (listenerThread != null) {
-synchronized (listenerThread) {
+synchronized (lock) {
 try {
 listenerThread.serversocket.close();
 } catch (IOException e) {
 LOG.debug(e.getMessage(), e);
 } finally {
-// TODO This line causes FindBugs (static code analysis 
tool) alert with description
-//  
http://findbugs.sourceforge.net/bugDescriptions.html#ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD
 listenerThread = null;
 }
 }
@@ -242,14 +241,13 @@ public class AS2ServerConnection {
 
 public void listen(String requestUri, HttpRequestHandler handler) {
 if (listenerThread != null) {
-synchronized (listenerThread) {
+synchronized (lock) {
 listenerThread.registerHandler(requestUri, handler);
 }
 }
 }
 
 public void stopListening(String requestUri) {
-
 if (listenerThread != null) {
 listenerThread.unregisterHandler(requestUri);
 }

[camel] branch main updated: Polished

[davsclaus]

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 aedcc9b  Polished
aedcc9b is described below

commit aedcc9be5770191e2a8cbad83efc13270a31307f
Author: Claus Ibsen 
AuthorDate: Sat Jun 19 09:22:55 2021 +0200

Polished
---
 .../resources/org/apache/camel/catalog/docs/bean-language.adoc  | 2 +-
 .../generated/resources/org/apache/camel/catalog/languages/bean.json| 2 +-
 .../src/generated/resources/org/apache/camel/catalog/models/bean.json   | 2 +-
 .../src/generated/resources/org/apache/camel/catalog/models/method.json | 2 +-
 .../src/generated/resources/org/apache/camel/language/bean/bean.json| 2 +-
 components/camel-bean/src/main/docs/bean-language.adoc  | 2 +-
 .../src/generated/resources/org/apache/camel/model/bean.json| 2 +-
 .../src/generated/resources/org/apache/camel/model/language/method.json | 2 +-
 .../src/main/java/org/apache/camel/model/BeanDefinition.java| 2 +-
 .../main/java/org/apache/camel/model/language/MethodCallExpression.java | 2 +-
 docs/components/modules/languages/pages/bean-language.adoc  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
index 98dc589..b806a0b 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
@@ -37,7 +37,7 @@ The Bean method language supports 5 options, which are listed 
below.
 | ref |  | String | Reference to bean to lookup in the registry
 | method |  | String | Name of method to call
 | beanType |  | String | Class name of the bean to use
-| scope | Singleton | String | Scope of bean. When using singleton scope 
(default) the bean is created or looked up only once and reused for the 
lifetime of the endpoint. The bean should be thread-safe in case concurrent 
threads is calling the bean at the same time. When using request scope the bean 
is created or looked up once per request (exchange). This can be used if you 
want to store state on a bean while processing a request and you want to call 
the same bean instance multiple time [...]
+| scope | Singleton | String | Scope of bean. When using singleton scope 
(default) the bean is created or looked up only once and reused for the 
lifetime of the endpoint. The bean should be thread-safe in case concurrent 
threads is calling the bean at the same time. When using request scope the bean 
is created or looked up once per request (exchange). This can be used if you 
want to store state on a bean while processing a request and you want to call 
the same bean instance multiple time [...]
 | trim | true | Boolean | Whether to trim the value to remove leading and 
trailing whitespaces and line breaks
 |===
 // language options: END
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
index d4c70cf..8ce1dce 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
@@ -19,7 +19,7 @@
 "ref": { "kind": "attribute", "displayName": "Ref", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Reference to bean to 
lookup in the registry" },
 "method": { "kind": "attribute", "displayName": "Method", "required": 
false, "type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Name of method to call" },
 "beanType": { "kind": "attribute", "displayName": "Bean Type", "required": 
false, "type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Class name of the bean to 
use" },
-"scope": { "kind": "attribute", "displayName": "Scope", "required": false, 
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype", 
"Request", "Singleton" ], "deprecated": false, "autowired": false, "secret": 
false, "defaultValue": "Singleton", "description": "Scope of bean. When using 
singleton scope (default) the bean is created or looked up only once and reused 
for the lifetime of the endpoint. The bean should be thread-safe in case 
concurrent threads is calling the  [...]
+"scope": { "kind": "attribute", "displayName": "Scope", "required": false, 
"type": "enum", "jav

[camel] branch main updated: Polished

[davsclaus]

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 e2fe174  Polished
e2fe174 is described below

commit e2fe174b1df863a1417021e99597fcb204f4b173
Author: Claus Ibsen 
AuthorDate: Fri May 21 15:44:02 2021 +0200

Polished
---
 components/camel-grape/pom.xml| 3 ---
 .../java/org/apache/camel/component/grape/FilePatchesRepository.java  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index b98b038..3b03f31 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -32,9 +32,6 @@
 The grape component allows you to fetch, load and manage 
additional jars when CamelContext is running
 
 
-
-
-
 
 
 commons-io
diff --git 
a/components/camel-grape/src/main/java/org/apache/camel/component/grape/FilePatchesRepository.java
 
b/components/camel-grape/src/main/java/org/apache/camel/component/grape/FilePatchesRepository.java
index a74293b..ed50910 100644
--- 
a/components/camel-grape/src/main/java/org/apache/camel/component/grape/FilePatchesRepository.java
+++ 
b/components/camel-grape/src/main/java/org/apache/camel/component/grape/FilePatchesRepository.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOError;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.List;
 
@@ -41,7 +42,6 @@ public class FilePatchesRepository implements 
PatchesRepository {
 if (repository.getParentFile() != null) {
 repository.getParentFile().mkdirs();
 }
-
 repository.createNewFile();
 }
 } catch (IOException e) {
@@ -54,7 +54,7 @@ public class FilePatchesRepository implements 
PatchesRepository {
 @Override
 public void install(String coordinates) {
 try {
-FileUtils.writeStringToFile(repository, coordinates + "\n", true);
+FileUtils.writeStringToFile(repository, coordinates + "\n", 
StandardCharsets.UTF_8.name(), true);
 } catch (IOException e) {
 throw new IOError(e);
 }

[camel] branch main updated: Polished:

[davsclaus]

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 6583121  Polished:
6583121 is described below

commit 6583121d66966ca3435415cc5e7f2c12650d36f2
Author: Claus Ibsen 
AuthorDate: Mon May 17 16:37:01 2021 +0200

Polished:
---
 core/camel-api/src/main/java/org/apache/camel/spi/Resource.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/Resource.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/Resource.java
index e56f6af..feac689 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/Resource.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/Resource.java
@@ -30,13 +30,14 @@ import java.nio.charset.StandardCharsets;
  * Describe a resource, such as a file or class path resource.
  */
 public interface Resource {
+
 /**
  * The location of the resource.
  */
 String getLocation();
 
 /**
- * Whether this resource exists..
+ * Whether this resource exists.
  */
 boolean exists();
 
@@ -69,7 +70,9 @@ public interface Resource {
 /**
  * Returns a {@link Reader} that reads from the underlying resource using 
UTF-8 as charset.
  * 
- * Each invocation must return a new {@link Reader}, @see #getInputStream()
+ * Each invocation must return a new {@link Reader}.
+ *
+ * @see #getInputStream()
  */
 default Reader getReader() throws Exception {
 return getReader(StandardCharsets.UTF_8);
@@ -78,7 +81,7 @@ public interface Resource {
 /**
  * Returns a {@link Reader} that reads from the underlying resource using 
the given {@link Charset}
  * 
- * Each invocation must return a new {@link Reader}, @see #getInputStream()
+ * Each invocation must return a new {@link Reader}.
  *
  * @see #getInputStream()
  */

[camel] branch main updated: Polished, fixed CS, regen etc.

[davsclaus]

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 d4a55ce  Polished, fixed CS, regen etc.
d4a55ce is described below

commit d4a55ced749ca1c7c5d8b0529b11205a627d458d
Author: Claus Ibsen 
AuthorDate: Fri May 14 17:14:20 2021 +0200

Polished, fixed CS, regen etc.
---
 .../catalog/docs/avro-jackson-dataformat.adoc  | 11 +++---
 .../catalog/docs/protobuf-jackson-dataformat.adoc  |  9 ++---
 components/camel-jackson-avro/pom.xml  |  1 +
 .../camel/component/jackson/avro/avro-jackson.json |  2 +-
 .../src/main/docs/avro-jackson-dataformat.adoc | 11 +++---
 .../jackson/avro/JacksonAvroDataFormat.java|  4 +--
 .../avro/JacksonAvroLookupResolverTest.java| 18 +-
 .../JacksonAvroMarshalUnmarshalJsonNodeTest.java   | 42 +++---
 .../JacksonAvroMarshalUnmarshalPojoListTest.java   | 26 +++---
 .../avro/JacksonAvroMarshalUnmarshalPojoTest.java  | 18 +-
 components/camel-jackson-protobuf/pom.xml  |  1 +
 .../jackson/protobuf/protobuf-jackson.json |  2 +-
 .../src/main/docs/protobuf-jackson-dataformat.adoc |  9 ++---
 .../protobuf/JacksonProtobufDataFormat.java|  5 +--
 .../JacksonProtobufLookupResolverTest.java | 12 +++
 ...acksonProtobufMarshalUnmarshalJsonNodeTest.java | 12 +++
 .../JacksonProtobufMarshalUnmarshalPojoTest.java   | 12 +++
 docs/components/modules/dataformats/nav.adoc   |  4 +--
 .../dataformats/pages/avro-jackson-dataformat.adoc | 11 +++---
 .../pages/protobuf-jackson-dataformat.adoc |  9 ++---
 20 files changed, 114 insertions(+), 105 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
index ec9f568..95a9514 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
@@ -1,10 +1,11 @@
 [[avro-jackson-dataformat]]
-= Avro Jackson DataFormat
-:docTitle: Avro Jackson
+= Avro DataFormat
+:docTitle: Avro
 :artifactId: camel-jackson-avro
-:description: Marshal POJOs to Avro and back using Jackson
-:since: 3.10
+:description: Marshal POJOs to Avro and back using Jackson.
+:since: 2.14
 :supportLevel: Stable
+include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
 
 *Since Camel {since}*
 
@@ -45,7 +46,6 @@ The Avro dataformat supports 18 options, which are listed 
below.
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
-| contentTypeHeader | true | Boolean | Whether the data format should set the 
Content-Type header with the type from the data format. For example 
application/xml for data formats marshalling to XML, or application/json for 
data formats marshalling to JSON
 | objectMapper |  | String | Lookup and use the existing ObjectMapper with the 
given id when using Jackson.
 | useDefaultObjectMapper | true | Boolean | Whether to lookup and use default 
Jackson ObjectMapper from the registry.
 | unmarshalTypeName |  | String | Class name of the java type to use when 
unmarshalling
@@ -61,6 +61,7 @@ The Avro dataformat supports 18 options, which are listed 
below.
 | allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed 
to attempt to use the CamelJacksonUnmarshalType header during the 
unmarshalling. This should only be enabled when desired to be used.
 | timezone |  | String | If set then Jackson will use the Timezone when 
marshalling/unmarshalling.
 | autoDiscoverObjectMapper | false | Boolean | If set to true then Jackson 
will lookup for an objectMapper into the registry
+| contentTypeHeader | true | Boolean | Whether the data format should set the 
Content-Type header with the type from the data format. For example 
application/xml for data formats marshalling to XML, or application/json for 
data formats marshalling to JSON
 | schemaResolver |  | String | Optional schema resolver used to lookup schemas 
for the data in transit.
 | autoDiscoverSchemaResolver | true | Boolean | When not disabled, the 
SchemaResolver will be looked up into the registry
 |===
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
index 7f6136f..d536741 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/ca

[camel] branch main updated: Polished

[davsclaus]

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 0206b38  Polished
0206b38 is described below

commit 0206b38f3590878945a6b0870a06077dbef1f66d
Author: Claus Ibsen 
AuthorDate: Wed May 12 16:36:25 2021 +0200

Polished
---
 .../main/java/org/apache/camel/component/kamelet/KameletEndpoint.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
index c0ff0fe..9c97e9e 100644
--- 
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
+++ 
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java
@@ -51,8 +51,7 @@ public class KameletEndpoint extends DefaultEndpoint {
 @UriParam(label = "producer", defaultValue = "true")
 private boolean failIfNoConsumers = true;
 
-public KameletEndpoint(
-   String uri,
+public KameletEndpoint(String uri,
KameletComponent component,
String templateId,
String routeId) {