diff --git a/bom/pom.xml b/bom/pom.xml index c49be69b02..b277410ef3 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -144,13 +144,6 @@ pom import - - com.datastax.oss.quarkus - cassandra-quarkus-bom-deployment - ${quarkus-cassandra-client.version} - pom - import - diff --git a/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-main/pom.xml b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-main/pom.xml new file mode 100644 index 0000000000..579816b0d0 --- /dev/null +++ b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-main/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + io.quarkus + quarkus-universe-integration-tests-cassandra-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-universe-integration-tests-cassandra-client-main + + + !native + + + + + io.quarkus + quarkus-universe-integration-tests-cassandra-rpkgtests + ${project.version} + pom + + + * + * + + + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-main + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-main-rpkgtests + ${quarkus-cassandra-client.version} + test + + + io.rest-assured + rest-assured + test + + + com.datastax.oss.quarkus + cassandra-quarkus-test-framework + test + + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + + + + build + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-main-rpkgtests + + + + + + integration-test + verify + + + + ${project.build.directory}/${project.build.finalName}-runner + + ${failsafe.testGroups} + + + + + + + + + native-image + + + native + + + + native + true + native + + + + diff --git a/integration-tests/cassandra/invoked/root/client/src/test/resources/classpathseed b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-main/src/test/resources/classpathseed similarity index 100% rename from integration-tests/cassandra/invoked/root/client/src/test/resources/classpathseed rename to integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-main/src/test/resources/classpathseed diff --git a/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/pom.xml b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/pom.xml new file mode 100644 index 0000000000..bc325d09db --- /dev/null +++ b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + io.quarkus + quarkus-universe-integration-tests-cassandra-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-universe-integration-tests-cassandra-client-metrics-disabled + + + !native + + + + + io.quarkus + quarkus-universe-integration-tests-cassandra-rpkgtests + ${project.version} + pom + + + * + * + + + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-disabled + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-disabled-rpkgtests + ${quarkus-cassandra-client.version} + test + + + io.rest-assured + rest-assured + test + + + com.datastax.oss.quarkus + cassandra-quarkus-test-framework + test + + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + + + + build + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-metrics-disabled-rpkgtests + + + + + + integration-test + verify + + + + ${project.build.directory}/${project.build.finalName}-runner + + ${failsafe.testGroups} + + + + + + + + + native-image + + + native + + + + native + true + native + + + + diff --git a/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/src/test/resources/classpathseed b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/src/test/resources/classpathseed new file mode 100644 index 0000000000..5c835ea2fb --- /dev/null +++ b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/src/test/resources/classpathseed @@ -0,0 +1,4 @@ +The purpose of this file is to have a non-empty test-classes directory that will +be added to the test classpath and used by the Quarkus test extension for storing +generated classes and other resources that should appear on the classpath during +the test execution. \ No newline at end of file diff --git a/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/pom.xml b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/pom.xml new file mode 100644 index 0000000000..61136dc656 --- /dev/null +++ b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + io.quarkus + quarkus-universe-integration-tests-cassandra-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-universe-integration-tests-cassandra-client-metrics-microprofile + + + !native + + + + + io.quarkus + quarkus-universe-integration-tests-cassandra-rpkgtests + ${project.version} + pom + + + * + * + + + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-microprofile + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-microprofile-rpkgtests + ${quarkus-cassandra-client.version} + test + + + io.rest-assured + rest-assured + test + + + com.datastax.oss.quarkus + cassandra-quarkus-test-framework + test + + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + + + + build + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-metrics-microprofile-rpkgtests + + + + + + integration-test + verify + + + + ${project.build.directory}/${project.build.finalName}-runner + + ${failsafe.testGroups} + + + + + + + + + native-image + + + native + + + + native + true + native + + + + diff --git a/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/src/test/resources/classpathseed b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/src/test/resources/classpathseed new file mode 100644 index 0000000000..5c835ea2fb --- /dev/null +++ b/integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/src/test/resources/classpathseed @@ -0,0 +1,4 @@ +The purpose of this file is to have a non-empty test-classes directory that will +be added to the test classpath and used by the Quarkus test extension for storing +generated classes and other resources that should appear on the classpath during +the test execution. \ No newline at end of file diff --git a/integration-tests/cassandra/invoked/root/client/pom.xml b/integration-tests/cassandra/invoked/root/client/pom.xml deleted file mode 100644 index 5330363dd7..0000000000 --- a/integration-tests/cassandra/invoked/root/client/pom.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - 4.0.0 - - io.quarkus - quarkus-universe-integration-tests-cassandra-parent - 999-SNAPSHOT - ../pom.xml - - - quarkus-universe-integration-tests-cassandra-client - - - - io.quarkus - quarkus-universe-integration-tests-cassandra-rpkgtests - ${project.version} - pom - - - * - * - - - - - com.datastax.oss.quarkus - cassandra-quarkus-integration-tests - ${quarkus-cassandra-client.version} - - - com.datastax.oss.quarkus - cassandra-quarkus-integration-tests-rpkgtests - ${quarkus-cassandra-client.version} - test - - - io.rest-assured - rest-assured - test - - - com.datastax.oss.quarkus - cassandra-quarkus-test-framework - test - - - - - - vm - - true - - !native - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - default - - integration-test - verify - - - native - - com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-rpkgtests - - - - - - - - - - native-image - - - native - - - - - - io.quarkus - quarkus-maven-plugin - ${quarkus.version} - - - native-image - - native-image - - - com.datastax.oss.quarkus:cassandra-quarkus-integration-tests:${quarkus-cassandra-client.version} - false - true - true - false - false - ${graalvmHome} - true - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-rpkgtests - - - - - - default - - integration-test - verify - - - native - ${project.build.directory}/failsafe-reports/failsafe-summary-vm.xml - - - - - native-tests - - integration-test - verify - - - native - ${project.build.directory}/failsafe-reports/failsafe-summary-native.xml - - ${project.build.directory}/${project.build.finalName}-runner - - - - - - - - - - diff --git a/integration-tests/cassandra/invoked/root/pom.xml b/integration-tests/cassandra/invoked/root/pom.xml index c11066ff59..d0ca72da8b 100644 --- a/integration-tests/cassandra/invoked/root/pom.xml +++ b/integration-tests/cassandra/invoked/root/pom.xml @@ -16,7 +16,9 @@ rpkgtests - client + cassandra-quarkus-integration-tests-main + cassandra-quarkus-integration-tests-metrics-disabled + cassandra-quarkus-integration-tests-metrics-microprofile diff --git a/integration-tests/cassandra/invoked/root/rpkgtests/pom.xml b/integration-tests/cassandra/invoked/root/rpkgtests/pom.xml index eb8fa91773..3446c8db66 100644 --- a/integration-tests/cassandra/invoked/root/rpkgtests/pom.xml +++ b/integration-tests/cassandra/invoked/root/rpkgtests/pom.xml @@ -14,7 +14,17 @@ com.datastax.oss.quarkus - cassandra-quarkus-integration-tests + cassandra-quarkus-integration-tests-main + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-disabled + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-microprofile ${quarkus-cassandra-client.version} @@ -36,7 +46,17 @@ com.datastax.oss.quarkus - cassandra-quarkus-integration-tests + cassandra-quarkus-integration-tests-main + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-disabled + ${quarkus-cassandra-client.version} + + + com.datastax.oss.quarkus + cassandra-quarkus-integration-tests-metrics-microprofile ${quarkus-cassandra-client.version} diff --git a/pom.xml b/pom.xml index 3c3a9d39ac..61da3c379c 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 1.3.0.Final 1.4.0.Final 1.6.0-Alpha2 - 1.0.0 + 1.0.1