You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zb...@apache.org on 2021/04/21 12:42:24 UTC

[camel-quarkus] branch camel-main updated (2937cbd -> c3e34b8)

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

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


 discard 2937cbd  Kamelet.adoc changes
 discard dff1e8a  fix compilation errors in camel-master branch
 discard b2777a1  Upgrade to Camel 3.10.0
     add 0d20a2c  Reballance CI test categories
     add 6806074  Do also in CI cron jobs: Test skipped in native mode should be executed on default Java version at least #2389
     add 1c39589  Do not validate docs link in inital-mvn-install CI phase
     add 0613128  Reballance CI test categories even more
     add de9d0d2  Use generic group names in test-categories.yaml
     add f34648d  Updated CHANGELOG.md
     add 1d18534  Updated CHANGELOG.md
     add e67a79a  Updated CHANGELOG.md
     add 845983a  Fix invalid xref link to configuration.adoc
     add 9b25ac0  Remove camel-quarkus-integration-testcontainers-support
     add c50a7ae  Inherit testcontainers dependencies from quarkus-bom
     add 6579e54  Updated CHANGELOG.md
     add f25bb0f  Fix SlackConfig class for native builds
     add 4ff104b  bindy: fixed the locale test so that it detects issues on Java 8 too #2445
     add 10f9e37  Updated CHANGELOG.md
     add bca0397  Add missing test scope to camel-quarkus-integration-test-support
     add 9c490d8  update ci doc (#2498)
     add 0c54e05  Add integration tests #2388
     new c0bfa29  Upgrade to Camel 3.10.0
     new c777367  fix compilation errors in camel-master branch
     new c3e34b8  Kamelet.adoc changes

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   (2937cbd)
            \
             N -- N -- N   refs/heads/camel-main (c3e34b8)

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:
 .github/workflows/camel-master-cron.yaml           |  38 +-
 .github/workflows/ci-build.yaml                    |   2 +-
 .github/workflows/quarkus-master-cron.yaml         |  38 +-
 CHANGELOG.md                                       |  17 +-
 docs/modules/ROOT/pages/contributor-guide/ci.adoc  |   2 +-
 .../ROOT/pages/reference/extensions/core.adoc      |   2 +-
 .../apache/camel/quarkus/main/CamelMainConfig.java |   2 +-
 extensions-jvm/couchbase/integration-test/pom.xml  |   5 -
 .../couchbase/it/CouchbaseTestResource.java        |   4 +-
 extensions-jvm/redis/integration-test/pom.xml      |   6 +-
 .../component/redis/it/RedisTestResource.java      |   4 +-
 extensions/slack/runtime/pom.xml                   |   5 +
 .../component/slack/graal/SlackSubstitutions.java  | 196 +++++++++
 integration-tests-support/aws2/pom.xml             |   2 +-
 .../test/support/aws2/Aws2TestResource.java        |   4 +-
 integration-tests-support/azure/pom.xml            |   6 +-
 integration-tests-support/pom.xml                  |   1 -
 .../testcontainers-support/pom.xml                 |  54 ---
 .../quarkus/testcontainers/ContainerSupport.java   |  28 --
 integration-tests/activemq/pom.xml                 |   4 +-
 integration-tests/amqp/pom.xml                     |   4 +-
 integration-tests/arangodb/pom.xml                 |   4 +-
 .../arangodb/it/ArangodbTestResource.java          |   4 +-
 .../quarkus/component/bindy/it/BindyResource.java  |   2 +-
 .../quarkus/component/bindy/it/BindyTestRoute.java |   2 +-
 integration-tests/cassandraql/pom.xml              |   5 -
 .../cassandraql/it/CassandraqlTestResource.java    |   4 +-
 integration-tests/consul/pom.xml                   |   4 +-
 .../component/consul/it/ConsulTestResource.java    |   4 +-
 integration-tests/couchdb/pom.xml                  |   6 +-
 .../component/couchdb/it/CouchdbTestResource.java  |   4 +-
 integration-tests/debezium/pom.xml                 |   5 -
 .../common/it/AbstractDebeziumTestResource.java    |   4 +-
 integration-tests/digitalocean/README.adoc         |   3 +-
 .../digitalocean/it/DigitaloceanResource.java      | 405 ++++++++++++++++--
 .../digitalocean/it/DigitaloceanRoute.java         |  29 ++
 .../digitalocean/it/DigitaloceanDropletIT.java     |   7 +-
 .../digitalocean/it/DigitaloceanDropletTest.java   | 451 +++++++++++++++++++++
 .../digitalocean/it/DigitaloceanTest.java          | 222 +++++-----
 .../digitalocean/it/DigitaloceanTestResource.java  |   3 +-
 .../src/test/resources/mappings/account.json       |  28 ++
 .../src/test/resources/mappings/action.json        |  28 ++
 .../test/resources/mappings/actionFloatingIp.json  |  28 ++
 .../src/test/resources/mappings/actions.json       |  28 ++
 .../resources/mappings/actionsBlockStorage.json    |  28 ++
 .../resources/mappings/createBlockStorage.json     |  28 ++
 .../test/resources/mappings/createFloatingIp.json  |  28 ++
 .../src/test/resources/mappings/createKey.json     |  28 ++
 .../src/test/resources/mappings/createTag.json     |  28 ++
 .../resources/mappings/deleteBlockStorage.json     |  28 ++
 .../test/resources/mappings/deleteFloatingIp.json  |  28 ++
 .../src/test/resources/mappings/deleteKey.json     |  28 ++
 .../test/resources/mappings/deleteSnapshot.json    |  28 ++
 .../src/test/resources/mappings/deleteTag.json     |  28 ++
 .../mappings/getAllActionsFloatingIp.json          |  28 ++
 .../resources/mappings/getAllBlockstorages.json    |  28 ++
 .../test/resources/mappings/getAllFloatingIps.json |  28 ++
 .../src/test/resources/mappings/getAllKeys.json    |  28 ++
 .../src/test/resources/mappings/getAllTags.json    |  28 ++
 .../test/resources/mappings/getBlockStorage.json   |  28 ++
 .../src/test/resources/mappings/getDroplet.json    |   2 +-
 .../src/test/resources/mappings/getFloatingIp.json |  28 ++
 .../src/test/resources/mappings/getKey.json        |  28 ++
 .../src/test/resources/mappings/getTag.json        |  28 ++
 .../src/test/resources/mappings/imageById.json     |  28 ++
 .../src/test/resources/mappings/images.json        |  28 ++
 .../test/resources/mappings/images_private.json    |  28 ++
 .../src/test/resources/mappings/regions.json       |  28 ++
 .../src/test/resources/mappings/sizes.json         |  28 ++
 .../src/test/resources/mappings/snapshotById.json  |  28 ++
 .../src/test/resources/mappings/snapshots.json     |  28 ++
 .../src/test/resources/mappings/updateKey.json     |  28 ++
 integration-tests/elasticsearch-rest/pom.xml       |   4 +-
 integration-tests/fhir/pom.xml                     |   7 +-
 .../component/fhir/it/FhirTestResource.java        |   4 +-
 integration-tests/google-pubsub/pom.xml            |   4 +-
 integration-tests/infinispan/pom.xml               |  11 +-
 .../infinispan/InfinispanServerTestResource.java   |  11 +-
 integration-tests/influxdb/pom.xml                 |   6 +-
 .../influxdb/it/InfluxdbTestResource.java          |   8 +-
 integration-tests/ipfs/pom.xml                     |   4 +-
 integration-tests/jsch/pom.xml                     |   4 +-
 integration-tests/jta/pom.xml                      |   4 +-
 integration-tests/kafka-sasl/pom.xml               |   2 +-
 integration-tests/kafka/pom.xml                    |   2 +-
 .../component/kafka/it/CamelKafkaTestResource.java |   4 +-
 integration-tests/kudu/pom.xml                     |   6 +-
 .../component/kudu/it/KuduTestResource.java        |   4 +-
 integration-tests/lra/pom.xml                      |   7 +-
 integration-tests/messaging/pom.xml                |   4 +-
 integration-tests/minio/pom.xml                    |   8 +-
 .../component/minio/it/MinioTestResource.java      |   4 +-
 integration-tests/mongodb/pom.xml                  |   6 +-
 .../component/mongodb/it/MongoDbTestResource.java  |   4 +-
 integration-tests/nats/pom.xml                     |   8 +-
 .../component/nats/it/NatsTestResource.java        |   4 +-
 integration-tests/nsq/pom.xml                      |   4 +-
 .../quarkus/component/nsq/it/NsqTestResource.java  |   4 +-
 integration-tests/paho-mqtt5/pom.xml               |   4 +-
 integration-tests/pg-replication-slot/pom.xml      |   4 +-
 .../slot/it/PgReplicationSlotTestResource.java     |   4 +-
 integration-tests/pgevent/pom.xml                  |  14 +-
 .../component/pgevent/it/PgEventTestResource.java  |  13 +-
 integration-tests/rabbitmq/pom.xml                 |   4 +-
 integration-tests/slack/pom.xml                    |  22 +-
 .../src/main/resources/application.properties      |   2 +-
 integration-tests/solr/pom.xml                     |   5 -
 .../component/solr/it/SolrTestResource.java        |   4 +-
 integration-tests/spring-rabbitmq/pom.xml          |   6 +-
 integration-tests/ssh/pom.xml                      |   4 +-
 integration-tests/syslog/pom.xml                   |   1 +
 integration-tests/vertx-kafka/pom.xml              |   5 -
 .../vertx/kafka/it/VertxKafkaTestResource.java     |   4 +-
 pom.xml                                            |   1 -
 poms/bom-test/pom.xml                              |  35 --
 tooling/scripts/test-categories.yaml               |  56 +--
 116 files changed, 2248 insertions(+), 540 deletions(-)
 create mode 100644 extensions/slack/runtime/src/main/java/org/apache/camel/quarkus/component/slack/graal/SlackSubstitutions.java
 delete mode 100644 integration-tests-support/testcontainers-support/pom.xml
 delete mode 100644 integration-tests-support/testcontainers-support/src/main/java/org/apache/camel/quarkus/testcontainers/ContainerSupport.java
 rename integration-tests-support/testcontainers-support/src/main/java/org/apache/camel/quarkus/testcontainers/ContainerResourceLifecycleManager.java => integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanDropletIT.java (79%)
 create mode 100644 integration-tests/digitalocean/src/test/java/org/apache/camel/quarkus/component/digitalocean/it/DigitaloceanDropletTest.java
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/account.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/action.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/actionFloatingIp.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/actions.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/actionsBlockStorage.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/createBlockStorage.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/createFloatingIp.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/createKey.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/createTag.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/deleteBlockStorage.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/deleteFloatingIp.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/deleteKey.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/deleteSnapshot.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/deleteTag.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getAllActionsFloatingIp.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getAllBlockstorages.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getAllFloatingIps.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getAllKeys.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getAllTags.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getBlockStorage.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getFloatingIp.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getKey.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/getTag.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/imageById.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/images.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/images_private.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/regions.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/sizes.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/snapshotById.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/snapshots.json
 create mode 100644 integration-tests/digitalocean/src/test/resources/mappings/updateKey.json
 rename integration-tests-support/testcontainers-support/src/main/resources/testcontainers.properties => integration-tests/slack/src/main/resources/application.properties (95%)

[camel-quarkus] 01/03: Upgrade to Camel 3.10.0

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

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

commit c0bfa29351ac474dc6bf30fa60fff5f84763f09b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 29 13:27:45 2021 +0100

    Upgrade to Camel 3.10.0
---
 docs/antora-playbook-dev.yml | 2 +-
 docs/antora-playbook.yml     | 2 +-
 docs/antora.yml              | 4 ++--
 pom.xml                      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml
index 1665c4e..4c50a39 100644
--- a/docs/antora-playbook-dev.yml
+++ b/docs/antora-playbook-dev.yml
@@ -26,7 +26,7 @@ content:
     start_path: docs
   - url: git@github.com:apache/camel.git
     branches:
-      - camel-3.9.x # replace ${camel.docs.branch}
+      - camel-3.10.x # replace ${camel.docs.branch}
     start_paths:
       - docs/components
   - url: git@github.com:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index aa3da35..1bac262 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -26,7 +26,7 @@ content:
     start_path: docs
   - url: git@github.com:apache/camel.git
     branches:
-      - camel-3.9.x # replace ${camel.docs.branch}
+      - camel-3.10.x # replace ${camel.docs.branch}
     start_paths:
       - docs/components
   - url: git@github.com:apache/camel.git
diff --git a/docs/antora.yml b/docs/antora.yml
index 2066fec..80e9fcf 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -22,6 +22,6 @@ nav:
 - modules/ROOT/nav.adoc
 asciidoc:
   attributes:
-    cq-camel-components: 3.9.x@components # replace ${camel.docs.components.xref}
+    cq-camel-components: 3.10.x@components # replace ${camel.docs.components.xref}
     min-maven-version: 3.6.2 # replace ${min-maven-version}
-    quarkus-version: 1.13.2.Final # replace ${quarkus.version}
+    quarkus-version: 1.13.2.Final # replace ${quarkus.version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4626003..337470f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.9.0</version>
+        <version>3.10.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.quarkus</groupId>
@@ -47,8 +47,8 @@
 
         <bouncycastle.version>${bouncycastle-version}</bouncycastle.version><!-- keep in sync with Camel -->
 
-        <camel.major.minor>3.9</camel.major.minor> <!-- run after each change: cd docs && mvndev validate -->
-        <camel.version>${camel.major.minor}.0</camel.version>
+        <camel.major.minor>3.10</camel.major.minor> <!-- run after each change: cd docs && mvndev validate -->
+        <camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version>
         <camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
         <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->
 

[camel-quarkus] 02/03: fix compilation errors in camel-master branch

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

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

commit c777367d7d93ba01f628c97cbd9f7c6d4edbcef2
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed Apr 7 17:04:34 2021 +0200

    fix compilation errors in camel-master branch
---
 .../apache/camel/quarkus/core/FastCamelContext.java  | 17 +++++++++++++++--
 extensions-jvm/kotlin-dsl/runtime/pom.xml            | 12 ++++++++++++
 extensions/jsonpath/runtime/pom.xml                  |  4 ++++
 .../json/path/it/JsonPathTransformTest.java          |  9 ++++-----
 pom.xml                                              |  1 +
 poms/bom/pom.xml                                     | 20 ++++++++++++++++++++
 6 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index a0e8a93..992028d 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -74,8 +74,8 @@ import org.apache.camel.impl.engine.DefaultTransformerRegistry;
 import org.apache.camel.impl.engine.DefaultUnitOfWorkFactory;
 import org.apache.camel.impl.engine.DefaultUriFactoryResolver;
 import org.apache.camel.impl.engine.DefaultValidatorRegistry;
-import org.apache.camel.impl.engine.EndpointKey;
 import org.apache.camel.impl.engine.PrototypeExchangeFactory;
+import org.apache.camel.impl.engine.PrototypeProcessorExchangeFactory;
 import org.apache.camel.impl.engine.RouteService;
 import org.apache.camel.impl.engine.TransformerKey;
 import org.apache.camel.impl.engine.ValidatorKey;
@@ -139,6 +139,7 @@ import org.apache.camel.spi.ModelToXMLDumper;
 import org.apache.camel.spi.NodeIdFactory;
 import org.apache.camel.spi.PackageScanClassResolver;
 import org.apache.camel.spi.PackageScanResourceResolver;
+import org.apache.camel.spi.ProcessorExchangeFactory;
 import org.apache.camel.spi.ProcessorFactory;
 import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.spi.ReactiveExecutor;
@@ -163,6 +164,7 @@ import org.apache.camel.spi.ValidatorRegistry;
 import org.apache.camel.spi.XMLRoutesDefinitionLoader;
 import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultUuidGenerator;
+import org.apache.camel.support.NormalizedUri;
 import org.apache.camel.support.ResolverHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -474,7 +476,7 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
     }
 
     @Override
