This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 305db0d7d0ed97a96e1440771ecf2bc6d0c3a571 Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Wed Mar 1 12:01:55 2023 +0100 Upgrade to Quarkus Cassandra 1.2.0-alpha1 #4488 --- integration-tests/pom.xml | 2 +- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 78 +++++++++++----------- .../src/main/generated/flattened-reduced-pom.xml | 4 +- .../generated/flattened-reduced-verbose-pom.xml | 26 ++++---- tooling/scripts/test-categories.yaml | 1 + 6 files changed, 57 insertions(+), 56 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index d2c50fdddf..b6ee1a7ca9 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -71,7 +71,7 @@ <module>box</module> <module>braintree</module> <module>caffeine</module> - <!--<module>cassandraql</module> https://github.com/apache/camel-quarkus/issues/4488 --> + <module>cassandraql</module> <module>cbor</module> <module>compression-grouped</module> <module>consul</module> diff --git a/pom.xml b/pom.xml index 63c6c9a75f..92f4dc5487 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ <camel.docs.components.xref>${camel.docs.components.version}@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 camel branch on which our Antora docs depends --> <camel.sb.docs.branch>camel-spring-boot-${camel.major.minor}.x</camel.sb.docs.branch><!-- The stable camel-spring-boot branch on which our Antora docs depends --> - <cassandra-quarkus.version>1.1.3</cassandra-quarkus.version><!-- https://repo1.maven.org/maven2/com/datastax/oss/quarkus/cassandra-quarkus-bom/ --> + <cassandra-quarkus.version>1.2.0-alpha1</cassandra-quarkus.version><!-- https://repo1.maven.org/maven2/com/datastax/oss/quarkus/cassandra-quarkus-bom/ --> <debezium.version>2.1.2.Final</debezium.version><!-- May go back to Camel's ${debezium-version} when they are in sync https://repo1.maven.org/maven2/io/debezium/debezium-bom/ --> <optaplanner.version>8.31.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-amazonservices.version>2.0.0.Alpha1</quarkiverse-amazonservices.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/ --> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0339708895..a5fcc9f18e 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -20005,9 +20005,9 @@ <version>12.15.2</version><!-- com.azure:azure-sdk-bom:1.2.9 --> </dependency> <dependency> - <groupId>com.datastax.oss</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>java-driver-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>4.15.0</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>java-driver-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>4.15.0</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> <exclusions> <exclusion> <groupId>com.github.stephenc.jcip</groupId> @@ -20018,70 +20018,70 @@ <artifactId>jsr305</artifactId> </exclusion> <exclusion> - <groupId>io.dropwizard.metrics</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>metrics-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>io.dropwizard.metrics</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>metrics-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> <exclusion> - <groupId>org.hdrhistogram</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>HdrHistogram</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>org.hdrhistogram</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>HdrHistogram</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.tinkerpop</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>gremlin-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>3.5.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>org.apache.tinkerpop</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>gremlin-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>3.5.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> <exclusions> <exclusion> - <groupId>org.yaml</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>snakeyaml</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>org.yaml</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>snakeyaml</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> <exclusion> - <groupId>com.carrotsearch</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>hppc</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.carrotsearch</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>hppc</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> <exclusion> - <groupId>com.jcabi</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>*</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.jcabi</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>*</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> <exclusion> - <groupId>net.objecthunter</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>exp4j</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>net.objecthunter</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>exp4j</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> </exclusions> - <optional>true</optional><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <optional>true</optional><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>org.apache.tinkerpop</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>tinkergraph-gremlin</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>3.5.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <optional>true</optional><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>org.apache.tinkerpop</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>tinkergraph-gremlin</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>3.5.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <optional>true</optional><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>com.esri.geometry</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>esri-geometry-api</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.2.1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <optional>true</optional><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.esri.geometry</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>esri-geometry-api</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <optional>true</optional><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>cassandra-quarkus-client</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.1.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>cassandra-quarkus-client</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.0-alpha1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>cassandra-quarkus-client-deployment</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.1.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>cassandra-quarkus-client-deployment</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.0-alpha1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>cassandra-quarkus-test-framework</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.1.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>cassandra-quarkus-test-framework</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.0-alpha1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>cassandra-quarkus-mapper-processor</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.1.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>cassandra-quarkus-mapper-processor</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.0-alpha1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> <groupId>com.datastax.oss</groupId><!-- com.datastax.oss:java-driver-bom:4.15.0 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d7ac3ff7e2..f55de2e379 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7308,12 +7308,12 @@ <dependency> <groupId>com.datastax.oss.quarkus</groupId> <artifactId>cassandra-quarkus-client</artifactId> - <version>1.1.3</version> + <version>1.2.0-alpha1</version> </dependency> <dependency> <groupId>com.datastax.oss.quarkus</groupId> <artifactId>cassandra-quarkus-client-deployment</artifactId> - <version>1.1.3</version> + <version>1.2.0-alpha1</version> </dependency> <dependency> <groupId>com.datastax.oss</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 856f19deed..a579e6b4c6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7283,9 +7283,9 @@ <version>12.15.2</version><!-- com.azure:azure-sdk-bom:1.2.9 --> </dependency> <dependency> - <groupId>com.datastax.oss</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>java-driver-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>4.15.0</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>java-driver-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>4.15.0</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> <exclusions> <exclusion> <groupId>com.github.stephenc.jcip</groupId> @@ -7296,24 +7296,24 @@ <artifactId>jsr305</artifactId> </exclusion> <exclusion> - <groupId>io.dropwizard.metrics</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>metrics-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>io.dropwizard.metrics</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>metrics-core</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> <exclusion> - <groupId>org.hdrhistogram</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>HdrHistogram</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>org.hdrhistogram</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>HdrHistogram</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </exclusion> </exclusions> </dependency> <dependency> - <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>cassandra-quarkus-client</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.1.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>cassandra-quarkus-client</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.0-alpha1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> - <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <artifactId>cassandra-quarkus-client-deployment</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> - <version>1.1.3</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.1.3 --> + <groupId>com.datastax.oss.quarkus</groupId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <artifactId>cassandra-quarkus-client-deployment</artifactId><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> + <version>1.2.0-alpha1</version><!-- com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0-alpha1 --> </dependency> <dependency> <groupId>com.datastax.oss</groupId><!-- com.datastax.oss:java-driver-bom:4.15.0 --> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 3cdeaff620..c88d221ce4 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -61,6 +61,7 @@ group-03: group-04: - arangodb - debezium + - cassandraql - couchdb - influxdb - jdbc