You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/03/02 17:31:39 UTC
[camel-quarkus] branch camel-master updated (14518be -> 6e5d034)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 14518be Upgrade to Camel 3.2.0 - WIP
add 466e0cf Add websocket-jsr356 extension
add ac095a1 Remove MongoDB dependency overrides
new 6e5d034 Upgrade to Camel 3.2.0 - WIP
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 (14518be)
\
N -- N -- N refs/heads/camel-master (6e5d034)
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 1 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:
.github/workflows/pr-build.yaml | 3 +-
.../ROOT/pages/extensions/websocket-jsr356.adoc | 34 +++++++++
.../pages/list-of-camel-quarkus-extensions.adoc | 5 +-
extensions/pom.xml | 1 +
.../reactive/streams/ReactiveStreamsRecorder.java | 2 +-
extensions/readme.adoc | 5 +-
.../{jira => websocket-jsr356}/deployment/pom.xml | 14 ++--
.../deployment/WebSocketJSR356Processor.java | 87 ++++++++++++++++++++++
extensions/{bindy => websocket-jsr356}/pom.xml | 4 +-
.../{xpath => websocket-jsr356}/runtime/pom.xml | 14 ++--
.../jsr356/CamelWebSocketJSR356Config.java} | 17 ++---
.../CamelWebSocketJSR356EndpointConfigurator.java | 24 +++---
.../jsr356/CamelWebSocketJSR356Recorder.java | 73 ++++++++++++++++++
.../main/resources/META-INF/quarkus-extension.yaml | 7 +-
integration-tests/pom.xml | 1 +
.../{stream => websocket-jsr356}/pom.xml | 10 +--
.../websocket/jsr356/it/WebSocketRoutes.java | 23 +++---
.../src/main/resources/application.properties} | 3 +-
.../websocket/jsr356/it/WebSocketJSR356IT.java} | 4 +-
.../websocket/jsr356/it/WebSocketJSR356Test.java | 62 +++++++++++++++
pom.xml | 8 --
poms/bom-deployment/pom.xml | 5 ++
poms/bom/pom.xml | 35 +++------
23 files changed, 339 insertions(+), 102 deletions(-)
create mode 100644 docs/modules/ROOT/pages/extensions/websocket-jsr356.adoc
copy extensions/{jira => websocket-jsr356}/deployment/pom.xml (87%)
create mode 100644 extensions/websocket-jsr356/deployment/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/deployment/WebSocketJSR356Processor.java
copy extensions/{bindy => websocket-jsr356}/pom.xml (92%)
copy extensions/{xpath => websocket-jsr356}/runtime/pom.xml (89%)
copy extensions/{xslt/runtime/src/main/java/org/apache/camel/quarkus/component/xslt/CamelXsltConfig.java => websocket-jsr356/runtime/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/CamelWebSocketJSR356Config.java} (70%)
copy integration-tests/bindy/src/main/java/org/apache/camel/quarkus/component/bindy/it/model/Trailer.java => extensions/websocket-jsr356/runtime/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/CamelWebSocketJSR356EndpointConfigurator.java (59%)
create mode 100644 extensions/websocket-jsr356/runtime/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/CamelWebSocketJSR356Recorder.java
copy extensions/{azure => websocket-jsr356}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (87%)
copy integration-tests/{stream => websocket-jsr356}/pom.xml (90%)
copy examples/observability/src/main/java/org/acme/observability/Routes.java => integration-tests/websocket-jsr356/src/main/java/org/apache/camel/quarkus/component/websocket/jsr356/it/WebSocketRoutes.java (61%)
copy integration-tests/{support/custom-dataformat/src/main/resources/META-INF/services/org/apache/camel/dataformat/my-dataformat => websocket-jsr356/src/main/resources/application.properties} (92%)
copy integration-tests/{bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorIT.java => websocket-jsr356/src/test/java/org/apache/camel/quarkus/component/websocket/jsr356/it/WebSocketJSR356IT.java} (88%)
create mode 100644 integration-tests/websocket-jsr356/src/test/java/org/apache/camel/quarkus/component/websocket/jsr356/it/WebSocketJSR356Test.java
[camel-quarkus] 01/01: Upgrade to Camel 3.2.0 - WIP
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6e5d0349c1d8dcf49132fda9248046227c1a95a9
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Feb 27 11:29:36 2020 +0000
Upgrade to Camel 3.2.0 - WIP
---
.../camel/quarkus/component/braintree/graal/BraintreeRecorder.java | 5 ++++-
.../quarkus/component/reactive/streams/ReactiveStreamsRecorder.java | 2 +-
.../braintree/src/main/resources/application.properties | 1 -
pom.xml | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/extensions/braintree/runtime/src/main/java/org/apache/camel/quarkus/component/braintree/graal/BraintreeRecorder.java b/extensions/braintree/runtime/src/main/java/org/apache/camel/quarkus/component/braintree/graal/BraintreeRecorder.java
index cb87a09..3647646 100644
--- a/extensions/braintree/runtime/src/main/java/org/apache/camel/quarkus/component/braintree/graal/BraintreeRecorder.java
+++ b/extensions/braintree/runtime/src/main/java/org/apache/camel/quarkus/component/braintree/graal/BraintreeRecorder.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.braintree.graal;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import org.apache.camel.component.braintree.BraintreeComponent;
+import org.apache.camel.component.braintree.BraintreeConfiguration;
@Recorder
public class BraintreeRecorder {
@@ -30,7 +31,9 @@ public class BraintreeRecorder {
*/
public RuntimeValue<BraintreeComponent> configureBraintreeComponent() {
BraintreeComponent component = new BraintreeComponent();
- component.setLogHandlerEnabled(false);
+ BraintreeConfiguration configuration = new BraintreeConfiguration();
+ configuration.setLogHandlerEnabled(false);
+ component.setConfiguration(configuration);
return new RuntimeValue<>(component);
}
}
diff --git a/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java b/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
index 2e731d3..677c798 100644
--- a/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
+++ b/extensions/reactive-streams/runtime/src/main/java/org/apache/camel/quarkus/component/reactive/streams/ReactiveStreamsRecorder.java
@@ -66,7 +66,7 @@ public class ReactiveStreamsRecorder {
if (reactiveStreamService == null) {
this.reactiveStreamService = reactiveStreamServiceFactory.newInstance(
getCamelContext(),
- getInternalEngineConfiguration());
+ getReactiveStreamsEngineConfiguration());
try {
// Start the service and add it to the Camel context to expose managed attributes
diff --git a/integration-tests/braintree/src/main/resources/application.properties b/integration-tests/braintree/src/main/resources/application.properties
index 41539a4..0f2c1c2 100644
--- a/integration-tests/braintree/src/main/resources/application.properties
+++ b/integration-tests/braintree/src/main/resources/application.properties
@@ -15,7 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-camel.component.braintree.configuration = #class:org.apache.camel.component.braintree.BraintreeConfiguration
camel.component.braintree.configuration.environment=SANDBOX
camel.component.braintree.configuration.merchantId={{env:BRAINTREE_MERCHANT_ID}}
camel.component.braintree.configuration.publicKey={{env:BRAINTREE_PUBLIC_KEY}}
diff --git a/pom.xml b/pom.xml
index 5b0823f..fee28fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ahc.version>2.10.4</ahc.version>
- <camel.version>3.1.0</camel.version>
+ <camel.version>3.2.0-SNAPSHOT</camel.version>
<guava.version>26.0-jre</guava.version>
<hapi.version>4.1.0</hapi.version>
<quarkus.version>1.3.0.Alpha2</quarkus.version>