Skip to content

Commit

Permalink
Merge branch 'main' into 2.8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesnetherton committed Apr 4, 2022
2 parents a9410db + a0e4959 commit 7551eaf
Show file tree
Hide file tree
Showing 943 changed files with 65,920 additions and 7,179 deletions.
180 changes: 141 additions & 39 deletions CHANGELOG.md

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-servicebus</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-azure-storage-blob</artifactId>
Expand Down Expand Up @@ -1533,6 +1546,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-google-secret-manager</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-google-sheets</artifactId>
Expand Down Expand Up @@ -3652,6 +3678,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-azure-core-http-client-vertx</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-bouncycastle</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ asciidoc:

min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.3.Final # replace ${quarkus.version}
graalvm-version: 21.3.1 # replace ${graalvm.version}
graalvm-docs-version: 21.3
camel-version: 3.16.0 # replace ${camel.version}
camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.8.0.Final # replace ${quarkus.version}
graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 22.0
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace ${camel.docs.components.xref}
cq-camel-components: 3.16.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-elasticsearch-rest
cqArtifactIdBase: elasticsearch-rest
cqNativeSupported: true
cqStatus: Stable
cqDeprecated: false
cqDeprecated: true
cqJvmSince: 1.0.0
cqNativeSince: 1.0.0
cqCamelPartName: elasticsearch-rest
Expand Down
13 changes: 13 additions & 0 deletions docs/modules/ROOT/examples/components/google-secret-manager.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Do not edit directly!
# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
cqArtifactId: camel-quarkus-google-secret-manager
cqArtifactIdBase: google-secret-manager
cqNativeSupported: false
cqStatus: Preview
cqDeprecated: false
cqJvmSince: 2.8.0
cqNativeSince: n/a
cqCamelPartName: google-secret-manager
cqCamelPartTitle: Google Secret Manager
cqCamelPartDescription: Manage Google Secret Manager Secrets
cqExtensionPageTitle: Google Secret Manager
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/dataformats/ical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.0.0
cqNativeSince: 1.0.0
cqCamelPartName: ical
cqCamelPartTitle: iCal
cqCamelPartDescription: Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
cqCamelPartDescription: Marshal and unmarshal iCal (.ics) documents to/from model objects.
cqExtensionPageTitle: iCal
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/dataformats/jacksonXml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.0.0
cqNativeSince: 1.0.0
cqCamelPartName: jacksonXml
cqCamelPartTitle: Jackson XML
cqCamelPartDescription: Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
cqCamelPartDescription: Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson.
cqExtensionPageTitle: JacksonXML
1 change: 1 addition & 0 deletions docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
*** xref:reference/extensions/google-drive.adoc[Google Drive]
*** xref:reference/extensions/google-mail.adoc[Google Mail]
*** xref:reference/extensions/google-pubsub.adoc[Google Pubsub]
*** xref:reference/extensions/google-secret-manager.adoc[Google Secret Manager]
*** xref:reference/extensions/google-sheets.adoc[Google Sheets]
*** xref:reference/extensions/google-storage.adoc[Google Storage]
*** xref:reference/extensions/google-functions.adoc[GoogleCloudFunctions]
Expand Down
18 changes: 15 additions & 3 deletions docs/modules/ROOT/pages/contributor-guide/release-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ xref:manual::release-guide.adoc[Camel Release guide].
== Pre release tasks

* When releasing after a recent Quarkus release, check for new releases of third party Quarkus extensions we depend on.
They are listed in the https://github.com/apache/camel-quarkus/blob/main/pom.xml#L46-L54[Primary dependencies] section of the top level `pom.xml`.
They are listed in the https://github.com/apache/camel-quarkus/blob/main/pom.xml#L48-L61[Primary dependencies] section of the top level `pom.xml`.
If there are new releases, upgrade the versions accordingly and run `mvn cq:sync-versions -N` from the root directory of the source tree.
* Close the GitHub release https://github.com/apache/camel-quarkus/milestones[milestone] and assign any remaining issues that aren't covered by the release to the next milestone

