Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Cassandra client to 1.0.1 #211

Merged
merged 1 commit into from
Mar 26, 2021
Merged

Update Cassandra client to 1.0.1 #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-bom-deployment</artifactId>
<version>${quarkus-cassandra-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Camel extensions -->
<!-- This BOM must be the last one as otherwise it will set the dependency versions before the other BOM -->
Expand Down
106 changes: 106 additions & 0 deletions integration-tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-cassandra-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-cassandra-client-main</artifactId>

<properties>
<failsafe.testGroups>!native</failsafe.testGroups>
</properties>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-cassandra-rpkgtests</artifactId>
<version>${project.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-integration-tests-main</artifactId>
<version>${quarkus-cassandra-client.version}</version>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-integration-tests-main-rpkgtests</artifactId>
<version>${quarkus-cassandra-client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-test-framework</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-main-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<systemProperties>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
</systemProperties>
<groups>${failsafe.testGroups}</groups>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native-image</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.enable-http-url-handler>true</quarkus.native.enable-http-url-handler>
<failsafe.testGroups>native</failsafe.testGroups>
</properties>
</profile>
</profiles>
</project>
0 ...t/client/src/test/resources/classpathseed → ...sts-main/src/test/resources/classpathseed
View file
Open in desktop
File renamed without changes.
106 changes: 106 additions & 0 deletions ...tests/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-disabled/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-cassandra-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-cassandra-client-metrics-disabled</artifactId>

<properties>
<failsafe.testGroups>!native</failsafe.testGroups>
</properties>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-cassandra-rpkgtests</artifactId>
<version>${project.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-integration-tests-metrics-disabled</artifactId>
<version>${quarkus-cassandra-client.version}</version>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-integration-tests-metrics-disabled-rpkgtests</artifactId>
<version>${quarkus-cassandra-client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-test-framework</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-metrics-disabled-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<systemProperties>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
</systemProperties>
<groups>${failsafe.testGroups}</groups>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native-image</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.enable-http-url-handler>true</quarkus.native.enable-http-url-handler>
<failsafe.testGroups>native</failsafe.testGroups>
</properties>
</profile>
</profiles>
</project>
4 changes: 4 additions & 0 deletions ...oot/cassandra-quarkus-integration-tests-metrics-disabled/src/test/resources/classpathseed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
106 changes: 106 additions & 0 deletions ...s/cassandra/invoked/root/cassandra-quarkus-integration-tests-metrics-microprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-cassandra-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>quarkus-universe-integration-tests-cassandra-client-metrics-microprofile</artifactId>

<properties>
<failsafe.testGroups>!native</failsafe.testGroups>
</properties>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-universe-integration-tests-cassandra-rpkgtests</artifactId>
<version>${project.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-integration-tests-metrics-microprofile</artifactId>
<version>${quarkus-cassandra-client.version}</version>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-integration-tests-metrics-microprofile-rpkgtests</artifactId>
<version>${quarkus-cassandra-client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-test-framework</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>com.datastax.oss.quarkus:cassandra-quarkus-integration-tests-metrics-microprofile-rpkgtests</dependency>
</dependenciesToScan>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<systemProperties>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
</systemProperties>
<groups>${failsafe.testGroups}</groups>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native-image</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.enable-http-url-handler>true</quarkus.native.enable-http-url-handler>
<failsafe.testGroups>native</failsafe.testGroups>
</properties>
</profile>
</profiles>
</project>
4 changes: 4 additions & 0 deletions ...cassandra-quarkus-integration-tests-metrics-microprofile/src/test/resources/classpathseed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Loading