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 2021/08/02 06:40:12 UTC

[camel-quarkus] branch quarkus-main updated (203be21 -> 8dbac99)

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

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


 discard 203be21  Upgrade Quarkus to 2.2.0.CR1
     add 55093dc  Updated CHANGELOG.md
     add b0a6b56  Fix foundation core faulttolerance itest package name
     add 2981142  Test threads() EIP DSL method #2628
     add df3c9aa  Test throttle() EIP DSL method #2628
     add 9ad2d45  Test validate() EIP DSL method #2628
     add 2543568  Test weighted() EIP DSL method #2628
     add 5dff734  Test doTry(), doCatch() and doFinally() EIP DSL methods #2628
     add b5aa9a8  Make method() EIP method discoverable for the audit tooling
     add 8442318  Test expression EIP DSL method #2628
     add 6ff9367  Introduce a build time optimized FastComponentNameResolver
     add 8f6a55d  Updated CHANGELOG.md
     new 1dce801  Upgrade Quarkus to 2.2.0.CR1
     new 8dbac99  Temporarily disable JavaScriptDslTest #2968

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   (203be21)
            \
             N -- N -- N   refs/heads/quarkus-main (8dbac99)

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 2 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:
 CHANGELOG.md                                       |   9 ++
 .../core/deployment/CamelContextProcessor.java     |   3 +
 .../quarkus/core/deployment/CamelProcessor.java    |  21 ++++
 ...va => CamelComponentNameResolverBuildItem.java} |  13 +-
 .../camel/quarkus/core/CamelContextRecorder.java   |   3 +
 .../apache/camel/quarkus/core/CamelRecorder.java   |   4 +
 .../camel/quarkus/core/FastCamelContext.java       |   7 ++
 ...sLoader.java => FastComponentNameResolver.java} |  22 +++-
 .../quarkus/component/bean/eip/EipRoutes.java      |   2 +-
 .../foundation/component-name-resolver}/pom.xml    |  20 +--
 .../resolver/ComponentNameResolverResource.java    |  39 +++---
 .../name/resolver/ComponentNameResolverIT.java}    |   5 +-
 .../name/resolver/ComponentNameResolverTest.java   |  30 ++---
 .../it}/CoreFaultToleranceProducers.java           |   2 +-
 .../it}/CoreFaultToleranceResource.java            |   2 +-
 .../it}/CoreFaultToleranceRoutes.java              |   2 +-
 .../it}/CoreFaultToleranceIT.java                  |   2 +-
 .../it}/CoreFaultToleranceTest.java                |   2 +-
 .../org/apache/camel/quarkus/eip/it/EipRoutes.java |  40 ++++++
 .../org/apache/camel/quarkus/eip/it/EipTest.java   | 140 +++++++++++++++++++++
 integration-test-groups/foundation/pom.xml         |   1 +
 .../apache/camel/quarkus/js/JavaScriptDslIT.java   |   2 +
 .../apache/camel/quarkus/js/JavaScriptDslTest.java |   2 +
 .../camel/quarkus/main/CoreMainXmlIoResource.java  |  26 ++--
 .../apache/camel/quarkus/main/XmlIoRoutes.java}    |   9 +-
 .../camel/quarkus/main/CoreMainXmlIoTest.java      |  28 ++++-
 26 files changed, 359 insertions(+), 77 deletions(-)
 copy extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/{CamelTypeConverterRegistryBuildItem.java => CamelComponentNameResolverBuildItem.java} (71%)
 copy extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/{RegistryRoutesLoader.java => FastComponentNameResolver.java} (60%)
 copy {integration-tests/xpath => integration-test-groups/foundation/component-name-resolver}/pom.xml (89%)
 copy extensions-jvm/weka/integration-test/src/main/java/org/apache/camel/quarkus/component/weka/it/WekaResource.java => integration-test-groups/foundation/component-name-resolver/src/main/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverResource.java (57%)
 copy integration-test-groups/{aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbIT.java => foundation/component-name-resolver/src/test/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverIT.java} (86%)
 copy integration-tests/stax/src/test/java/org/apache/camel/quarkus/component/stax/it/StaxTest.java => integration-test-groups/foundation/component-name-resolver/src/test/java/org/apache/camel/quarkus/core/component/name/resolver/ComponentNameResolverTest.java (57%)
 rename integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/{ => faulttolerance/it}/CoreFaultToleranceProducers.java (97%)
 rename integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/{ => faulttolerance/it}/CoreFaultToleranceResource.java (98%)
 rename integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/{ => faulttolerance/it}/CoreFaultToleranceRoutes.java (96%)
 rename integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/{ => faulttolerance/it}/CoreFaultToleranceIT.java (94%)
 rename integration-test-groups/foundation/core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/{ => faulttolerance/it}/CoreFaultToleranceTest.java (97%)
 copy integration-tests/{main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutes.java => main-xml-io/src/main/java/org/apache/camel/quarkus/main/XmlIoRoutes.java} (81%)

[camel-quarkus] 01/02: Upgrade Quarkus to 2.2.0.CR1

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

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

commit 1dce801b97abd71f201d0fab5d032709945d2025
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jun 29 11:59:41 2021 +0100

    Upgrade Quarkus to 2.2.0.CR1
---
 docs/antora.yml | 2 +-
 pom.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 0d387a8..67cdace 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,4 +25,4 @@ asciidoc:
     cq-camel-components: 3.11.x@components # replace ${camel.docs.components.xref}
     min-maven-version: 3.6.2 # replace ${min-maven-version}
     target-maven-version: 3.8.1 # replace ${target-maven-version}
-    quarkus-version: 2.1.0.Final # replace ${quarkus.version}
+    quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
diff --git a/pom.xml b/pom.xml
index a9453cd..6d4477d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <optaplanner.version>8.8.0.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
         <quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
         <quarkiverse-minio.version>2.0.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
-        <quarkus.version>2.1.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+        <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
         <quarkus-google-cloud.version>0.9.0</quarkus-google-cloud.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-bom/ -->
         <quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
         <quarkus-qpid-jms.version>0.26.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->

[camel-quarkus] 02/02: Temporarily disable JavaScriptDslTest #2968

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

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

commit 8dbac9938981b52627ee91528fbf1a0e8f65a862
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Aug 2 07:39:46 2021 +0100

    Temporarily disable JavaScriptDslTest #2968
---
 .../src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java      | 2 ++
 .../src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java b/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java
index 06f73dd..89c69e4 100644
--- a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java
+++ b/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java
@@ -16,8 +16,10 @@
  */
 package org.apache.camel.quarkus.js;
 
+import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.NativeImageTest;
 
+@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/2968")
 @NativeImageTest
 public class JavaScriptDslIT extends JavaScriptDslTest {
 }
diff --git a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java b/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java
index a2e1303..c0d6975 100644
--- a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java
+++ b/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java
@@ -22,10 +22,12 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
 import org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Disabled("https://github.com/apache/camel-quarkus/issues/2968")
 @QuarkusTest
 public class JavaScriptDslTest {
     @Test