Expand Down Expand Up @@ -58,6 +58,15 @@ $ cd target/checkout
$ mvn deploy -Papache-release -DskipTests -Denforcer.skip -Dquarkus.build.skip -Dformatter.skip -Dimpsort.skip -Dskip.installyarn -Dskip.yarn -rf :camel-quarkus-openapi-java
----

== Close the Apache staging repository

* Login to the https://repository.apache.org[Apache staging repository] using your Apache LDAP credentials.
* Click on `Staging Repositories`
* Then select `org.apache.camel-quarkus-xxx` in the list of repositories, where `xxx` represents your `username` and `ip`
* Click `Close` on the toolbar above
* This will close the repository from future deployments and make it available for others to view
* After that, a popup window is created, enter the name and version of the artifact being released in the `Description` field and finally click `Close`

== Next version in Camel Quarkus main branch

If there are no substantial commits in the release branch, which need to get merged/cherry-picked to `main`, you can
Expand All @@ -78,6 +87,7 @@ $ git reset upstream/main
$ mvn release:update-versions -DautoVersionSubmodules=true -DdevelopmentVersion=$NEXT_SNAPSHOT -B
$ sed -i "s|<camel.quarkus.jvmSince>[^<]*</camel.quarkus.jvmSince>|<camel.quarkus.jvmSince>$NEXT_RELEASE</camel.quarkus.jvmSince>|" tooling/create-extension-templates/runtime-pom.xml
$ sed -i "s|<camel.quarkus.nativeSince>[^<]*</camel.quarkus.nativeSince>|<camel.quarkus.nativeSince>$NEXT_RELEASE</camel.quarkus.nativeSince>|" tooling/create-extension-templates/runtime-pom.xml
$ mvn cq:sync-versions -N
$ (cd extensions/qute && mvn clean install -Dquickly) # to regen the Qute Camel component metadata
$ git add -A
$ git commit -m "Next is $NEXT_RELEASE"
Expand Down Expand Up @@ -241,7 +251,9 @@ Check the full [release announcement](https://camel.apache.org/blog/2021/06/came

== Upgrade and tag Examples

When: right after the newest Quarkus Platform becomes available on https://repo1.maven.org/maven2/io/quarkus/platform/quarkus-bom/[Maven Central].
This section needs to be executed only when a Quarkus Platform release has been published.
It should be the case most of the time.
In this case, right after the newest Quarkus Platform becomes available on https://repo1.maven.org/maven2/io/quarkus/platform/quarkus-bom/[Maven Central]:

* Make sure all https://github.com/apache/camel-quarkus-examples/pulls[PRs] against `camel-quarkus-main` branch are merged.
* Since Camel Quarkus 2.3.0, the examples should use Quarkus Platform BOMs in the `main` branch. To set it do the following:
Expand Down Expand Up @@ -308,4 +320,4 @@ 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.
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.
* When writing the release announcement blog post, do not forget to add the release note section in https://github.com/apache/camel-website/tree/main/content/releases/q, and to add the branch for documentation in https://github.com/apache/camel-website/blob/main/antora-playbook.yml[antora-playbook.yml].
* When writing the release announcement blog post, do not forget to add the release note section in https://github.com/apache/camel-website/tree/main/content/releases/q, and to add the branch for documentation in https://github.com/apache/camel-website/blob/main/antora-playbook-snippets/antora-playbook.yml[antora-playbook.yml].
25 changes: 25 additions & 0 deletions docs/modules/ROOT/pages/migration-guide/2.8.0.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
= Camel Quarkus 2.8.0 Migration Guide

The following guide outlines how to adapt your code to changes that were made in Camel Quarkus 2.8.0 & Quarkus 2.8.0.Final.

== Change to default values of `quarkus.camel.fhir.enable` configuration

In previous releases, the FHIR extension default was to enable support for all FHIR versions.

This has now changed. Only the FHIR version that the Camel FHIR component and DataFormat use by default are enabled (R4).

To enable or disable support for the various FHIR versions, you can add some configuration properties to `application.properties`. For example.

```
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.

== Removal of the weka and ipfs extensions

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].
1 change: 1 addition & 0 deletions docs/modules/ROOT/pages/migration-guide/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ We do frequent releases, a release almost every month, and even though we strive

Listed here are guides on how to migrate between major versions and anything of significance to watch for when upgrading from minor versions.

* xref:migration-guide/2.8.0.adoc[Camel Quarkus 2.7.0 to Camel Quarkus 2.8.0 migration guide]
* xref:migration-guide/2.7.0.adoc[Camel Quarkus 2.6.0 to Camel Quarkus 2.7.0 migration guide]
* xref:migration-guide/2.6.0.adoc[Camel Quarkus 2.5.0 to Camel Quarkus 2.6.0 migration guide]
* xref:migration-guide/2.2.0.adoc[Camel Quarkus 2.1.0 to Camel Quarkus 2.2.0 migration guide]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ

Implementation of this extension leverages the https://quarkus.io/guides/validation[Quarkus Hibernate Validator extension].

Therefore it is not possible to configure the `ValidatorFactory` by Camel's properties ('constraintValidatorFactory`, `messageInterpolator`, `traversableResolver`, `validationProviderResolver` and `validatorFactory`).
Therefore it is not possible to configure the `ValidatorFactory` by Camel's properties (`constraintValidatorFactory`, `messageInterpolator`, `traversableResolver`, `validationProviderResolver` and `validatorFactory`).

