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/07 14:24:49 UTC

[camel-quarkus] branch master updated: Upgrade CassandraQL quarkus extension to 1.0.1 #2423 (#2440)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bc4b2ea  Upgrade CassandraQL quarkus extension to 1.0.1 #2423 (#2440)
bc4b2ea is described below

commit bc4b2ea46369e73226cbbdda061ba89ee893f6d4
Author: Zineb BENDHIBA <be...@gmail.com>
AuthorDate: Wed Apr 7 16:24:35 2021 +0200

    Upgrade CassandraQL quarkus extension to 1.0.1 #2423 (#2440)
---
 extensions/cassandraql/runtime/pom.xml |  8 ++++++++
 integration-tests/cassandraql/pom.xml  |  6 ++++++
 pom.xml                                |  3 ++-
 poms/bom/pom.xml                       | 10 ++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/extensions/cassandraql/runtime/pom.xml b/extensions/cassandraql/runtime/pom.xml
index c86bf8f..e26ea69 100644
--- a/extensions/cassandraql/runtime/pom.xml
+++ b/extensions/cassandraql/runtime/pom.xml
@@ -60,6 +60,14 @@
             <groupId>com.datastax.oss.quarkus</groupId>
             <artifactId>cassandra-quarkus-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.datastax.oss</groupId>
+            <artifactId>java-driver-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.datastax.oss</groupId>
+            <artifactId>java-driver-query-builder</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml
index 2758cf5..5cda5f1 100644
--- a/integration-tests/cassandraql/pom.xml
+++ b/integration-tests/cassandraql/pom.xml
@@ -76,6 +76,12 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>cassandra</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jnr-posix</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
diff --git a/pom.xml b/pom.xml
index a06fda4..3df4342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,8 @@
         <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 -->
 
-        <cassandra-quarkus.version>1.0.0</cassandra-quarkus.version>
+        <cassandra-java-driver.version>4.11.0</cassandra-java-driver.version><!-- keep in sync with Cassandra quarkus client -->
+        <cassandra-quarkus.version>1.0.1</cassandra-quarkus.version>
         <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version><!-- keep in sync with Camel -->
         <commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
         <commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 5664357..8129b49 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5531,6 +5531,16 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>com.datastax.oss</groupId>
+                <artifactId>java-driver-core</artifactId>
+                <version>${cassandra-java-driver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.datastax.oss</groupId>
+                <artifactId>java-driver-query-builder</artifactId>
+                <version>${cassandra-java-driver.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.datastax.oss.quarkus</groupId>
                 <artifactId>cassandra-quarkus-client</artifactId>
                 <version>${cassandra-quarkus.version}</version>