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 75ec17657abff88578fe7c782fcbcbce8554c21b
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.adoc | 6 +++---
.../ROOT/pages/reference/extensions/azure-storage-blob.adoc | 2 +-
.../pages/reference/extensions/azure-storage-queue.adoc | 2 +-
docs/modules/ROOT/pages/reference/index.adoc | 6 +++---
.../resources/org/apache/camel/component/qute/qute.json | 4 +++-
.../quarkus/component/caffeine/it/CaffeineResource.java | 13 ++-----------
pom.xml | 2 +-
7 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/components.adoc
b/docs/modules/ROOT/pages/reference/components.adoc
index a2a14f1..da92995 100644
--- a/docs/modules/ROOT/pages/reference/components.adoc
+++ b/docs/modules/ROOT/pages/reference/components.adoc
@@ -35,7 +35,7 @@ Stable | 1.0.0 | Call external HTTP services using Async Http
Client.
Stable | 1.0.0 | Exchange data with external Websocket servers using Async
Http Client.
| xref:reference/extensions/atmos.adoc[Atmos] |
[.camel-element-artifact]##camel-quarkus-atmos## | [.camel-element-JVM]##JVM## +
-Preview | 1.1.0 | Integract with EMC's ViPR object data services using the
Atmos Client.
+Preview | 1.1.0 | Integrate with EMC's ViPR object data services using the
Atmos Client.
| xref:reference/extensions/atom.adoc[Atom] |
[.camel-element-artifact]##camel-quarkus-atom## | [.camel-element-JVM]##JVM## +
Preview | 1.1.0 | Poll Atom RSS feeds.
@@ -851,10 +851,10 @@ Preview | 1.1.0 | Transform messages using a Velocity
template.
Stable | 1.0.0 | Send and receive messages to/from Vert.x Event Bus.
| xref:reference/extensions/vertx-http.adoc[Vert.x HTTP Client] |
[.camel-element-artifact]##camel-quarkus-vertx-http## |
[.camel-element-Native]##Native## +
-Stable | 1.1.0 | Camel HTTP client support with Vert.x
+Stable | 1.1.0 | Send requests to external HTTP servers using Vert.x
| xref:reference/extensions/vertx-websocket.adoc[Vert.x WebSocket] |
[.camel-element-artifact]##camel-quarkus-vertx-websocket## |
[.camel-element-Native]##Native## +
-Stable | 1.1.0 | Camel WebSocket support with Vert.x
+Stable | 1.1.0 | Expose WebSocket endpoints and connect to remote WebSocket
servers using Vert.x
| xref:reference/extensions/vm.adoc[VM] |
[.camel-element-artifact]##camel-quarkus-vm## |
[.camel-element-Native]##Native## +
Stable | 0.3.0 | Call another endpoint in the same CamelContext asynchronously.
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 75db7f7..67fa955 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc
@@ -12,7 +12,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 79cb82a..98979f4 100644
--- a/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/azure-storage-queue.adoc
@@ -12,7 +12,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/docs/modules/ROOT/pages/reference/index.adoc
b/docs/modules/ROOT/pages/reference/index.adoc
index 12f19d6..1b1c08c 100644
--- a/docs/modules/ROOT/pages/reference/index.adoc
+++ b/docs/modules/ROOT/pages/reference/index.adoc
@@ -51,7 +51,7 @@ Stable | 1.0.0 | Call external HTTP services using Async Http
Client.
Stable | 1.0.0 | Exchange data with external Websocket servers using Async
Http Client.
| xref:reference/extensions/atmos.adoc[Atmos] | camel-quarkus-atmos |
[.camel-element-JVM]##JVM## +
-Preview | 1.1.0 | Integract with EMC's ViPR object data services using the
Atmos Client.
+Preview | 1.1.0 | Integrate with EMC's ViPR object data services using the
Atmos Client.
| xref:reference/extensions/atom.adoc[Atom] | camel-quarkus-atom |
[.camel-element-JVM]##JVM## +
Preview | 1.1.0 | Poll Atom RSS feeds.
@@ -816,10 +816,10 @@ Preview | 1.1.0 | Transform messages using a Velocity
template.
Stable | 1.0.0 | Send and receive messages to/from Vert.x Event Bus.
| xref:reference/extensions/vertx-http.adoc[Vert.x HTTP Client] |
camel-quarkus-vertx-http | [.camel-element-Native]##Native## +
-Stable | 1.1.0 | Camel HTTP client support with Vert.x
+Stable | 1.1.0 | Send requests to external HTTP servers using Vert.x
| xref:reference/extensions/vertx-websocket.adoc[Vert.x WebSocket] |
camel-quarkus-vertx-websocket | [.camel-element-Native]##Native## +
-Stable | 1.1.0 | Camel WebSocket support with Vert.x
+Stable | 1.1.0 | Expose WebSocket endpoints and connect to remote WebSocket
servers using Vert.x
| xref:reference/extensions/vm.adoc[VM] | camel-quarkus-vm |
[.camel-element-Native]##Native## +
Stable | 0.3.0 | Call another endpoint in the same CamelContext asynchronously.
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 4d60727..089e5da 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>