You can configure the `ValidatorFactory` by the creation of beans which will be injected into the default `ValidatorFactory` (created by Quarkus).
See the https://quarkus.io/guides/validation#hibernate-validator-extension-and-cdi[Quarkus CDI documentation] for more information.
Expand Down
9 changes: 8 additions & 1 deletion docs/modules/ROOT/pages/reference/extensions/core.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,14 @@ Note that in native mode, some classes may need to be registered for reflection.
needs to be link:https://quarkus.io/guides/writing-native-applications-tips#registering-for-reflection[registered for reflection].

==== Using dynamic type resolution in native mode
When dynamically resolving a type from simple expressions like `${mandatoryBodyAs(TYPE)}`, `${type:package.Enum.CONSTANT}` or `$\{body} is TYPE`, it may be needed to register some classes for reflection manually.
When dynamically resolving a type from simple expressions like:

* `simple("${mandatoryBodyAs(TYPE)}")`
* `simple("${type:package.Enum.CONSTANT}")`
* `from("...").split(bodyAs(TYPE.class))`
* `simple("$\{body} is TYPE")`

It may be needed to register some classes for reflection manually.

For instance, the simple expression below is dynamically resolving the type `java.nio.ByteBuffer` at runtime:
[source,java]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
:cq-artifact-id: camel-quarkus-elasticsearch-rest
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
:cq-status-deprecation: Stable Deprecated
:cq-description: Send requests to ElasticSearch via REST API
:cq-deprecated: false
:cq-deprecated: true
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0

[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##

Send requests to ElasticSearch via REST API

Expand Down
29 changes: 21 additions & 8 deletions docs/modules/ROOT/pages/reference/extensions/fhir.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].

== Additional Camel Quarkus configuration

The https://hapifhir.io/download.html[hapi-fhir] library, on which camel-fhir depends on, heavily uses reflection which affects performance in Quarkus (memory footprint, build time, CPU resources etc...). The following options are provided to improve on this:

By default, only FHIR versions `R4` & `DSTU3` are enabled in native mode, since they are the default values on the FHIR component and DataFormat.


[width="100%",cols="80,5,15",options="header"]
Expand All @@ -59,27 +60,39 @@ The https://hapifhir.io/download.html[hapi-fhir] library, on which camel-fhir de

