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/05/20 04:35:03 UTC
[camel-quarkus] branch quarkus-master updated (5f4f7b2 -> 18e246e)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 5f4f7b2 Workaround https://github.com/quarkusio/quarkus/issues/9403
discard fc62f14 Upgrade to Quarkus 1.5.0 (WiP)
discard 52dad49 Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103
discard 7ffe4f1 Fix CamelContextCustomizerTest compilation errors
discard c623038 Register required AHC classes for runtime initialization
add bcc062e Fix #1212 - Add the allowTemplateFromHeader option in the qute component (#1241)
add 7c44880 Use valid git config for github-actions bot user
add ec50694 Reduce the number of Qute component dependencies
add 4c4b8c4 Added native support for avro dataformat #1180
new 3dc0dcc Register required AHC classes for runtime initialization
new afe48c4 Fix CamelContextCustomizerTest compilation errors
new 4851e5f Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103
new 05d7f1d Upgrade to Quarkus 1.5.0 (WiP)
new 18e246e Workaround https://github.com/quarkusio/quarkus/issues/9403
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 (5f4f7b2)
\
N -- N -- N refs/heads/quarkus-master (18e246e)
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 5 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/test-categories.yaml | 1 +
.github/workflows/camel-master-cron.yaml | 12 +-
.github/workflows/quarkus-master-cron.yaml | 12 +-
docs/modules/ROOT/pages/extensions/avro.adoc | 38 ++++++
.../pages/list-of-camel-quarkus-extensions.adoc | 4 +-
.../component/avro/deployment/AvroProcessor.java | 46 -------
extensions-jvm/avro/integration-test/pom.xml | 81 ------------
.../quarkus/component/avro/it/AvroResource.java | 51 --------
extensions-jvm/pom.xml | 1 -
.../avro/deployment/pom.xml | 5 +
.../component/avro/deployment/AvroProcessor.java | 120 +++++++++++++++++
.../deployment/BuildTimeAvroDataFormatTest.java | 70 ++++++++++
.../src/test/resources/schemas/a-user.avsc | 7 +
.../src/test/resources/schemas/another-user.avsc | 7 +
{extensions-jvm => extensions}/avro/pom.xml | 1 -
.../avro/runtime/pom.xml | 5 +
.../component/avro/AvroDataFormatProducer.java | 55 ++++++++
.../camel/quarkus/component/avro/AvroRecorder.java | 8 +-
.../component/avro/AvroSchemaSubstitution.java | 57 ++++++++
.../component/avro/BuildTimeAvroDataFormat.java | 7 +-
.../main/resources/META-INF/quarkus-extension.yaml | 4 +-
.../component/avro/AvroDataFormatProducerTest.java | 57 ++++++++
extensions/pom.xml | 1 +
extensions/qute/component/pom.xml | 37 +++++-
.../component/qute/QuteComponentConfigurer.java | 5 +
.../component/qute/QuteEndpointConfigurer.java | 5 +
.../org/apache/camel/component/qute/qute.json | 2 +
.../apache/camel/component/qute/QuteComponent.java | 20 ++-
.../apache/camel/component/qute/QuteEndpoint.java | 49 +++++--
.../component/qute/QuteBodyAsDomainObjectTest.java | 5 +-
.../camel/component/qute/QuteConcurrentTest.java | 5 +-
.../component/qute/QuteDynamicTemplateTest.java | 5 +-
.../camel/component/qute/QuteLetterTest.java | 5 +-
.../qute/QuteSetTemplateViaHeaderTest.java | 7 +-
.../component/qute/QuteTemplateInHeaderTest.java | 12 +-
.../org/apache/camel/component/qute/QuteTest.java | 10 +-
.../apache/camel/component/qute/QuteTestBase.java | 101 +++++++++++++++
extensions/qute/runtime/pom.xml | 7 -
integration-tests/{exec => avro}/pom.xml | 12 +-
.../quarkus/component/avro/it/AvroResource.java | 83 ++++++++++++
.../camel/quarkus/component/avro/it/AvroRoute.java | 47 +++++++
.../component/avro/it/AvroSchemaLoader.java | 28 ++--
.../camel/quarkus/component/avro/it/Value.java | 143 +++++++++++++++++++++
.../avro/src/main/resources/user.avsc | 7 +
.../camel/quarkus/component/avro/it/AvroIT.java} | 4 +-
.../camel/quarkus/component/avro/it/AvroTest.java | 27 +++-
integration-tests/pom.xml | 1 +
pom.xml | 1 +
48 files changed, 996 insertions(+), 282 deletions(-)
create mode 100644 docs/modules/ROOT/pages/extensions/avro.adoc
delete mode 100644 extensions-jvm/avro/deployment/src/main/java/org/apache/camel/quarkus/component/avro/deployment/AvroProcessor.java
delete mode 100644 extensions-jvm/avro/integration-test/pom.xml
delete mode 100644 extensions-jvm/avro/integration-test/src/main/java/org/apache/camel/quarkus/component/avro/it/AvroResource.java
rename {extensions-jvm => extensions}/avro/deployment/pom.xml (94%)
create mode 100644 extensions/avro/deployment/src/main/java/org/apache/camel/quarkus/component/avro/deployment/AvroProcessor.java
create mode 100644 extensions/avro/deployment/src/test/java/org/apache/camel/quarkus/component/avro/deployment/BuildTimeAvroDataFormatTest.java
create mode 100644 extensions/avro/deployment/src/test/resources/schemas/a-user.avsc
create mode 100644 extensions/avro/deployment/src/test/resources/schemas/another-user.avsc
rename {extensions-jvm => extensions}/avro/pom.xml (97%)
rename {extensions-jvm => extensions}/avro/runtime/pom.xml (94%)
create mode 100644 extensions/avro/runtime/src/main/java/org/apache/camel/quarkus/component/avro/AvroDataFormatProducer.java
copy {extensions-jvm/avro-rpc => extensions/avro}/runtime/src/main/java/org/apache/camel/quarkus/component/avro/AvroRecorder.java (76%)
create mode 100644 extensions/avro/runtime/src/main/java/org/apache/camel/quarkus/component/avro/AvroSchemaSubstitution.java
copy integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/model/ExcludeField.java => extensions/avro/runtime/src/main/java/org/apache/camel/quarkus/component/avro/BuildTimeAvroDataFormat.java (89%)
rename {extensions-jvm => extensions}/avro/runtime/src/main/resources/META-INF/quarkus-extension.yaml (90%)
create mode 100644 extensions/avro/runtime/src/test/java/org/apache/camel/quarkus/component/avro/AvroDataFormatProducerTest.java
create mode 100644 extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteTestBase.java
copy integration-tests/{exec => avro}/pom.xml (91%)
create mode 100644 integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/AvroResource.java
create mode 100644 integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/AvroRoute.java
rename extensions-jvm/avro/integration-test/src/test/java/org/apache/camel/quarkus/component/avro/it/AvroTest.java => integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/AvroSchemaLoader.java (59%)
create mode 100644 integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/Value.java
create mode 100644 integration-tests/avro/src/main/resources/user.avsc
copy integration-tests/{amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpIT.java => avro/src/test/java/org/apache/camel/quarkus/component/avro/it/AvroIT.java} (91%)
copy {extensions-jvm/avro-rpc/integration-test => integration-tests/avro}/src/test/java/org/apache/camel/quarkus/component/avro/it/AvroTest.java (50%)
[camel-quarkus] 05/05: Workaround
https://github.com/quarkusio/quarkus/issues/9403
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 18e246e8a1ec2595911bb0aa22a9119ad2357e9b
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon May 18 12:07:03 2020 +0200
Workaround https://github.com/quarkusio/quarkus/issues/9403
---
pom.xml | 2 +-
poms/bom/pom.xml | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bd41102..110a68f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
<github-api.version>1.111</github-api.version>
<google-http-client.version>1.22.0</google-http-client.version>
<guava.version>26.0-jre</guava.version>
- <grpc.version>1.27.0</grpc.version>
+ <grpc.version>1.29.0</grpc.version><!-- Currently following Quarkus, because its gRPC is newer; see also https://github.com/quarkusio/quarkus/issues/9403 -->
<gson.version>2.8.5</gson.version>
<hapi.version>4.1.0</hapi.version>
<httpclient.cache.version>4.5.5</httpclient.cache.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 57c9cb3..beb90e8 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -54,6 +54,16 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+
+ <dependency>
+ <!-- Workaround for https://github.com/quarkusio/quarkus/issues/9403 -->
+ <!-- this needs to occur before quarkus-bom to get a higher prio -->
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
[camel-quarkus] 03/05: Temporary workaround for
https://github.com/quarkusio/quarkus/issues/9103
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4851e5fc7407a685abfd3139421807b51532e889
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed May 6 09:27:44 2020 +0200
Temporary workaround for
https://github.com/quarkusio/quarkus/issues/9103
---
integration-tests/mongodb/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/integration-tests/mongodb/pom.xml b/integration-tests/mongodb/pom.xml
index a72d0f7..6f192cd 100644
--- a/integration-tests/mongodb/pom.xml
+++ b/integration-tests/mongodb/pom.xml
@@ -30,6 +30,8 @@
<description>Integration tests for Camel Quarkus MongoDB extension</description>
<properties>
+ <jna.version>5.3.1</jna.version>
+
<!-- mvnd, a.k.a. Maven Daemon: https://github.com/gnodet/mvnd -->
<!-- The following rule tells mvnd to build the listed deployment modules before this module. -->
<!-- This is important because mvnd builds modules in parallel by default. The deployment modules are not -->
@@ -39,6 +41,17 @@
<mvnd.builder.rule>camel-quarkus-mongodb-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule>
</properties>
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency><!-- Hopefully temporary workaround for https://github.com/quarkusio/quarkus/issues/9103 -->
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
[camel-quarkus] 04/05: Upgrade to Quarkus 1.5.0 (WiP)
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 05d7f1d9c2eaac78ebaeb1ba4888effb434f3e32
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue May 12 16:00:19 2020 +0200
Upgrade to Quarkus 1.5.0 (WiP)
---
.../camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
index a4a3e0a..7b58edc 100644
--- a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
+++ b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
@@ -23,7 +23,7 @@ import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
-import io.quarkus.mongodb.runtime.MongoClientRecorder;
+import io.quarkus.mongodb.runtime.MongoClientBeanUtil;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
class MongoDbProcessor {
@@ -43,7 +43,7 @@ class MongoDbProcessor {
for (MongoClientBuildItem mongoClient : mongoClients) {
// If there is a default mongo client instance, then bind it to the camel registry
// with the default mongo client name used by the camel-mongodb component
- if (MongoClientRecorder.DEFAULT_MONGOCLIENT_NAME.equals(mongoClient.getName())) {
+ if (MongoClientBeanUtil.isDefault(mongoClient.getName())) {
runtimeBeans.produce(
new CamelRuntimeBeanBuildItem(
"camelMongoClient",
diff --git a/pom.xml b/pom.xml
index a1c762a..bd41102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<mongodb.version>4.0.1</mongodb.version>
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
- <quarkus.version>1.4.2.Final</quarkus.version>
+ <quarkus.version>999-SNAPSHOT</quarkus.version>
<quarkus-qpid-jms.version>0.14.1</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
[camel-quarkus] 02/05: Fix CamelContextCustomizerTest compilation
errors
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit afe48c4d0cac89b6482b448d262f94dd64bfb96c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Apr 27 08:15:05 2020 +0100
Fix CamelContextCustomizerTest compilation errors
---
.../camel/quarkus/core/deployment/CamelContextCustomizerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
index 9b88090..1860248 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -51,7 +51,9 @@ public class CamelContextCustomizerTest {
builder.addBuildStep(new BuildStep() {
@Override
public void execute(BuildContext context) {
- BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), "execute");
+ String methodName = "execute";
+ BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
+ Integer.toString(methodName.hashCode()));
RuntimeValue<CamelContextCustomizer> value = bri
.newInstance(RestConfigurationCustomizer.class.getName());
context.produce(new CamelContextCustomizerBuildItem(value));
[camel-quarkus] 01/05: Register required AHC classes for runtime
initialization
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3dc0dcca7eeb6375277e11eb1404256a8901eba1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Apr 23 15:08:53 2020 +0100
Register required AHC classes for runtime initialization
Fixes #1126
---
.../support/ahc/deployment/SupportAhcProcessor.java | 15 +++++++++++++++
.../component/ahc/ws/deployment/AhcWsProcessor.java | 5 +++++
2 files changed, 20 insertions(+)
diff --git a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
index 9ae0aa8..dc1c53f 100644
--- a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
+++ b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
@@ -16,14 +16,22 @@
*/
package org.apache.camel.quarkus.component.support.ahc.deployment;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class SupportAhcProcessor {
private static final String FEATURE = "camel-support-ahc";
+ private static final String[] RUNTIME_INITIALIZED_CLASSES = new String[] {
+ "org.asynchttpclient.netty.channel.ChannelManager",
+ "org.asynchttpclient.netty.request.NettyRequestSender",
+ "org.asynchttpclient.RequestBuilderBase",
+ "org.asynchttpclient.resolver.RequestHostnameResolver"
+ };
@BuildStep
FeatureBuildItem feature() {
@@ -42,4 +50,11 @@ class SupportAhcProcessor {
return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
+ for (String className : RUNTIME_INITIALIZED_CLASSES) {
+ runtimeInitializedClass
+ .produce(new RuntimeInitializedClassBuildItem(className));
+ }
+ }
}
diff --git a/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java b/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
index 09d5671..5171ec1 100644
--- a/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
+++ b/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.ahc.ws.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class AhcWsProcessor {
@@ -28,4 +29,8 @@ class AhcWsProcessor {
return new FeatureBuildItem(FEATURE);
}
+ @BuildStep
+ RuntimeInitializedClassBuildItem runtimeInitializedClasses() {
+ return new RuntimeInitializedClassBuildItem("org.asynchttpclient.netty.ws.NettyWebSocket");
+ }
}