-    protected EndpointRegistry<EndpointKey> createEndpointRegistry(Map<EndpointKey, Endpoint> endpoints) {
+    protected EndpointRegistry<NormalizedUri> createEndpointRegistry(Map<NormalizedUri, Endpoint> endpoints) {
         return new DefaultEndpointRegistry(this, endpoints);
     }
 
@@ -688,6 +690,17 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
     }
 
     @Override
+    protected ProcessorExchangeFactory createProcessorExchangeFactory() {
+        Optional<ProcessorExchangeFactory> result = ResolverHelper.resolveService(
+                getCamelContextReference(),
+                getBootstrapFactoryFinder(),
+                ProcessorExchangeFactory.FACTORY,
+                ProcessorExchangeFactory.class);
+
+        return result.orElseGet(PrototypeProcessorExchangeFactory::new);
+    }
+
+    @Override
     public List<RouteDefinition> getRouteDefinitions() {
         return model.getRouteDefinitions();
     }
diff --git a/extensions-jvm/kotlin-dsl/runtime/pom.xml b/extensions-jvm/kotlin-dsl/runtime/pom.xml
index 27ae382..1449a53 100644
--- a/extensions-jvm/kotlin-dsl/runtime/pom.xml
+++ b/extensions-jvm/kotlin-dsl/runtime/pom.xml
@@ -59,6 +59,18 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-kotlin-dsl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-script-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-scripting-jvm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-scripting-jvm-host</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jsonpath/runtime/pom.xml b/extensions/jsonpath/runtime/pom.xml
index ea26471..436d146 100644
--- a/extensions/jsonpath/runtime/pom.xml
+++ b/extensions/jsonpath/runtime/pom.xml
@@ -56,6 +56,10 @@
             <artifactId>camel-jsonpath</artifactId>
         </dependency>
         <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
             <scope>provided</scope>