|icon:lock[title=Fixed at build time] [[quarkus.camel.fhir.enable-dstu2]]`link:#quarkus.camel.fhir.enable-dstu2[quarkus.camel.fhir.enable-dstu2]`

Enable FHIR DSTU2 Specs.
Enable FHIR DSTU2 Specs in native mode.
| `boolean`
| `true`
| `false`

|icon:lock[title=Fixed at build time] [[quarkus.camel.fhir.enable-dstu2_hl7org]]`link:#quarkus.camel.fhir.enable-dstu2_hl7org[quarkus.camel.fhir.enable-dstu2_hl7org]`

Enable FHIR DSTU2_HL7ORG Specs in native mode.
| `boolean`
| `false`

|icon:lock[title=Fixed at build time] [[quarkus.camel.fhir.enable-dstu2_1]]`link:#quarkus.camel.fhir.enable-dstu2_1[quarkus.camel.fhir.enable-dstu2_1]`

Enable FHIR DSTU2_1 Specs in native mode.
| `boolean`
| `false`

|icon:lock[title=Fixed at build time] [[quarkus.camel.fhir.enable-dstu3]]`link:#quarkus.camel.fhir.enable-dstu3[quarkus.camel.fhir.enable-dstu3]`

Enable FHIR DSTU3 Specs.
Enable FHIR DSTU3 Specs in native mode.
| `boolean`
| `true`
| `false`

|icon:lock[title=Fixed at build time] [[quarkus.camel.fhir.enable-r4]]`link:#quarkus.camel.fhir.enable-r4[quarkus.camel.fhir.enable-r4]`

Enable FHIR R4 Specs.
Enable FHIR R4 Specs in native mode.
| `boolean`
| `true`

|icon:lock[title=Fixed at build time] [[quarkus.camel.fhir.enable-r5]]`link:#quarkus.camel.fhir.enable-r5[quarkus.camel.fhir.enable-r5]`

Enable FHIR R5 Specs.
Enable FHIR R5 Specs in native mode.
| `boolean`
| `true`
| `false`
|===

[.configuration-legend]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Do not edit directly!
// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
= Google Secret Manager
:linkattrs:
:cq-artifact-id: camel-quarkus-google-secret-manager
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
:cq-description: Manage Google Secret Manager Secrets
:cq-deprecated: false
:cq-jvm-since: 2.8.0
:cq-native-since: n/a

[.badges]
[.badge-key]##JVM since##[.badge-supported]##2.8.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##

Manage Google Secret Manager Secrets

== What's inside

* xref:{cq-camel-components}::google-secret-manager-component.adoc[Google Secret Manager component], URI syntax: `google-secret-manager:project`

Please refer to the above link for usage and configuration details.

== Maven coordinates

[source,xml]
----
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-google-secret-manager</artifactId>
</dependency>
----

Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/reference/extensions/ical.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
:cq-description: Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
:cq-description: Marshal and unmarshal iCal (.ics) documents to/from model objects.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0

[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##

Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
Marshal and unmarshal iCal (.ics) documents to/from model objects.

== What's inside

Expand Down
13 changes: 13 additions & 0 deletions docs/modules/ROOT/pages/reference/extensions/infinispan.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,16 @@ Or add the coordinates to your existing project:
----

Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.

== Camel Quarkus limitations

=== InfinispanRemoteAggregationRepository in native mode

At present the `InfinispanRemoteAggregationRepository` is not supported in native mode.


== Additional Camel Quarkus configuration

You can either configure the Infinispan client via the relevant Camel Infinispan component & endpoint options, or you
may use the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties].

4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/reference/extensions/jacksonxml.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
:cq-description: Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
:cq-description: Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0

[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##

Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
Unmarshal an XML payloads to POJOs and back using XMLMapper extension of Jackson.

== What's inside

Expand Down
Loading

0 comments on commit 7551eaf

Please sign in to comment.