You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/05/12 14:00:59 UTC

[camel-quarkus] branch quarkus-master updated (af3dfb1 -> 94cf0f1)

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.


 discard af3dfb1  Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103
 discard c79e512  Fix CamelContextCustomizerTest compilation errors
 discard 85b594a  Register required AHC classes for runtime initialization
     add a76dc0d  Move integration-tests support modules out of integration-tests folder
     add 4994632  Disabled Kudu itests as testcontainer is not able to bridge master and tablet server container on some platforms/configurations fixes #1026
     add b04e1a6  Add jaxb as dependency to workaround issue #1161
     add de7854f  Allow formatter to be skipped
     new 1ed4ba6  Register required AHC classes for runtime initialization
     new 53e977f  Fix CamelContextCustomizerTest compilation errors
     new 9f71abb  Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103
     new 94cf0f1  Upgrade to Quarkus 1.5.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   (af3dfb1)
            \
             N -- N -- N   refs/heads/quarkus-master (94cf0f1)

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 4 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:
 extensions-core/core/deployment/pom.xml               |  4 ++++
 extensions-core/core/runtime/pom.xml                  |  4 ++++
 .../mongodb/deployment/MongoDbProcessor.java          |  4 ++--
 .../core-main-collector/deployment/pom.xml            |  0
 .../core/runtime/support/deployment/Feature.java      |  0
 .../runtime/support/deployment/SupportBuildStep.java  |  0
 .../core-main-collector/pom.xml                       |  2 +-
 .../core-main-collector/runtime/pom.xml               |  0
 .../quarkus/core/runtime/support/SupportRecorder.java |  0
 .../core/runtime/support/SupportRoutesCollector.java  |  0
 .../core-main/deployment/pom.xml                      |  0
 .../core/runtime/support/deployment/Feature.java      |  0
 .../runtime/support/deployment/SupportBuildStep.java  |  0
 .../core-main/pom.xml                                 |  2 +-
 .../core-main/runtime/pom.xml                         |  0
 .../camel/quarkus/core/runtime/support/MyPair.java    |  0
 .../quarkus/core/runtime/support/SupportListener.java |  0
 .../quarkus/core/runtime/support/SupportRecorder.java |  0
 .../runtime/support/SupportTypeConverterLoader.java   |  0
 .../core/deployment/pom.xml                           |  0
 .../quarkus/core/support/deployment/Feature.java      |  0
 .../core/support/deployment/SupportBuildStep.java     |  0
 .../core/pom.xml                                      |  2 +-
 .../core/runtime/pom.xml                              |  0
 .../camel/quarkus/core/support/SupportRecorder.java   |  0
 .../custom-dataformat/pom.xml                         |  2 +-
 .../quarkus/it/support/dataformat/MyDataformat.java   |  0
 .../org/apache/camel/dataformat/my-dataformat         |  0
 .../support => integration-tests-support}/pom.xml     |  4 ++--
 .../test-support/pom.xml                              |  2 +-
 .../camel/quarkus/test/AvailablePortFinder.java       |  0
 .../org/apache/camel/quarkus/test/Conditions.java     |  0
 .../java/org/apache/camel/quarkus/test/EnabledIf.java |  0
 .../apache/camel/quarkus/test/EnabledIfCondition.java |  0
 .../apache/camel/quarkus/test/EnabledIfProperty.java  |  0
 .../quarkus/test/EnabledIfPropertyCondition.java      |  0
 .../apache/camel/quarkus/test/TrustStoreResource.java |  0
 .../testcontainers-support/pom.xml                    |  2 +-
 .../ContainerResourceLifecycleManager.java            |  0
 .../quarkus/testcontainers/ContainerSupport.java      |  0
 .../src/main/resources/testcontainers.properties      |  0
 .../kudu/it/KuduInfrastructureTestHelper.java         | 19 +++++++++----------
 .../camel/quarkus/component/kudu/it/KuduIT.java       |  5 ++---
 .../camel/quarkus/component/kudu/it/KuduTest.java     |  7 ++-----
 integration-tests/pom.xml                             |  1 -
 pom.xml                                               |  3 ++-
 poms/build-parent/pom.xml                             |  2 ++
 47 files changed, 35 insertions(+), 30 deletions(-)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/deployment/pom.xml (100%)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/pom.xml (95%)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/runtime/pom.xml (100%)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRoutesCollector.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/deployment/pom.xml (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/pom.xml (95%)
 rename {integration-tests/support => integration-tests-support}/core-main/runtime/pom.xml (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/MyPair.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportListener.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java (100%)
 rename {integration-tests/support => integration-tests-support}/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportTypeConverterLoader.java (100%)
 rename {integration-tests/support => integration-tests-support}/core/deployment/pom.xml (100%)
 rename {integration-tests/support => integration-tests-support}/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java (100%)
 rename {integration-tests/support => integration-tests-support}/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java (100%)
 rename {integration-tests/support => integration-tests-support}/core/pom.xml (95%)
 rename {integration-tests/support => integration-tests-support}/core/runtime/pom.xml (100%)
 rename {integration-tests/support => integration-tests-support}/core/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java (100%)
 rename {integration-tests/support => integration-tests-support}/custom-dataformat/pom.xml (96%)
 rename {integration-tests/support => integration-tests-support}/custom-dataformat/src/main/java/org/apache/camel/quarkus/it/support/dataformat/MyDataformat.java (100%)
 rename {integration-tests/support => integration-tests-support}/custom-dataformat/src/main/resources/META-INF/services/org/apache/camel/dataformat/my-dataformat (100%)
 rename {integration-tests/support => integration-tests-support}/pom.xml (92%)
 rename {integration-tests/support => integration-tests-support}/test-support/pom.xml (95%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/AvailablePortFinder.java (100%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/Conditions.java (100%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/EnabledIf.java (100%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/EnabledIfCondition.java (100%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/EnabledIfProperty.java (100%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/EnabledIfPropertyCondition.java (100%)
 rename {integration-tests/support => integration-tests-support}/test-support/src/main/java/org/apache/camel/quarkus/test/TrustStoreResource.java (100%)
 rename {integration-tests/support => integration-tests-support}/testcontainers-support/pom.xml (96%)
 rename {integration-tests/support => integration-tests-support}/testcontainers-support/src/main/java/org/apache/camel/quarkus/testcontainers/ContainerResourceLifecycleManager.java (100%)
 rename {integration-tests/support => integration-tests-support}/testcontainers-support/src/main/java/org/apache/camel/quarkus/testcontainers/ContainerSupport.java (100%)
 rename {integration-tests/support => integration-tests-support}/testcontainers-support/src/main/resources/testcontainers.properties (100%)


[camel-quarkus] 03/04: Temporary workaround for https://github.com/quarkusio/quarkus/issues/9103

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 9f71abb3ee898a81a2fe79c82fd44174c313c027
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/04: Upgrade to Quarkus 1.5.0 (WiP)

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 94cf0f1c1efe4e1319b1b85a7f809626101ebe71
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 55051fb..beb51f1 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.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 0749425..fe63c37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <javassist.version>3.22.0-CR2</javassist.version><!-- debezium -->
         <jetty.version>9.4.18.v20190429</jetty.version>
         <kotlin.version>1.3.72</kotlin.version>
-        <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/04: Fix CamelContextCustomizerTest compilation errors

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 53e977fc08f15f8b5e134839809f51e32719245d
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 bb82a1b..20b1c52 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
@@ -50,7 +50,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/04: Register required AHC classes for runtime initialization

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 1ed4ba6c78ea7a51839b3d7fbb1d085f00bbeb64
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");
+    }
 }