This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 40dec82a19 Fix spelling & grammar in contributor, migration and user
guide documentation
40dec82a19 is described below
commit 40dec82a19e7cd185e4b38d1c4040594adcfc8d9
Author: James Netherton <[email protected]>
AuthorDate: Thu Mar 5 07:28:37 2026 +0000
Fix spelling & grammar in contributor, migration and user guide
documentation
---
docs/modules/ROOT/pages/contributor-guide/ci.adoc | 10 +++++-----
.../pages/contributor-guide/extension-testing.adoc | 4 ++--
docs/modules/ROOT/pages/contributor-guide/index.adoc | 6 +++---
.../ROOT/pages/contributor-guide/release-guide.adoc | 14 +++++++-------
docs/modules/ROOT/pages/migration-guide/2.0.0.adoc | 4 ++--
docs/modules/ROOT/pages/migration-guide/2.6.0.adoc | 6 ++++--
docs/modules/ROOT/pages/migration-guide/2.8.0.adoc | 7 ++++---
.../camel-spring-boot-to-camel-quarkus.adoc | 18 +++++++++---------
docs/modules/ROOT/pages/migration-guide/index.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/cdi.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/command-mode.adoc | 8 ++++----
docs/modules/ROOT/pages/user-guide/configuration.adoc | 2 +-
.../ROOT/pages/user-guide/defining-camel-routes.adoc | 12 ++++++------
.../ROOT/pages/user-guide/dependency-management.adoc | 4 ++--
docs/modules/ROOT/pages/user-guide/first-steps.adoc | 4 ++--
docs/modules/ROOT/pages/user-guide/index.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/native-mode.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/observability.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/testing.adoc | 2 +-
19 files changed, 57 insertions(+), 54 deletions(-)
diff --git a/docs/modules/ROOT/pages/contributor-guide/ci.adoc
b/docs/modules/ROOT/pages/contributor-guide/ci.adoc
index 2f7cd6cf3b..74d00cb423 100644
--- a/docs/modules/ROOT/pages/contributor-guide/ci.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/ci.adoc
@@ -15,21 +15,21 @@
Some scheduled build jobs (mentioned below) run each day to synchronize
branches `camel-main` & `quarkus-main` with the latest work from the `main`
branch.
-Sometimes these jobs fail and it is necessary to fix any issues and manually
rebase the branches. The process for doing this is as follows.
+Sometimes these jobs fail, and it is necessary to fix any issues and manually
rebase the branches. The process for doing this is as follows.
-1. Depending on which branch you're rebasing, you may want to begin by
building the latest Camel `main` or Quarkus `main` branch to avoid pulling in
non-deterministic SNAPSHOT artifacts. Otherwise you can build the branches and
activate the relevant SNAPSHOT repositories via Maven profiles
`-Papache-snapshots` or `-Poss-snapshots`.
+1. Depending on which branch you're rebasing, you may want to begin by
building the latest Camel `main` or Quarkus `main` branch to avoid pulling in
non-deterministic SNAPSHOT artifacts. Otherwise, you can build the branches and
activate the relevant SNAPSHOT repositories via Maven profiles
`-Papache-snapshots` or `-Poss-snapshots`.
-2. Checkout the branch you want to work on. E.g. `git checkout camel-main`.
Make sure the core component version properties in the root `pom.xml` are set
correctly. E.g `camel.version` the parent version for `camel-dependencies` &
`quarkus.version`.
+2. Checkout the branch you want to work on. E.g. `git checkout camel-main`.
Make sure the core component version properties in the root `pom.xml` are set
correctly. E.g. `camel.version` the parent version for `camel-dependencies` &
`quarkus.version`.
3. Ensure your local repository is up-to-date with the remote. `git pull -r`.
-4. Synchronize the branch with the latest work from the main branch. The
'origin' remote is assumed here but you can substitute this for whatever
reference you want to work with. `git fetch origin main && git rebase
origin/main`. You may need to fix up merge conflicts.
+4. Synchronize the branch with the latest work from the main branch. The
'origin' remote is assumed here, but you can substitute this for whatever
reference you want to work with. `git fetch origin main && git rebase
origin/main`. You may need to fix up merge conflicts.
5. Build the project quickly `mvn clean install -Dquickly -T1C`. Remember to
activate any required SNAPSHOT profiles if required.
6. Now you can proceed to work on fixing issues and committing the code. Any
problems that are found to originate in Camel or Quarkus should be tracked by
issues that you create in those projects.
-7. When pushing changes, it's likely that you'll need to 'force push'. I.e
with `--force` or in case others are working simultaneously on the same branch
`--force-with-lease`.
+7. When pushing changes, it's likely that you'll need to 'force push'. I.e.
with `--force` or in case others are working simultaneously on the same branch
`--force-with-lease`.
8. Follow the GitHub CI build to verify that the project builds successfully.
diff --git a/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc
b/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc
index c539a8e22b..c56fbee330 100644
--- a/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/extension-testing.adoc
@@ -61,7 +61,7 @@ Keeping the set of test module dependencies as small as
possible has several adv
For instance, an extension A may configure the native compiler in such a way
that it causes also extension B to work properly in native mode.
However, if B was tested in isolation, it would not work.
* This rule also applies to `junit`, `testcontainers`, `rest-assured`,
`assertj` and similar testing dependencies:
- Unless there is some really good reason to do the opposite, they should be
kept in Maven `test` scope.
+ Unless there is a good reason to do the opposite, they should be kept in
Maven `test` scope.
Having them in the `compile` or `runtime` scope makes them analyzed and
possibly compiled by GraalVM
when the tests are run in native mode.
On one hand, it makes the native compilation slower and on the other hand,
those testing artifacts may cause native compilation issues.
@@ -85,7 +85,7 @@ The grouped module may then be preferred in a CI job that
validates pull request
== Coverage
-When porting a Camel component to Quarkus, we generally do not want to
duplicate all the fine grained tests that are often available in Camel already.
+When porting a Camel component to Quarkus, we generally do not want to
duplicate all the fine-grained tests that are often available in Camel already.
Our main goal is to make sure that the main use cases work well in native mode.
But how can you figure out which are those?
diff --git a/docs/modules/ROOT/pages/contributor-guide/index.adoc
b/docs/modules/ROOT/pages/contributor-guide/index.adoc
index 63127b21fa..54ad7cfbca 100644
--- a/docs/modules/ROOT/pages/contributor-guide/index.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/index.adoc
@@ -46,11 +46,11 @@ A build with integration tests in both the JVM mode and the
native mode:
mvn clean install -Pnative
----
-TIP: You may want to install and use https://github.com/mvndaemon/mvnd[`mvnd`
- the Maven Daemon] for faster builds. When using `mvnd` on MacOS, make sure
the mvnd version matches your installed Maven version (`mvn`) to avoid
compilation failures due to missing dependencies.
+TIP: You may want to install and use https://github.com/mvndaemon/mvnd[`mvnd`
- the Maven Daemon] for faster builds. When using `mvnd` on macOS, make sure
the mvnd version matches your installed Maven version (`mvn`) to avoid
compilation failures due to missing dependencies.
-TIP: For building native images on MacOS, you usually **do not need** to use
`-Dquarkus.native.container-build`. This option is primarily intended for Linux
systems, where the native image build runs inside a Docker container. On MacOS,
GraalVM can typically generate the native image directly, so omitting this
option simplifies the build and avoids unnecessary errors.
+TIP: For building native images on macOS, you usually **do not need** to use
`-Dquarkus.native.container-build`. This option is primarily intended for Linux
systems, where the native image build runs inside a Docker container. On macOS,
GraalVM can typically generate the native image directly, so omitting this
option simplifies the build and avoids unnecessary errors.
-TIP: Extensions that depend on Java AWT are not yet supported for native image
generation on MacOS. If an integration test fails when running `mvnd clean
install -Dnative` due to missing AWT support, this is expected and not
necessarily a problem with your environment. Running the same test in JVM mode
(`mvn clean install`) should work correctly.
+TIP: Extensions that depend on Java AWT are not yet supported for native image
generation on macOS. If an integration test fails when running `mvnd clean
install -Dnative` due to missing AWT support, this is expected and not
necessarily a problem with your environment. Running the same test in JVM mode
(`mvn clean install`) should work correctly.
TIP: To run a specific integration test, you can use the `-Dtest` property.
For example: `mvn clean test -Dtest=MyTest`. To run tests in a specific module,
use the `-pl` (project list) flag: `mvn clean test -pl
integration-tests/my-module`.
diff --git a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
index 8b5244c797..9af81b8b43 100644
--- a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
@@ -4,7 +4,7 @@
The process is _mutatis mutandis_ the same as for the main Apache Camel
repository - see the
xref:manual::release-guide.adoc[Release guide] page of the Camel documentation.
-The process is oriented toward releasing the main branch, some adjustments
might be needed when it come to releasing maintenance branches.
+The process is oriented toward releasing the main branch, some adjustments
might be needed when it comes to releasing maintenance branches.
Here, just a sketch of the repeating part, after you have performed the
initial setup following the
xref:manual::release-guide.adoc[Camel Release guide].
@@ -120,11 +120,11 @@ After the changes have been committed. You can check them
by browsing to https:/
Once the staging repository has been closed, run the `perf-regression` tool in
order to compare the current staging against the previous released version.
It's important that the machine running the `perf-regression` tool be equally
loaded during the run.
-The simplest way would be to take a 1 hour slot at the end of the day, launch
the tool on your main station and then lock the screen.
+The simplest way would be to take a 1-hour slot at the end of the day, launch
the tool on your main station and then lock the screen.
At this stage, one is probably working from the release branch.
The performance regression tool might be present in the `target/checkout`
folder.
-Otherwise a full `mvn clean install -Dquickly` rebuild is needed prior to
running the performance regression tool.
+Otherwise, a full `mvn clean install -Dquickly` rebuild is needed prior to
running the performance regression tool.
Another option is to switch to the main branch, where no rebuild should be
needed.
For instance, running the tool to compare the `2.10.0` staging release against
the `2.9.0` previous release would look as below:
@@ -375,7 +375,7 @@ mvn clean test
== Create a GitHub release
-This will trigger sending a notification to folks watching the Camel Quarkus
github repository,
+This will trigger sending a notification to folks watching the Camel Quarkus
GitHub repository,
so it should ideally happen once the newly released artifacts are available on
https://repo1.maven.org/maven2/org/apache/camel/quarkus/camel-quarkus-bom/[Maven
Central].
The following needs to be done:
@@ -400,9 +400,9 @@ Check the full [release
announcement](https://camel.apache.org/blog/2021/06/came
== Update the project changelog
In the Camel Quarkus main branch, create a new release heading in the
`CHANGELOG.md` file. E.g `## 3.2.0`.
-Under there, you can copy & paste the generated release notes markdown (see
previous step) from the GitHub release page into `CHANGELOG.md`.
+Under there, you can copy & paste the generated release notes Markdown (see
previous step) from the GitHub release page into `CHANGELOG.md`.
-You may also want to clean up the markdown, for instance:
+You may also want to clean up the Markdown, for instance:
* Remove any excess sections like the `What's Changed` heading
* Fix up any abbreviated lines that end in `...`
@@ -481,7 +481,7 @@ git push upstream camel-quarkus-main --force-with-lease
In addition to the above, the following is needed:
-* https://github.com/apache/camel-quarkus/issues/new[Create a ticket] asking a
https://projects.apache.org/committee.html?camel[PMC member] to update the
https://reporter.apache.org/addrelease.html?camel[Apache Committee Report
Helper]. The ticket title could be as follow.
+* https://github.com/apache/camel-quarkus/issues/new[Create a ticket] asking a
https://projects.apache.org/committee.html?camel[PMC member] to update the
https://reporter.apache.org/addrelease.html?camel[Apache Committee Report
Helper]. The ticket title could be as follows.
Release: The Apache Committee Report Helper should be updated by a PMC
member as camel-quarkus-X.Y.Z has been released on YYYY-MM-DD.
== Troubleshooting
diff --git a/docs/modules/ROOT/pages/migration-guide/2.0.0.adoc
b/docs/modules/ROOT/pages/migration-guide/2.0.0.adoc
index 0177b9a01b..d8e720a8c0 100644
--- a/docs/modules/ROOT/pages/migration-guide/2.0.0.adoc
+++ b/docs/modules/ROOT/pages/migration-guide/2.0.0.adoc
@@ -16,7 +16,7 @@ now accessible at the following URLs.
== `camel-quarkus-main` artifact removed
-Before Camel Quarkus 1.8.0, `camel-quarkus-main` used to be a full blown
separate artifact.
+Before Camel Quarkus 1.8.0, `camel-quarkus-main` used to be a full-blown
separate artifact.
In 1.8.0, all functionality of `camel-quarkus-main` was moved to
`camel-quarkus-core`,
while it was still kept for backwards compatibility.
The empty `camel-quarkus-main` artifact was removed completely in Camel
Quarkus 2.0.0.
@@ -28,7 +28,7 @@ This is because all Camel Quarkus extensions transitively
depend on `camel-quark
The functionality available in `camel-quarkus-xml-io` was moved to
`camel-quarkus-xml-io-dsl` in Camel Quarkus 1.8.0.
Since that version `camel-quarkus-xml-io` was deprecated and was kept only for
backwards compatibility reasons as an empty wrapper around
`camel-quarkus-xml-io-dsl`.
-`camel-quarkus-xml-io` was removed fully in Camel Quarkus 2.0.0 and you'll
have to use `camel-quarkus-xml-io-dsl` as a replacement.
+`camel-quarkus-xml-io` was removed fully in Camel Quarkus 2.0.0, and you'll
have to use `camel-quarkus-xml-io-dsl` as a replacement.
== `quarkus.camel.native.resources.*` replaced by
`quarkus.native.resources.includes`
diff --git a/docs/modules/ROOT/pages/migration-guide/2.6.0.adoc
b/docs/modules/ROOT/pages/migration-guide/2.6.0.adoc
index e32d379d58..d5cc2333ab 100644
--- a/docs/modules/ROOT/pages/migration-guide/2.6.0.adoc
+++ b/docs/modules/ROOT/pages/migration-guide/2.6.0.adoc
@@ -13,7 +13,9 @@ If timeout for graceful shutdown is not set and application
runs in a developmen
`DefaultShutdownStrategy` could be configured via `application.properties`.
For example:
-```
+
+[source,properties]
+----
#set graceful timeout to 15 seconds
camel.main.shutdownTimeout = 15
-```
+----
diff --git a/docs/modules/ROOT/pages/migration-guide/2.8.0.adoc
b/docs/modules/ROOT/pages/migration-guide/2.8.0.adoc
index bce307d3af..edda5f8bd9 100644
--- a/docs/modules/ROOT/pages/migration-guide/2.8.0.adoc
+++ b/docs/modules/ROOT/pages/migration-guide/2.8.0.adoc
@@ -10,10 +10,11 @@ This has now changed. Only the FHIR version that the Camel
FHIR component and Da
To enable or disable support for the various FHIR versions, you can add some
configuration properties to `application.properties`. For example.
-```
+[source,properties]
+----
quarkus.camel.fhir.enable-dstu2=true
quarkus.camel.fhir.enable-r4=false
-```
+----
For more information, refer to the xref:reference/extensions/fhir.adoc[Camel
Quarkus FHIR Extension] documentation.
@@ -22,4 +23,4 @@ For more information, refer to the
xref:reference/extensions/fhir.adoc[Camel Qua
The weka and ipfs extensions have been removed from this release because of
issues related to the build infrastructure.
Volunteers wishing to maintain those projects are welcome.
-For more information, refer to the matching
https://github.com/apache/camel-quarkus/issues/3532[github issue].
+For more information, refer to the matching
https://github.com/apache/camel-quarkus/issues/3532[GitHub issue].
diff --git
a/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
b/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
index 66fa7ef6ab..5883bd6e6f 100644
---
a/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
+++
b/docs/modules/ROOT/pages/migration-guide/camel-spring-boot-to-camel-quarkus.adoc
@@ -9,9 +9,9 @@ This part should be relatively minimal for Camel applications.
Most of it is aut
The command to apply it is
[source,shell]
----
+----
mvn -U org.openrewrite.maven:rewrite-maven-plugin:run
-Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring-to-quarkus:RELEASE
-Drewrite.activeRecipes=org.openrewrite.quarkus.spring.SpringBootToQuarkus
-Drewrite.exportDatatables=true
----
+----
== Maven dependencies
@@ -39,14 +39,14 @@ Also ensure that the `quarkus-bom` is imported before the
`camel-quarkus-bom`.
== Remove "Main" annotated class
-If OpenRewirte recipe used, it will have the @QuarkusMain annotation,
otherwise the @SpringBootApplication. This class can be completely removed. if
not removed, the application will start but won't discover and start the Camel
routes.
+If OpenRewrite recipe used, it will have the @QuarkusMain annotation,
otherwise the @SpringBootApplication. This class can be completely removed. if
not removed, the application will start but won't discover and start the Camel
routes.
== Configure Quarkus Maven Plugin
-The OpenRewrite recipe should have added the quarkus-maven-plugin but we need
to add some configuration like this:
+The OpenRewrite recipe should have added the quarkus-maven-plugin, but we need
to add some configuration like this:
[source,xml]
----
+----
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
@@ -62,17 +62,17 @@ The OpenRewrite recipe should have added the
quarkus-maven-plugin but we need to
</execution>
</executions>
</plugin>
----
+----
== Camel route DSLs
-There are no change for Java, Yaml and XML IO DSL.
+There are no change for Java, YAML and XML IO DSL.
In case, the Camel Spring XML DSL was used, it needs to be migrated. Please
see xref:{cq-camel-components}:others:java-xml-io-dsl.adoc[Camel XML IO DSL
documentation]
== Automated tests
-Tests annotated with `@CamelSpringBootTest`, `@CamelSpringTest` and
`@SpringBootTest` must used `@QuarkusTest` instead.
+Tests annotated with `@CamelSpringBootTest`, `@CamelSpringTest` and
`@SpringBootTest` must use `@QuarkusTest` instead.
In case of tests which extends `CamelSpringBootTestSupport`, it must be
replaced by `CamelQuarkusTestsSupport` from `camel-quarkus-junit` dependency
(to add to the pom). Note that this solution is working only for JVM mode.
@@ -86,7 +86,7 @@ The system of profiles are relatively similar. You can check
the https://quarkus
The property `camel.main.run-controller=true` can be removed.
-Some properties for dev profile can be removed when a Quarkus dev service is
available and you can use it out of the box. For instance with Kafka,
`%dev.camel.component.kafka.brokers` property can be removed.
+Some properties for dev profile can be removed when a Quarkus dev service is
available, and you can use it out of the box. For instance with Kafka,
`%dev.camel.component.kafka.brokers` property can be removed.
== Transaction manager
diff --git a/docs/modules/ROOT/pages/migration-guide/index.adoc
b/docs/modules/ROOT/pages/migration-guide/index.adoc
index 313e6e7e83..dddeb3e8db 100644
--- a/docs/modules/ROOT/pages/migration-guide/index.adoc
+++ b/docs/modules/ROOT/pages/migration-guide/index.adoc
@@ -1,4 +1,4 @@
-# Camel Quarkus Migration And Upgrade Guides
+= Camel Quarkus Migration And Upgrade Guides
We do frequent releases, a release almost every month, and even though we
strive to maintain backward compatibility, we may on occasion include a
breaking change in the interest of the long-term evolution of the project.
diff --git a/docs/modules/ROOT/pages/user-guide/cdi.adoc
b/docs/modules/ROOT/pages/user-guide/cdi.adoc
index f2eed848b3..95cb9fcf91 100644
--- a/docs/modules/ROOT/pages/user-guide/cdi.adoc
+++ b/docs/modules/ROOT/pages/user-guide/cdi.adoc
@@ -34,7 +34,7 @@ public class TimerRoute extends RouteBuilder {
<1> The `@ApplicationScoped` annotation is required for `@Inject` and
`@ConfigProperty` to work in a `RouteBuilder`.
Note that the `@ApplicationScoped` beans are managed by the CDI container and
their life cycle is thus a bit more
complex than the one of the plain `RouteBuilder`. In other words, using
`@ApplicationScoped` in `RouteBuilder` comes
-with some boot time penalty and you should therefore only annotate your
`RouteBuilder` with `@ApplicationScoped` when
+with some boot time penalty, and you should therefore only annotate your
`RouteBuilder` with `@ApplicationScoped` when
you really need it.
<2> The value for the `timer.period` property is defined in
`src/main/resources/application.properties` of the example project.
diff --git a/docs/modules/ROOT/pages/user-guide/command-mode.adoc
b/docs/modules/ROOT/pages/user-guide/command-mode.adoc
index 0b8de7d3ee..e0baf9183f 100644
--- a/docs/modules/ROOT/pages/user-guide/command-mode.adoc
+++ b/docs/modules/ROOT/pages/user-guide/command-mode.adoc
@@ -20,7 +20,7 @@ There is just one thing where it would differ from a stock
Camel Quarkus applica
setting an exit condition in `application.properties`.
The rest of the application - most notably the xref:manual::routes.adoc[Route]
-that performs the actual data transformation and transfer - will look the same
like with a traditional Camel service.
+that performs the actual data transformation and transfer - will look the same
as with a traditional Camel service.
== A minimal Hello World!
@@ -89,7 +89,7 @@ something like the following:
2020-07-15 11:32:13,623 INFO [org.apa.cam.mai.BaseMainSupport] (main)
Auto-configuration summary:
2020-07-15 11:32:13,623 INFO [org.apa.cam.mai.BaseMainSupport] (main)
camel.main.durationMaxMessages=1
2020-07-15 11:32:13,700 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Apache Camel 3.4.0 (camel-1) is starting
-2020-07-15 11:32:13,701 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) StreamCaching is not in use. If using streams then its recommended to
enable stream caching. See more details at
http://camel.apache.org/stream-caching.html
+2020-07-15 11:32:13,701 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) StreamCaching is not in use. If using streams then its recommended to
enable stream caching. See more details at
https://camel.apache.org/stream-caching.html
2020-07-15 11:32:13,709 INFO
[org.apa.cam.imp.eng.InternalRouteStartupManager] (main) Route: route1 started
and consuming from: timer://hello
2020-07-15 11:32:13,714 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Total 1 routes, of which 1 are started
2020-07-15 11:32:13,715 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Apache Camel 3.4.0 (camel-1) started in 0.014 seconds
@@ -143,7 +143,7 @@ $ java -Dgreeted.subject=Joe -jar
target/quarkus-app/quarkus-run.jar
2020-07-15 11:42:18,816 INFO [org.apa.cam.mai.BaseMainSupport] (main)
Auto-configuration summary:
2020-07-15 11:42:18,816 INFO [org.apa.cam.mai.BaseMainSupport] (main)
camel.main.durationMaxMessages=1
2020-07-15 11:42:18,892 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Apache Camel 3.4.0 (camel-1) is starting
-2020-07-15 11:42:18,893 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) StreamCaching is not in use. If using streams then its recommended to
enable stream caching. See more details at
http://camel.apache.org/stream-caching.html
+2020-07-15 11:42:18,893 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) StreamCaching is not in use. If using streams then its recommended to
enable stream caching. See more details at
https://camel.apache.org/stream-caching.html
2020-07-15 11:42:18,902 INFO
[org.apa.cam.imp.eng.InternalRouteStartupManager] (main) Route: route1 started
and consuming from: timer://hello
2020-07-15 11:42:18,907 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Total 1 routes, of which 1 are started
2020-07-15 11:42:18,908 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Apache Camel 3.4.0 (camel-1) started in 0.015 seconds
@@ -183,7 +183,7 @@ $ target/*runner -Dgreeted.subject=Joe
2020-07-15 12:19:22,811 INFO [org.apa.cam.mai.BaseMainSupport] (main)
Auto-configuration summary:
2020-07-15 12:19:22,811 INFO [org.apa.cam.mai.BaseMainSupport] (main)
camel.main.durationMaxMessages=1
2020-07-15 12:19:22,812 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Apache Camel 3.4.0 (camel-1) is starting
-2020-07-15 12:19:22,812 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) StreamCaching is not in use. If using streams then its recommended to
enable stream caching. See more details at
http://camel.apache.org/stream-caching.html
+2020-07-15 12:19:22,812 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) StreamCaching is not in use. If using streams then its recommended to
enable stream caching. See more details at
https://camel.apache.org/stream-caching.html
2020-07-15 12:19:22,812 INFO
[org.apa.cam.imp.eng.InternalRouteStartupManager] (main) Route: route1 started
and consuming from: timer://hello
2020-07-15 12:19:22,812 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Total 1 routes, of which 1 are started
2020-07-15 12:19:22,812 INFO [org.apa.cam.imp.eng.AbstractCamelContext]
(main) Apache Camel 3.4.0 (camel-1) started in 0.000 seconds
diff --git a/docs/modules/ROOT/pages/user-guide/configuration.adoc
b/docs/modules/ROOT/pages/user-guide/configuration.adoc
index 063b8622c4..38bfce2cb4 100644
--- a/docs/modules/ROOT/pages/user-guide/configuration.adoc
+++ b/docs/modules/ROOT/pages/user-guide/configuration.adoc
@@ -2,7 +2,7 @@
:page-aliases: user-guide/bootstrap.adoc
Camel Quarkus automatically configures and deploys a Camel Context bean which
by default is started/stopped according to
-the Quarkus Application lifecycle. The configuration step happens at build
time during Quarkus' augmentation phase and
+the Quarkus Application lifecycle. The configuration step happens at build
time during Quarkus' augmentation phase, and
it is driven by the Camel Quarkus extensions which can be tuned using Camel
Quarkus specific `quarkus.camel.*`
properties.
diff --git a/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc
b/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc
index 93e824f455..0b4d38f630 100644
--- a/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc
+++ b/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc
@@ -79,11 +79,11 @@ Path globbing like `camel.main.routes-include-pattern =
*./routes.xml` currently
.Route
[source,xml]
----
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://camel.apache.org/schema/spring";
+<routes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://camel.apache.org/schema/spring";
xsi:schemaLocation="
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd";>
+ https://camel.apache.org/schema/spring
+ https://camel.apache.org/schema/spring/camel-spring.xsd";>
<route id="xml-route">
<from uri="timer:from-xml?period=1000"/>
@@ -110,7 +110,7 @@ The route XML should be in the simplified version like:
.Rest DSL
[source,xml]
----
-<rests xmlns="http://camel.apache.org/schema/spring";>
+<rests xmlns="https://camel.apache.org/schema/spring";>
<rest id="greeting" path="/greeting">
<get path="/hello">
<to uri="direct:greet"/>
@@ -122,7 +122,7 @@ The route XML should be in the simplified version like:
.Route Templates
[source,xml]
----
-<routeTemplates xmlns="http://camel.apache.org/schema/spring";>
+<routeTemplates xmlns="https://camel.apache.org/schema/spring";>
<routeTemplate id="myTemplate">
<templateParameter name="name"/>
<templateParameter name="greeting"/>
diff --git a/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
b/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
index 84f03ae479..1290de4448 100644
--- a/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
+++ b/docs/modules/ROOT/pages/user-guide/dependency-management.adoc
@@ -96,7 +96,7 @@ and depending on whether those versions with higher
precedence work with the res
Assuming you are importing `quarkus-bom` and `quarkus-camel-bom` in your
project, upgrading to new releases should be a simple case of incrementing the
`quarkus.platform.version` property.
-Sometimes it happens that the latest Camel Quarkus release is not yet availble
via the `quarkus-camel-bom`.
+Sometimes it happens that the latest Camel Quarkus release is not yet
available via the `quarkus-camel-bom`.
To work around this, you can replace the
`io.quarkus.platform:quarkus-camel-bom` import with
`org.apache.camel.quarkus:camel-quarkus-bom`.
Note that if you do this, some dependencies in `camel-quarkus-bom` may not be
perfectly aligned with other Quarkus universe members as they would be in
`quarkus-camel-bom`.
@@ -134,7 +134,7 @@ Note that if you do this, some dependencies in
`camel-quarkus-bom` may not be pe
IMPORTANT: Ensure that the major.minor version parts of
`quarkus.platform.version` & `camel-quarkus.version` match. Mixing different
release streams will likely result in build or runtime errors.
-When upgrading from one major release to another (E.g from 2.x to 3.x).
+When upgrading from one major release to another (E.g. from 2.x to 3.x).
Quarkus provides an https://quarkus.io/guides/update-quarkus[updater tool]
that can apply the necessary modifications to your project and make it
compatible with the new major release.
In addition, Camel & Camel Quarkus publish migration guides that document
potential breaking changes.
diff --git a/docs/modules/ROOT/pages/user-guide/first-steps.adoc
b/docs/modules/ROOT/pages/user-guide/first-steps.adoc
index cb9fe4b95c..58c232626a 100644
--- a/docs/modules/ROOT/pages/user-guide/first-steps.adoc
+++ b/docs/modules/ROOT/pages/user-guide/first-steps.adoc
@@ -18,7 +18,7 @@ This guide outlines various ways to create a new Camel
Quarkus application.
== {link-quarkus-code-generator}
Projects can be generated at
https://{link-quarkus-code-generator}[{link-quarkus-code-generator}].
-All of the Camel Quarkus extensions can be found under the 'Integration'
category.
+All the Camel Quarkus extensions can be found under the 'Integration' category.
Use the 'search' field to help with finding extensions that you are interested
in.
Simply select the component extensions that you want to work with
@@ -202,7 +202,7 @@ ls -lh target
...
----
-Note that the `runner` in the listing above has no `.jar` extension and has
the `x` (executable) permission set. Thus
+Note that the `runner` in the listing above has no `.jar` extension and has
the `x` (executable) permission set. Thus,
it can be run directly:
[source,shell]
diff --git a/docs/modules/ROOT/pages/user-guide/index.adoc
b/docs/modules/ROOT/pages/user-guide/index.adoc
index 43d97bd052..6982153c9d 100644
--- a/docs/modules/ROOT/pages/user-guide/index.adoc
+++ b/docs/modules/ROOT/pages/user-guide/index.adoc
@@ -11,7 +11,7 @@ https://github.com/apache/camel-quarkus/issues[Issue reports]
and fixes are welc
== Which Camel components are supported on Quarkus?
-The answer is very easy: those ones that have a Quarkus extension - see the
+The answer is very easy: those that have a Quarkus extension - see the
xref:reference/index.adoc[complete list].
== What's next?
diff --git a/docs/modules/ROOT/pages/user-guide/native-mode.adoc
b/docs/modules/ROOT/pages/user-guide/native-mode.adoc
index 5b7418c4a0..37ef95d7c1 100644
--- a/docs/modules/ROOT/pages/user-guide/native-mode.adoc
+++ b/docs/modules/ROOT/pages/user-guide/native-mode.adoc
@@ -80,7 +80,7 @@ registered for reflection at compile time.
In many cases, application developers do not need to care because Quarkus
extensions are able to detect the classes that
require reflection and register them automatically.
-However, in some situations, Quarkus extensions may miss some classes and it
is up to the application developer to
+However, in some situations, Quarkus extensions may miss some classes, and it
is up to the application developer to
register them. There are two ways to do that:
1. The
`https://quarkus.io/guides/writing-native-applications-tips#alternative-with-registerforreflection[@io.quarkus.runtime.annotations.RegisterForReflection]`
diff --git a/docs/modules/ROOT/pages/user-guide/observability.adoc
b/docs/modules/ROOT/pages/user-guide/observability.adoc
index 8b9c0dad82..b64afa6694 100644
--- a/docs/modules/ROOT/pages/user-guide/observability.adoc
+++ b/docs/modules/ROOT/pages/user-guide/observability.adoc
@@ -39,4 +39,4 @@
https://github.com/apache/camel-quarkus-examples/tree/main/observability
== All-in-One observability
-For a simplified observability experience, use the
xref:reference/extensions/observability-services.adoc[Observability Services]
extension. It provides all of the above mentioned features, together with some
opinionated configuration defaults.
+For a simplified observability experience, use the
xref:reference/extensions/observability-services.adoc[Observability Services]
extension. It provides all the above-mentioned features, together with some
opinionated configuration defaults.
diff --git a/docs/modules/ROOT/pages/user-guide/testing.adoc
b/docs/modules/ROOT/pages/user-guide/testing.adoc
index 3e15fd6f4c..b6b20b218e 100644
--- a/docs/modules/ROOT/pages/user-guide/testing.adoc
+++ b/docs/modules/ROOT/pages/user-guide/testing.adoc
@@ -64,7 +64,7 @@ An important consequence of this, is that all communication
between the tests an
must take one or more of the following forms:
* Network calls. Typically, HTTP or any other network protocol your
application supports.
-* Watching the filesystem for changes (E.g via Camel `file` endpoints).
+* Watching the filesystem for changes (E.g. via Camel `file` endpoints).
* Any other kind of interprocess communication.
`QuarkusIntegrationTest` also provides some additional features that are not
available through `@QuarkusTest`.