diff --git a/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java b/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
index b9c1b23..2ffea10 100644
--- a/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
+++ b/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.quarkus.component.json.path.it;
 
 import java.util.Arrays;
-import java.util.List;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -26,7 +25,7 @@ import org.apache.camel.quarkus.component.json.path.it.CarsRequest.Car;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
 class JsonPathTransformTest {
@@ -45,11 +44,11 @@ class JsonPathTransformTest {
 
     @Test
     public void getAllCarColorsShouldSucceed() {
-        List<String> colors = RestAssured.given() //
+        String colors = RestAssured.given() //
                 .contentType(ContentType.JSON).body(carsRequest).get("/jsonpath/getAllCarColors").then().statusCode(200)
-                .extract().body().jsonPath().getList(".", String.class);
+                .extract().body().asString();
 
-        assertIterableEquals(Arrays.asList("red", "green"), colors);
+        assertEquals("[red, green]", colors);
     }
 
 }
diff --git a/pom.xml b/pom.xml
index 337470f..db770cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
         <jersey-sun.version>1.19.4</jersey-sun.version><!-- Spark -->
         <jetty.version>${jetty9-version}</jetty.version>
         <jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
+        <json-smart.version>2.4.2</json-smart.version>
         <kafka.version>2.5.0</kafka.version>
         <kudu.version>${kudu-version}</kudu.version><!-- keep in sync with Camel -->
         <kotlin.version>1.4.31</kotlin.version><!-- keep in sync with Quarkus -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8129b49..f510aa1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5959,6 +5959,21 @@
                 <version>${javassist.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-script-util</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-scripting-jvm</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-scripting-jvm-host</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.jruby.jcodings</groupId>
                 <artifactId>jcodings</artifactId>
                 <version>${jcodings.version}</version>
@@ -6065,6 +6080,11 @@
                 <version>${snakeyaml.version}</version>
             </dependency>
             <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>${json-smart.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>xalan</groupId>
                 <artifactId>xalan</artifactId>
                 <version>${xalan.version}</version>

[camel-quarkus] 03/03: Kamelet.adoc changes

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

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

commit c3e34b830889ebb6835c1008ae912784277b99b2
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Fri Apr 16 10:02:25 2021 +0200

    Kamelet.adoc changes
---
 docs/modules/ROOT/partials/reference/components/kamelet.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/modules/ROOT/partials/reference/components/kamelet.adoc b/docs/modules/ROOT/partials/reference/components/kamelet.adoc
index 0d5ba2c..f1f5c22 100644
--- a/docs/modules/ROOT/partials/reference/components/kamelet.adoc
+++ b/docs/modules/ROOT/partials/reference/components/kamelet.adoc
@@ -9,5 +9,5 @@
 :cq-native-since: 1.7.0
 :cq-camel-part-name: kamelet
 :cq-camel-part-title: Kamelet
-:cq-camel-part-description: The Kamelet Component provides support for interacting with the Camel Route Template engine
+:cq-camel-part-description: To call Kamelets
 :cq-extension-page-title: Kamelet