diff --git a/lib/org/apache/cassandra/java-driver-bom/4.19.0-preview1/java-driver-bom-4.19.0-preview1.pom b/lib/org/apache/cassandra/java-driver-bom/4.19.0-preview1/java-driver-bom-4.19.0-preview1.pom deleted file mode 100644 index 55f26d4ab0..0000000000 --- a/lib/org/apache/cassandra/java-driver-bom/4.19.0-preview1/java-driver-bom-4.19.0-preview1.pom +++ /dev/null @@ -1,134 +0,0 @@ - - - - 4.0.0 - org.apache.cassandra - java-driver-bom - 4.19.0-preview1 - pom - Apache Cassandra Java Driver - Bill Of Materials - The Apache Software Foundation provides support for the Apache community of open-source software projects. - The Apache projects are characterized by a collaborative, consensus based development process, an open and - pragmatic software license, and a desire to create high quality software that leads the way in its field. - We consider ourselves not simply a group of projects sharing a server, but rather a community of developers - and users. - https://github.com/datastax/java-driver/java-driver-bom - 2017 - - The Apache Software Foundation - https://www.apache.org/ - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - Apache License Version 2.0 - - - - - Various - DataStax - - - - - Apache Announce List - announce-subscribe@apache.org - announce-unsubscribe@apache.org - announce@apache.org - https://mail-archives.apache.org/mod_mbox/www-announce/ - - - - scm:git:git@github.com:datastax/java-driver.git/java-driver-bom - scm:git:git@github.com:datastax/java-driver.git/java-driver-bom - https://github.com/datastax/java-driver/java-driver-bom - - - - apache.releases.https - Apache Release Distribution Repository - https://repository.apache.org/service/local/staging/deploy/maven2 - - - apache.snapshots.https - Apache Development Snapshot Repository - https://repository.apache.org/content/repositories/snapshots - - - - - - org.apache.cassandra - java-driver-core - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-core-shaded - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-mapper-processor - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-mapper-runtime - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-query-builder - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-test-infra - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-metrics-micrometer - 4.19.0-preview1 - - - org.apache.cassandra - java-driver-metrics-microprofile - 4.19.0-preview1 - - - com.datastax.oss - native-protocol - 1.5.1 - - - com.datastax.oss - java-driver-shaded-guava - 25.1-jre-graal-sub-1 - - - - diff --git a/lib/org/apache/cassandra/java-driver-bom/4.19.0-preview1/java-driver-bom-4.19.0-preview1.pom.sha1 b/lib/org/apache/cassandra/java-driver-bom/4.19.0-preview1/java-driver-bom-4.19.0-preview1.pom.sha1 deleted file mode 100644 index 817eac4634..0000000000 --- a/lib/org/apache/cassandra/java-driver-bom/4.19.0-preview1/java-driver-bom-4.19.0-preview1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -a3dcf3a00dbcad5f1d1af5f3cd437440bc8c5de1 java-driver-bom-4.19.0-preview1.pom diff --git a/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.jar b/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.jar deleted file mode 100644 index 7f9cda943e..0000000000 Binary files a/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.jar and /dev/null differ diff --git a/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.pom b/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.pom deleted file mode 100644 index 738441cbad..0000000000 --- a/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.pom +++ /dev/null @@ -1,356 +0,0 @@ - - - - 4.0.0 - - org.apache.cassandra - java-driver-parent - 4.19.0-preview1 - - java-driver-core - bundle - Apache Cassandra Java Driver - core - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - - - - com.datastax.oss - native-protocol - - - io.netty - netty-handler - - - com.datastax.oss - java-driver-shaded-guava - - - com.typesafe - config - - - - com.github.jnr - jnr-posix - - - org.xerial.snappy - snappy-java - true - - - org.lz4 - lz4-java - true - - - org.slf4j - slf4j-api - - - io.dropwizard.metrics - metrics-core - - - org.hdrhistogram - HdrHistogram - - - com.esri.geometry - esri-geometry-api - true - - - org.apache.tinkerpop - gremlin-core - true - - - org.apache.tinkerpop - tinkergraph-gremlin - true - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - org.reactivestreams - reactive-streams - - - com.github.stephenc.jcip - jcip-annotations - provided - - - com.github.spotbugs - spotbugs-annotations - provided - - - org.graalvm.sdk - graal-sdk - provided - - - org.graalvm.nativeimage - svm - provided - - - io.projectreactor.tools - blockhound - provided - - - ch.qos.logback - logback-classic - test - - - junit - junit - test - - - com.tngtech.java - junit-dataprovider - test - - - org.assertj - assertj-core - test - - - org.mockito - mockito-core - test - - - io.reactivex.rxjava2 - rxjava - test - - - org.reactivestreams - reactive-streams-tck - test - - - org.awaitility - awaitility - test - - - org.testng - testng - test - - - com.github.tomakehurst - wiremock - test - - - - - - src/main/resources - - com/datastax/oss/driver/Driver.properties - - true - - - src/main/resources - - com/datastax/oss/driver/Driver.properties - - false - - - ${project.basedir}/.. - - LICENSE - NOTICE_binary.txt - NOTICE.txt - - META-INF - - - - - src/test/resources - - project.properties - - true - - - src/test/resources - - project.properties - - false - - - - - maven-jar-plugin - - - - com.datastax.oss.driver.core - - - - - - test-jar - - test-jar - - - - logback-test.xml - - - - - - - maven-surefire-plugin - - ${testing.jvm}/bin/java - ${mockitoopens.argline} - 1 - - - listener - com.datastax.oss.driver.DriverRunListener - - - - junit - false - - - suitename - Reactive Streams TCK - - - - - - org.apache.maven.surefire - surefire-junit47 - ${surefire.version} - - - org.apache.maven.surefire - surefire-testng - ${surefire.version} - - - - - org.apache.felix - maven-bundle-plugin - true - - - - bundle - - - - com.datastax.oss.driver.core - - * - - !net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*, - !org.graalvm.*, !com.oracle.svm.*, - jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional, org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, org.javatuples.*;resolution:=optional, reactor.blockhound.*;resolution:=optional, * - - com.datastax.oss.driver.*.core.*, com.datastax.dse.driver.*.core.* - - - - - - - maven-dependency-plugin - - - generate-dependency-list - - list - - generate-resources - - runtime - true - com.datastax.cassandra,com.datastax.dse - ${project.build.outputDirectory}/com/datastax/dse/driver/internal/deps.txt - - - - - - - diff --git a/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.pom.sha1 b/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.pom.sha1 deleted file mode 100644 index 7d09703021..0000000000 --- a/lib/org/apache/cassandra/java-driver-core/4.19.0-preview1/java-driver-core-4.19.0-preview1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -1b4b687782bb507e676853284ec8a390ac1d6004 java-driver-core-4.19.0-preview1.pom diff --git a/lib/org/apache/cassandra/java-driver-core/maven-metadata-local.xml b/lib/org/apache/cassandra/java-driver-core/maven-metadata-local.xml deleted file mode 100644 index 25cfeabc3a..0000000000 --- a/lib/org/apache/cassandra/java-driver-core/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - org.apache.cassandra - java-driver-core - - 4.19.0-preview1 - - 4.19.0-preview1 - - 20241016035805 - - diff --git a/lib/org/apache/cassandra/java-driver-parent/4.19.0-preview1/java-driver-parent-4.19.0-preview1.pom b/lib/org/apache/cassandra/java-driver-parent/4.19.0-preview1/java-driver-parent-4.19.0-preview1.pom deleted file mode 100644 index 4c2faaae19..0000000000 --- a/lib/org/apache/cassandra/java-driver-parent/4.19.0-preview1/java-driver-parent-4.19.0-preview1.pom +++ /dev/null @@ -1,1039 +0,0 @@ - - - - 4.0.0 - - org.apache - apache - 23 - - org.apache.cassandra - java-driver-parent - 4.19.0-preview1 - pom - Apache Cassandra Java Driver - https://github.com/datastax/java-driver - 2017 - - core - core-shaded - query-builder - mapper-runtime - mapper-processor - metrics/micrometer - metrics/microprofile - test-infra - integration-tests - osgi-tests - distribution-source - distribution - distribution-tests - examples - bom - - - UTF-8 - UTF-8 - 1.4.1 - - 2.1.12 - 4.1.18 - 4.1.94.Final - 1.2.1 - - 3.5.6 - - 1.7.26 - - 1.0.3 - 20230227 - 2.13.4 - 2.13.4.2 - - 1.1.10.1 - 1.7.1 - - 3.19.0 - 1.3 - 4.13.2 - 1.2.3 - 6.0.0 - 7.0.1 - 4.13.4 - 2.6.4 - 0.11.0 - 1.1.4 - 2.31 - 2.5.0 - 2.1.1 - 1.1.4 - 2.2.2 - 4.0.3 - 2.0.0-M19 - 3.0.0 - 22.0.0.2 - false - ${skipTests} - - - - - org.apache.cassandra - java-driver-core - ${project.version} - test-jar - - - io.netty - netty-handler - ${netty.version} - - - - com.google.guava - guava - 25.1-jre - - - com.typesafe - config - ${config.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - org.lz4 - lz4-java - ${lz4.version} - - - com.github.jnr - jnr-posix - - 3.1.15 - - - io.dropwizard.metrics - metrics-core - ${metrics.version} - - - org.hdrhistogram - HdrHistogram - ${hdrhistogram.version} - - - com.esri.geometry - esri-geometry-api - ${esri.version} - - - org.json - json - ${json.version} - - - org.apache.tinkerpop - gremlin-core - ${tinkerpop.version} - - - org.yaml - snakeyaml - - - com.carrotsearch - hppc - - - com.jcabi - * - - - net.objecthunter - exp4j - - - - - org.apache.tinkerpop - tinkergraph-gremlin - ${tinkerpop.version} - - - org.reactivestreams - reactive-streams - ${reactive-streams.version} - - - org.reactivestreams - reactive-streams-tck - ${reactive-streams.version} - - - com.github.stephenc.jcip - jcip-annotations - 1.0-1 - - - com.github.spotbugs - spotbugs-annotations - 3.1.12 - - - com.squareup - javapoet - 1.13.0 - - - junit - junit - ${junit.version} - - - com.tngtech.java - junit-dataprovider - 1.13.1 - - - org.assertj - assertj-core - ${assertj.version} - - - org.mockito - mockito-core - 2.28.2 - - - io.reactivex.rxjava2 - rxjava - ${rxjava.version} - - - com.datastax.oss.simulacron - simulacron-native-server - ${simulacron.version} - - - org.apache.commons - commons-exec - ${commons-exec.version} - - - org.osgi - org.osgi.core - ${osgi.version} - - - org.apache.felix - org.apache.felix.framework - ${felix.version} - - - org.ops4j.pax.exam - pax-exam-junit4 - ${pax-exam.version} - - - org.ops4j.pax.exam - pax-exam-container-forked - ${pax-exam.version} - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${pax-exam.version} - - - org.ops4j.pax.url - pax-url-wrap - ${pax-url.version} - - - org.ops4j.pax.url - pax-url-reference - ${pax-url.version} - - - org.ops4j.pax.tinybundles - tinybundles - 3.0.0 - - - org.glassfish - javax.json - ${jsr353-ri.version} - - - javax.json - javax.json-api - ${jsr353-api.version} - - - javax.ws.rs - javax.ws.rs-api - ${jax-rs.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey.version} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} - - - org.glassfish.jersey.containers - jersey-container-jdk-http - ${jersey.version} - - - org.glassfish.jersey.inject - jersey-hk2 - ${jersey.version} - - - org.glassfish.hk2 - hk2-api - ${hk2.version} - - - javax.inject - javax.inject - 1 - - - javax.annotation - javax.annotation-api - 1.3.2 - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - - - com.google.testing.compile - compile-testing - 0.19 - - - org.awaitility - awaitility - ${awaitility.version} - - - org.testng - testng - 7.3.0 - - - org.apache.directory.server - apacheds-core - ${apacheds.version} - - - org.slf4j - slf4j-log4j12 - - - - - org.apache.directory.server - apacheds-protocol-kerberos - ${apacheds.version} - - - org.apache.directory.server - apacheds-interceptor-kerberos - ${apacheds.version} - - - org.apache.directory.server - apacheds-protocol-ldap - ${apacheds.version} - - - org.apache.directory.server - apacheds-ldif-partition - ${apacheds.version} - - - org.apache.directory.server - apacheds-jdbm-partition - ${apacheds.version} - - - org.apache.directory.api - api-ldap-codec-standalone - 1.0.0-M26 - - - com.github.tomakehurst - wiremock - 2.25.0 - - - org.graalvm.sdk - graal-sdk - ${graalapi.version} - - - org.graalvm.nativeimage - svm - ${graalapi.version} - - - io.micrometer - micrometer-core - 1.6.5 - - - org.eclipse.microprofile.metrics - microprofile-metrics-api - 3.0 - - - io.smallrye - smallrye-metrics - 3.0.3 - - - io.projectreactor - reactor-bom - 2020.0.5 - pom - import - - - io.projectreactor.tools - blockhound - 1.0.8.RELEASE - - - io.projectreactor.tools - blockhound-junit-platform - 1.0.8.RELEASE - - - - - - - - maven-compiler-plugin - 3.8.1 - - - com.coveo - fmt-maven-plugin - 2.9 - - - au.com.acegi - xml-format-maven-plugin - 3.1.1 - - - com.mycila - license-maven-plugin - 3.0 - - - maven-surefire-plugin - ${surefire.version} - - - maven-failsafe-plugin - ${surefire.version} - - - maven-shade-plugin - 3.2.3 - - - maven-assembly-plugin - 3.3.0 - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - 2.11 - - -i - console.scala - - - - - maven-source-plugin - 3.1.0 - - - maven-javadoc-plugin - 3.2.0 - - - maven-jar-plugin - 3.2.0 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - - - maven-gpg-plugin - 1.6 - - - maven-release-plugin - 2.5.3 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - maven-dependency-plugin - 3.1.2 - - - org.jacoco - jacoco-maven-plugin - 0.8.10 - - - org.apache.felix - maven-bundle-plugin - 5.1.1 - - - org.revapi - revapi-maven-plugin - 0.10.5 - - false - \d+\.\d+\.\d+ - - - - - java.class.externalClassExposedInAPI - - - - - - com.datastax.oss:${project.artifactId}:RELEASE - - - - - org.revapi - revapi-java - 0.22.1 - - - - - org.codehaus.mojo - versions-maven-plugin - 2.7 - - - org.codehaus.mojo - flatten-maven-plugin - 1.2.1 - - - - - - maven-compiler-plugin - - javac-with-errorprone - true - 1.8 - 1.8 - - -Xep:FutureReturnValueIgnored:OFF - -Xep:PreferJavaTimeOverload:OFF - -Xep:AnnotateFormatMethod:OFF - -Xep:WildcardImport:WARN - -XepExcludedPaths:.*/target/(?:generated-sources|generated-test-sources)/.* - - true - true - false - - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.8.6 - - - com.google.errorprone - error_prone_core - 2.3.4 - - - - - com.coveo - fmt-maven-plugin - - - - check - - process-sources - - - - - au.com.acegi - xml-format-maven-plugin - - - - xml-check - - - - - - .idea/** - **/target/** - **/dependency-reduced-pom.xml - **/.flattened-pom.xml - docs/** - - - - - com.mycila - license-maven-plugin - - - - src/**/*.java - src/**/*.xml - src/**/*.properties - **/pom.xml - - - src/**/native-image.properties - **/src/main/config/ide/** - - - SLASHSTAR_STYLE - SCRIPT_STYLE - - true - - - - check-license - initialize - - check - - - - - - org.jacoco - jacoco-maven-plugin - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - maven-surefire-plugin - - ${testing.jvm}/bin/java - - ${project.basedir}/src/test/resources/logback-test.xml - - - - usedefaultlisteners - false - - - ${skipUnitTests} - - - - maven-failsafe-plugin - - - ${project.basedir}/src/test/resources/logback-test.xml - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://repository.apache.org/ - false - true - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - LICENSE_binary - NOTICE_binary.txt - - - - - - - maven-javadoc-plugin - - false - true - all,-missing - com.datastax.*.driver.internal* - - - apiNote - a - API note: - - - - leaks - X - - - - - - - check-api-leaks - - javadoc - - process-classes - - com.datastax.oss.doclet.ApiPlumber - - com.datastax.oss - api-plumber-doclet - 1.0.0 - - - - -preventleak - com.datastax.oss.driver.internal - com.datastax.dse.driver.internal - - -preventleak - com.datastax.oss.driver.shaded - - -preventleak - com.typesafe.config - - -preventleak - com.codahale.metrics - - -preventleak - org.HdrHistogram - - -preventleak - io.netty - - -preventleak - jnr - -preventleak - com.kenai.constantine - -preventleak - com.kenai.jffi - -preventleak - com.kenai.jnr - - -preventleak - net.jpountz - -preventleak - org.xerial.snappy - - false - - - - - - maven-release-plugin - - @{project.version} - true - false - release - deploy - - -DskipITs - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.version} - <_include>-osgi.bnd - - - jar - bundle - pom - - - - - org.revapi - revapi-maven-plugin - - - - check - - - - - revapi.json - - - - - - - org.apache.maven.plugins - maven-remote-resources-plugin - 1.7.0 - - true - - - - - - - release - - - - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - - fast - - true - true - true - true - true - true - true - true - - - - - test-jdk-environment - - - !testJavaHome - - - - ${env.JAVA_HOME} - - - - - test-jdk-specified - - - testJavaHome - - - - ${testJavaHome} - - - - - test-jdk-8 - - [8,) - - - - - test-jdk-11 - - [11,) - - - - - test-jdk-14 - - [14,) - - - - -XX:+AllowRedefinitionToAddDeleteMethods - - - - - test-jdk-17 - - [17,) - - - - -XX:+AllowRedefinitionToAddDeleteMethods - - --add-opens java.base/jdk.internal.util.random=ALL-UNNAMED - - - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - Apache License Version 2.0 - - - - scm:git:git@github.com:datastax/java-driver.git - scm:git:git@github.com:datastax/java-driver.git - https://github.com/datastax/java-driver - HEAD - - - - Various - DataStax - - - diff --git a/lib/org/apache/cassandra/java-driver-parent/4.19.0-preview1/java-driver-parent-4.19.0-preview1.pom.sha1 b/lib/org/apache/cassandra/java-driver-parent/4.19.0-preview1/java-driver-parent-4.19.0-preview1.pom.sha1 deleted file mode 100644 index 9f739de084..0000000000 --- a/lib/org/apache/cassandra/java-driver-parent/4.19.0-preview1/java-driver-parent-4.19.0-preview1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -3011447ccd45cdc8c2a799a1710e1e86e969b052 java-driver-parent-4.19.0-preview1.pom diff --git a/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.jar b/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.jar deleted file mode 100644 index 7358292868..0000000000 Binary files a/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.jar and /dev/null differ diff --git a/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.pom b/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.pom deleted file mode 100644 index f0b7d480dc..0000000000 --- a/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.pom +++ /dev/null @@ -1,156 +0,0 @@ - - - - 4.0.0 - - org.apache.cassandra - java-driver-parent - 4.19.0-preview1 - - java-driver-query-builder - bundle - Apache Cassandra Java Driver - query builder - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - - - - org.apache.cassandra - java-driver-core - - - com.datastax.oss - java-driver-shaded-guava - - - com.github.stephenc.jcip - jcip-annotations - provided - - - com.github.spotbugs - spotbugs-annotations - provided - - - junit - junit - test - - - com.tngtech.java - junit-dataprovider - test - - - org.assertj - assertj-core - test - - - org.apache.cassandra - java-driver-core - test - test-jar - - - - - - src/main/resources - - - ${project.basedir}/.. - - LICENSE - NOTICE_binary.txt - NOTICE.txt - - META-INF - - - - - src/test/resources - - project.properties - - true - - - src/test/resources - - project.properties - - false - - - - - maven-jar-plugin - - - - com.datastax.oss.driver.querybuilder - - - - - - org.apache.felix - maven-bundle-plugin - - - com.datastax.oss.driver.querybuilder - !net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*, * - com.datastax.oss.driver.*.querybuilder.*, com.datastax.dse.driver.*.querybuilder.* - - - - - maven-dependency-plugin - - - generate-dependency-list - - list - - generate-resources - - runtime - true - com.datastax.cassandra,com.datastax.dse - ${project.build.outputDirectory}/com/datastax/dse/driver/internal/querybuilder/deps.txt - - - - - - - diff --git a/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.pom.sha1 b/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.pom.sha1 deleted file mode 100644 index 80bc7511f7..0000000000 --- a/lib/org/apache/cassandra/java-driver-query-builder/4.19.0-preview1/java-driver-query-builder-4.19.0-preview1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -02164111a9554875fcc5a730622777d59fd1e975 java-driver-query-builder-4.19.0-preview1.pom diff --git a/pom.xml b/pom.xml index 5efa4f5d19..29e6906917 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ true - 4.17.0 + 4.19.3 3.14.0 21 @@ -94,6 +94,7 @@ + io.quarkus @@ -204,7 +206,7 @@ sts - com.datastax.oss + org.apache.cassandra java-driver-core ${driver.version} @@ -226,22 +228,15 @@ - com.datastax.oss + org.apache.cassandra java-driver-metrics-micrometer ${driver.version} - - org.apache.cassandra java-driver-query-builder - 4.19.0-preview1 + ${driver.version} - - - - - diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/TenantAwareCqlSessionBuilder.java b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/TenantAwareCqlSessionBuilder.java index 01ce5b77ad..9066f1f284 100644 --- a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/TenantAwareCqlSessionBuilder.java +++ b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/TenantAwareCqlSessionBuilder.java @@ -76,8 +76,8 @@ public TenantAwareDriverContext( * @return startup options */ @Override - protected Map buildStartupOptions() { - Map existing = super.buildStartupOptions(); + public Map getStartupOptions() { + Map existing = super.getStartupOptions(); return NullAllowingImmutableMap.builder(existing.size() + 1) .putAll(existing) .put(TENANT_ID_PROPERTY_KEY, tenantId) diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LexicalSortSelect.java b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LexicalSortSelect.java index 44d87717ce..75096885c6 100644 --- a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LexicalSortSelect.java +++ b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LexicalSortSelect.java @@ -5,24 +5,18 @@ import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder; import com.datastax.oss.driver.api.querybuilder.BindMarker; import com.datastax.oss.driver.api.querybuilder.relation.Relation; +import com.datastax.oss.driver.api.querybuilder.select.OrderingClause; import com.datastax.oss.driver.api.querybuilder.select.Select; import com.datastax.oss.driver.api.querybuilder.select.SelectFrom; import com.datastax.oss.driver.api.querybuilder.select.Selector; import com.datastax.oss.driver.internal.core.util.Strings; import com.datastax.oss.driver.internal.querybuilder.select.DefaultSelect; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import java.util.Map; +import java.util.Optional; /** Subclass for forcing use of "ORDER BY BM25 OF" (lexical sort) in the select clause. */ public class LexicalSortSelect extends DefaultSelect { - private static final ImmutableMap ORDER_BY_PLACEHOLDER = - ImmutableMap.of(CqlIdentifier.fromInternal("abc"), ClusteringOrder.DESC); - private static final String ORDER_BY_PLACEHOLDER_TEXT = "ORDER BY abc DESC"; - - private final CqlIdentifier sortColumn; - private final String sortText; - public LexicalSortSelect(DefaultSelect base, CqlIdentifier sortColumn, String sortText) { super( base.getKeyspace(), @@ -32,14 +26,10 @@ public LexicalSortSelect(DefaultSelect base, CqlIdentifier sortColumn, String so base.getSelectors(), base.getRelations(), base.getGroupByClauses(), - // important: use placeholder for ORDER BY - ORDER_BY_PLACEHOLDER, - base.getAnn(), + Optional.of(new Bm25OrderingClause(sortColumn, sortText)), base.getLimit(), base.getPerPartitionLimit(), base.allowsFiltering()); - this.sortColumn = sortColumn; - this.sortText = sortText; } private LexicalSortSelect(LexicalSortSelect base, Object limit, boolean allowsFiltering) { @@ -51,14 +41,10 @@ private LexicalSortSelect(LexicalSortSelect base, Object limit, boolean allowsFi base.getSelectors(), base.getRelations(), base.getGroupByClauses(), - base.getOrderings(), - base.getAnn(), + base.getOrderingClause(), limit, base.getPerPartitionLimit(), allowsFiltering); - - this.sortColumn = base.sortColumn; - this.sortText = base.sortText; } // First needed and supported overrides: @@ -163,32 +149,33 @@ public Select orderByIds(Map newOrderings) { } @Override - public Select withOrderings(ImmutableMap newOrderings) { - throw new UnsupportedOperationException("LexicalSortSelect does not support withOrderings()"); + public Select withOrderingClause(OrderingClause newOrderingClause) { + throw new UnsupportedOperationException( + "LexicalSortSelect does not support withOrderingClause()"); } - // And finally the override for asCql() to force the ORDER BY clause: + /** + * Custom {@link OrderingClause} that renders the lexical sort clause {@code ORDER BY + * BM25 OF ''}, which the driver's query builder does not support natively. + */ + private static final class Bm25OrderingClause extends OrderingClause { + private final CqlIdentifier sortColumn; + private final String sortText; - @Override - public String asCql() { - String cql = super.asCql(); - int ix = cql.indexOf(ORDER_BY_PLACEHOLDER_TEXT); - // Sanity check, should always be there - if (ix < 0) { - throw new IllegalStateException( - "Expected ORDER BY placeholder text ('" - + ORDER_BY_PLACEHOLDER_TEXT - + "') not found in CQL: " - + cql); + Bm25OrderingClause(CqlIdentifier sortColumn, String sortText) { + this.sortColumn = sortColumn; + this.sortText = sortText; + } + + @Override + public void appendTo(StringBuilder builder) { + builder + .append(" ORDER BY ") + .append(sortColumn.asCql(false)) + .append(" BM25 OF ") + // 11-Jul-2025, tatu: ideally would use a BindMarker here, but binding + // values is difficult to do from this context. So escape explicitly. + .append(Strings.quote(sortText)); } - // Force the use of "ORDER BY BM25 OF" for lexical sort - return cql.substring(0, ix) - + " ORDER BY " - + sortColumn.asCql(false) - + " BM25 OF " - // 11-Jul-2025, tatu: ideally would use a BindMarker here, but binding - // values is difficult to do from this context. So escape explicitly. - + Strings.quote(sortText) - + cql.substring(ix + ORDER_BY_PLACEHOLDER_TEXT.length()); } } diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LogicalRelation.java b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LogicalRelation.java index dc44c9db52..74d4924d00 100644 --- a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LogicalRelation.java +++ b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/override/LogicalRelation.java @@ -2,7 +2,6 @@ import com.datastax.oss.driver.api.querybuilder.relation.Relation; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import net.jcip.annotations.Immutable; import org.jspecify.annotations.NonNull; /** @@ -12,7 +11,6 @@ * does not support this as of now. See Ticket CASSJAVA-47. */ -@Immutable public class LogicalRelation implements Relation { public static final LogicalRelation AND = new LogicalRelation("AND"); public static final LogicalRelation OR = new LogicalRelation("OR");