This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit fd4d80ccad85b1e8bde509b8657464f28422693d
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Sep 7 09:30:51 2020 +0100
Upgrade to Camel 3.6.0
---
docs/modules/ROOT/pages/reference/components/atmos.adoc | 2 +-
.../modules/ROOT/pages/reference/components/vertx-http.adoc | 2 +-
.../ROOT/pages/reference/components/vertx-websocket.adoc | 2 +-
.../ROOT/pages/reference/extensions/azure-storage-blob.adoc | 2 +-
.../pages/reference/extensions/azure-storage-queue.adoc | 2 +-
.../resources/org/apache/camel/component/qute/qute.json | 4 +++-
.../quarkus/component/caffeine/it/CaffeineResource.java | 13 ++-----------
pom.xml | 2 +-
8 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/components/atmos.adoc
b/docs/modules/ROOT/pages/reference/components/atmos.adoc
index fff2add..b9c5c12 100644
--- a/docs/modules/ROOT/pages/reference/components/atmos.adoc
+++ b/docs/modules/ROOT/pages/reference/components/atmos.adoc
@@ -11,5 +11,5 @@
:cq-native-since: n/a
:cq-camel-part-name: atmos
:cq-camel-part-title: Atmos
-:cq-camel-part-description: Integract with EMC's ViPR object data services
using the Atmos Client.
+:cq-camel-part-description: Integrate with EMC's ViPR object data services
using the Atmos Client.
:cq-extension-page-title: Atmos
diff --git a/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
b/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
index 04d087b..eea440c 100644
--- a/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
+++ b/docs/modules/ROOT/pages/reference/components/vertx-http.adoc
@@ -11,5 +11,5 @@
:cq-native-since: 1.1.0
:cq-camel-part-name: vertx-http
:cq-camel-part-title: Vert.x HTTP Client
-:cq-camel-part-description: Camel HTTP client support with Vert.x
+:cq-camel-part-description: Send requests to external HTTP servers using Vert.x
:cq-extension-page-title: Vert.x HTTP Client
diff --git a/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
b/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
index 58801bf..16b28b1 100644
--- a/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
+++ b/docs/modules/ROOT/pages/reference/components/vertx-websocket.adoc
@@ -11,5 +11,5 @@
:cq-native-since: 1.1.0
:cq-camel-part-name: vertx-websocket
:cq-camel-part-title: Vert.x WebSocket
-:cq-camel-part-description: Camel WebSocket support with Vert.x
+:cq-camel-part-description: Expose WebSocket endpoints and connect to remote
WebSocket servers using Vert.x
:cq-extension-page-title: Vert.x WebSocket
diff --git
a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
index 0f63da3..31559cd 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
@@ -17,7 +17,7 @@ Store and retrieve blobs from Azure Storage Blob Service
using SDK v12.
== What's inside
-*
https://camel.apache.org/components/latest/azure-storage-blob-component.html[Azure
Storage Blob Service component], URI syntax: `azure-storage-blob:containerName`
+*
https://camel.apache.org/components/latest/azure-storage-blob-component.html[Azure
Storage Blob Service component], URI syntax:
`azure-storage-blob:accountName/containerName`
Please refer to the above link for usage and configuration details.
diff --git
a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
index 95c0b8d..a97d5d5 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
@@ -17,7 +17,7 @@ The azure-storage-queue component is used for storing and
retrieving the message
== What's inside
-*
https://camel.apache.org/components/latest/azure-storage-queue-component.html[Azure
Storage Queue Service component], URI syntax: `azure-storage-queue:queueName`
+*
https://camel.apache.org/components/latest/azure-storage-queue-component.html[Azure
Storage Queue Service component], URI syntax:
`azure-storage-queue:accountName/queueName`
Please refer to the above link for usage and configuration details.
diff --git
a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
index c39fc40..6479427 100644
---
a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
+++
b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
@@ -16,6 +16,8 @@
"extendsScheme": "",
"syntax": "qute:resourceUri",
"async": false,
+ "api": false,
+ "apiPropertyQualifier": "",
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false
@@ -23,7 +25,7 @@
"componentProperties": {
"allowTemplateFromHeader": { "kind": "property", "displayName": "Allow
Template From Header", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "description": "Whether to allow to use resource
template from header or not (default false). Enabling this allows to specify
dynamic templates via message header. However this can be seen as a potential
security vulnerability if the he [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
- "basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
+ "basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
"quteEngine": { "kind": "property", "displayName": "Qute Engine", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.quarkus.qute.Engine", "deprecated": false, "secret": false,
"description": "To use the Engine otherwise a new engine is created" }
},
"properties": {
diff --git
a/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
b/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
index 889e345..27e7e95 100644
---
a/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
+++
b/integration-tests/caffeine/src/main/java/org/apache/camel/quarkus/component/caffeine/it/CaffeineResource.java
@@ -27,7 +27,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import com.github.benmanes.caffeine.cache.Cache;
import org.apache.camel.CamelContext;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.component.caffeine.CaffeineConstants;
@@ -59,11 +58,7 @@ public class CaffeineResource {
@PathParam("key") String key,
String value) {
- // This won't be needed after
https://issues.apache.org/jira/browse/CAMEL-15524
- FluentProducerTemplate t =
context.getRegistry().lookupByNameAndType(cacheName, Cache.class) != null
- ? template.toF("%s://%s?cache=#%s", componentName, cacheName,
cacheName)
- : template.toF("%s://%s", componentName, cacheName);
-
+ FluentProducerTemplate t = template.toF("%s://%s", componentName,
cacheName);
t.withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_PUT);
t.withHeader(CaffeineConstants.KEY, key);
t.withBody(value);
@@ -79,11 +74,7 @@ public class CaffeineResource {
@PathParam("cacheName") String cacheName,
@PathParam("key") String key) {
- // This won't be needed after
https://issues.apache.org/jira/browse/CAMEL-15524
- FluentProducerTemplate t =
context.getRegistry().lookupByNameAndType(cacheName, Cache.class) != null
- ? template.toF("%s://%s?cache=#%s", componentName, cacheName,
cacheName)
- : template.toF("%s://%s", componentName, cacheName);
-
+ FluentProducerTemplate t = template.toF("%s://%s", componentName,
cacheName);
t.withHeader(CaffeineConstants.ACTION, CaffeineConstants.ACTION_GET);
t.withHeader(CaffeineConstants.KEY, key);
diff --git a/pom.xml b/pom.xml
index f55a2e0..86b0441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<awssdk1-swf-libs.version>1.11.22</awssdk1-swf-libs.version>
<awssdk2.version>2.14.3</awssdk2.version>
<bouncycastle.version>1.66</bouncycastle.version>
- <camel.version>3.5.0</camel.version>
+ <camel.version>3.6.0-SNAPSHOT</camel.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version><!-- keep
in sync with Camel -->
<commons-cli.version>1.4</commons-cli.version><!-- keep in sync with
Quarkus, via quarkus-bootstrap-core -->
<debezium.version>1.2.1.Final</debezium.version>
