You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/09/10 03:09:45 UTC
[camel-quarkus] branch camel-master updated (548f5cd -> 37931b8)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 548f5cd Upgrade to Camel 3.6.0
discard 37008fc Remove createEndpoint method override in QuarkusVertxWebsocketComponent
discard f4d4a79 Remove QuarkusVertxHttpBinding
add 9542abe AWS2-Lambda Extension: Adding interceptors and align to the other extensions
add cc4df64 Fixed CS
add ef739ea Tests for #1563 contextPath ignored for platform-http with REST DSL
add 2ed8db3 Fix comment spelling
add 39d404d Test for #1497 xml-io should pass namespace info to NamespaceAware elements
add 27d5609 Do not run main-command-mode and master tests on Quarkus Platform
add 2a1824b Added ssl authentation to the nats extensions
add 21e3ec3 Document cq:create -Dcq.nativeSupported=false for creating JVM-only extensions #1662
add 5a4af97 Upgrade to Quarkus 1.8.0.Final
add ba705d8 Add PGP key for James Netherton
add 6a69bdc Upgrade Quarkus Qpid JMS to 0.18.0
add b7c6875 camel-quarkus-main - Uses reflection for setting its name #1765
add d6a6b44 Add some pre-release tasks to the release guide
new 5242af1 Remove QuarkusVertxHttpBinding
new ec682dc Remove createEndpoint method override in QuarkusVertxWebsocketComponent
new 37931b8 Upgrade to Camel 3.6.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (548f5cd)
\
N -- N -- N refs/heads/camel-master (37931b8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
KEYS | 36 +++++++++++++++++++
docs/modules/ROOT/nav.adoc | 1 +
.../create-jvm-only-extension.adoc | 38 +++++++++++++++++++++
.../contributor-guide/create-new-extension.adoc | 24 ++++++-------
.../pages/contributor-guide/release-guide.adoc | 6 ++++
.../ROOT/pages/reference/extensions/nats.adoc | 6 ++++
.../core/deployment/CamelRegistryProcessor.java | 16 +++++++++
.../lambda/deployment/Aws2LambdaProcessor.java | 38 +++++++++++++++++++--
.../component/nats/deployment/NatsProcessor.java | 6 ++++
integration-tests/main-xml-io/pom.xml | 17 +++++++++
.../camel/quarkus/main/CoreMainXmlIoResource.java | 14 ++++++++
.../src/main/resources/routes/my-routes.xml | 10 ++++++
.../camel/quarkus/main/CoreMainXmlIoTest.java | 17 +++++++++
.../camel/quarkus/main/CoreMainResource.java | 1 +
.../apache/camel/quarkus/main/CoreMainTest.java | 4 +++
.../component/nats/it/NatsConfiguration.java | 11 ++++++
.../quarkus/component/nats/it/NatsRoutes.java | 28 +++++++++++++++
.../src/main/resources/application.properties | 2 +-
.../nats/src/main/resources/certs/keystore.jks | Bin 0 -> 3477 bytes
.../nats/src/main/resources/certs/truststore.jks | Bin 0 -> 1162 bytes
.../camel/quarkus/component/nats/it/NatsTest.java | 14 ++++++++
.../component/nats/it/NatsTestResource.java | 28 ++++++++++++---
.../nats/src/test/resources/certs/ca.pem | 20 +++++++++++
.../nats/src/test/resources/certs/key.pem | 28 +++++++++++++++
.../nats/src/test/resources/certs/server.pem | 20 +++++++++++
.../platform/http/it/PlatformHttpRouteBuilder.java | 7 ++++
.../component/http/server/it/PlatformHttpTest.java | 22 ++++++------
integration-tests/weather/pom.xml | 2 +-
pom.xml | 4 +--
tooling/test-list/pom.xml | 2 ++
30 files changed, 389 insertions(+), 33 deletions(-)
create mode 100644 docs/modules/ROOT/pages/contributor-guide/create-jvm-only-extension.adoc
copy integration-tests/{jolt => nats}/src/main/resources/application.properties (94%)
create mode 100644 integration-tests/nats/src/main/resources/certs/keystore.jks
create mode 100644 integration-tests/nats/src/main/resources/certs/truststore.jks
create mode 100644 integration-tests/nats/src/test/resources/certs/ca.pem
create mode 100644 integration-tests/nats/src/test/resources/certs/key.pem
create mode 100644 integration-tests/nats/src/test/resources/certs/server.pem
[camel-quarkus] 02/03: Remove createEndpoint method override in
QuarkusVertxWebsocketComponent
Posted by gi...@apache.org.
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 ec682dccf1b43c3f97750f77277ba5dc6fcd70a4
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 9 07:39:50 2020 +0100
Remove createEndpoint method override in QuarkusVertxWebsocketComponent
Fixes #1737
---
.../vertx/websocket/VertxWebsocketRecorder.java | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java b/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java
index fc40cc3..b93011b 100644
--- a/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java
+++ b/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java
@@ -16,16 +16,13 @@
*/
package org.apache.camel.quarkus.component.vertx.websocket;
-import java.util.Map;
import java.util.concurrent.ExecutionException;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
-import org.apache.camel.Endpoint;
import org.apache.camel.component.vertx.websocket.VertxWebsocketComponent;
-import org.apache.camel.component.vertx.websocket.VertxWebsocketEndpoint;
import org.apache.camel.component.vertx.websocket.VertxWebsocketHost;
import org.apache.camel.component.vertx.websocket.VertxWebsocketHostConfiguration;
import org.apache.camel.component.vertx.websocket.VertxWebsocketHostKey;
@@ -35,25 +32,13 @@ public class VertxWebsocketRecorder {
public RuntimeValue<VertxWebsocketComponent> createVertxWebsocketComponent(RuntimeValue<Vertx> vertx,
RuntimeValue<Router> router) {
- QuarkusVertxWebsocketComponent component = new QuarkusVertxWebsocketComponent(router.getValue());
+ QuarkusVertxWebsocketComponent component = new QuarkusVertxWebsocketComponent();
component.setVertx(vertx.getValue());
+ component.setRouter(router.getValue());
return new RuntimeValue<>(component);
}
static final class QuarkusVertxWebsocketComponent extends VertxWebsocketComponent {
- private final Router router;
-
- public QuarkusVertxWebsocketComponent(Router router) {
- this.router = router;
- }
-
- @Override
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- VertxWebsocketEndpoint endpoint = (VertxWebsocketEndpoint) super.createEndpoint(uri, remaining, parameters);
- endpoint.getConfiguration().setRouter(router);
- return endpoint;
- }
-
@Override
protected VertxWebsocketHost createVertxWebsocketHost(VertxWebsocketHostConfiguration hostConfiguration,
VertxWebsocketHostKey hostKey) {
[camel-quarkus] 01/03: Remove QuarkusVertxHttpBinding
Posted by gi...@apache.org.
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 5242af179557e17b69a9445777b855acb7e26356
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 9 07:39:13 2020 +0100
Remove QuarkusVertxHttpBinding
Fixes #1675
---
.../vertx/http/CamelVertxHttpRecorder.java | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java
index e59be03..2315134 100644
--- a/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java
+++ b/extensions/vertx-http/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/http/CamelVertxHttpRecorder.java
@@ -19,14 +19,7 @@ package org.apache.camel.quarkus.component.vertx.http;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import io.vertx.core.Vertx;
-import io.vertx.core.buffer.Buffer;
-import io.vertx.ext.web.client.HttpRequest;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.vertx.http.DefaultVertxHttpBinding;
import org.apache.camel.component.vertx.http.VertxHttpComponent;
-import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.util.ObjectHelper;
@Recorder
public class CamelVertxHttpRecorder {
@@ -34,20 +27,6 @@ public class CamelVertxHttpRecorder {
public RuntimeValue<?> createVertxHttpComponent(RuntimeValue<Vertx> vertx) {
VertxHttpComponent component = new VertxHttpComponent();
component.setVertx(vertx.getValue());
- component.setVertxHttpBinding(new QuarkusVertxHttpBinding());
return new RuntimeValue<>(component);
}
-
- // TODO: Remove when https://issues.apache.org/jira/browse/CAMEL-15495 is resolved
- static class QuarkusVertxHttpBinding extends DefaultVertxHttpBinding {
- @Override
- public void populateRequestHeaders(Exchange exchange, HttpRequest<Buffer> request, HeaderFilterStrategy strategy) {
- super.populateRequestHeaders(exchange, request, strategy);
-
- String contentType = ExchangeHelper.getContentType(exchange);
- if (ObjectHelper.isNotEmpty(contentType)) {
- request.putHeader(Exchange.CONTENT_TYPE, contentType);
- }
- }
- }
}
[camel-quarkus] 03/03: Upgrade to Camel 3.6.0
Posted by gi...@apache.org.
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 37931b8e5bbd0c317d70e209379c6972da063c6e
Author: James Netherton <ja...@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 +++---
.../modules/ROOT/pages/reference/extensions/azure-storage-blob.adoc | 2 +-
.../ROOT/pages/reference/extensions/azure-storage-queue.adoc | 2 +-
docs/modules/ROOT/pages/reference/index.adoc | 6 +++---
.../generated/resources/org/apache/camel/component/qute/qute.json | 2 ++
pom.xml | 2 +-
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/pages/reference/components.adoc
index 40ab747..ca684ac 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 6012c3d..f8c1083 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 8a28402..8806ecf 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
diff --git a/pom.xml b/pom.xml
index a0cedd1..49129c1 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>