Changing cassandra version and using datastax driver

1 files changed, 127 insertions, 18 deletions

diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
index 116125850..bb9ae94fa 100644
--- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -31,7 +31,8 @@
 
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
-    <cassandraVersion>3.11.11</cassandraVersion>
+    <cassandraVersion>4.0.0</cassandraVersion>
+    <datastax.driver.version>4.13.0</datastax.driver.version>
   </properties>
 
   <dependencies>
@@ -102,16 +103,18 @@
       <artifactId>modelmapper</artifactId>
     </dependency>
 
+    <!--
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
       <version>1.27</version>
     </dependency>
-
+-->
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-all</artifactId>
       <version>${cassandraVersion}</version>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
@@ -166,15 +169,37 @@
           <groupId>com.addthis.metrics</groupId>
           <artifactId>reporter-config3</artifactId>
         </exclusion>
-        <!-- Version upgrade, see below -->
         <exclusion>
-          <groupId>org.apache.tika</groupId>
-          <artifactId>tika-core</artifactId>
+          <groupId>net.openhft</groupId>
+          <artifactId>chronicle-wire</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>net.openhft</groupId>
+      <artifactId>chronicle-wire</artifactId>
+      <version>2.21.89</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
+      <groupId>com.datastax.oss</groupId>
+      <artifactId>java-driver-core</artifactId>
+      <version>${datastax.driver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.datastax.oss</groupId>
+      <artifactId>java-driver-query-builder</artifactId>
+      <version>${datastax.driver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.datastax.oss</groupId>
+      <artifactId>java-driver-mapper-runtime</artifactId>
+      <version>${datastax.driver.version}</version>
+    </dependency>
+
+    <!--
+    <dependency>
       <groupId>org.hectorclient</groupId>
       <artifactId>hector-core</artifactId>
       <version>1.1-4</version>
@@ -197,6 +222,8 @@
         </exclusion>
       </exclusions>
     </dependency>
+    -->
+    <!--
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-thrift</artifactId>
@@ -212,7 +239,9 @@
           </exclusion>
       </exclusions>
     </dependency>
+    -->
     <!-- Transient dependencies of cassandra that are selected to use a higher version -->
+    <!--
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
@@ -234,26 +263,36 @@
       <artifactId>tika-core</artifactId>
       <version>1.26</version>
     </dependency>
-
+-->
     <!-- Transitive dependency. Declared here to increase the version. -->
+    <!--
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
       <version>${netty.version}</version>
     </dependency>
+    -->
+    <!--
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-
+-->
     <!-- Is a dependency of cassandra -> hibernate-validator and replaced by new version -->
+    <!--
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
     </dependency>
+    -->
 
     <!-- TEST Scope -->
     <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
@@ -297,6 +336,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+
 
   </dependencies>
 
@@ -320,10 +365,11 @@
             </goals>
             <configuration>
               <portNames>
-                <portName>cassandraPort</portName>
+                <portName>cassandra.rpcPort</portName>
                 <portName>cassandra.storagePort</portName>
                 <portName>cassandra.stopPort</portName>
                 <portName>cassandra.jmxPort</portName>
+                <portName>cassandra.nativeTransportPort</portName>
               </portNames>
             </configuration>
           </execution>
@@ -332,27 +378,37 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cassandra-maven-plugin</artifactId>
-        <version>2.0.0-1</version>
+        <version>3.6</version>
         <executions>
           <execution>
             <id>start-cassandra</id>
-            <phase>process-test-classes</phase>
+            <phase>pre-integration-test</phase>
             <goals>
               <goal>start</goal>
             </goals>
             <configuration>
-              <rpcPort>${cassandraPort}</rpcPort>
+              <nativeTransportPort>${cassandra.nativeTransportPort}</nativeTransportPort>
+              <rpcPort>${cassandra.rpcPort}</rpcPort>
               <storagePort>${cassandra.storagePort}</storagePort>
               <stopPort>${cassandra.stopPort}</stopPort>
               <jmxPort>${cassandra.jmxPort}</jmxPort>
               <addMainClasspath>false</addMainClasspath>
               <addTestClasspath>false</addTestClasspath>
               <startWaitSeconds>500</startWaitSeconds>
+              <startNativeTransport>true</startNativeTransport>
+              <logLevel>DEBUG</logLevel>
+              <loadAfterFirstStart>false</loadAfterFirstStart>
+              <yaml>
+                broadcast_rpc_address: 127.0.0.1
+              </yaml>
+              <systemPropertyVariables>
+                <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+              </systemPropertyVariables>
             </configuration>
           </execution>
           <execution>
             <id>stop-cassandra</id>
-            <phase>test</phase>
+            <phase>post-integration-test</phase>
             <goals>
               <goal>stop</goal>
             </goals>
@@ -364,21 +420,74 @@
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j.version}</version>
           </dependency>
+          <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>4.2.2</version>
+          </dependency>
+            <dependency>
+              <groupId>org.apache.cassandra</groupId>
+              <artifactId>cassandra-all</artifactId>
+              <version>3.11.10</version>
+            </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>3.0.0-M5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+          <systemPropertyVariables>
+            <cassandra.port>${cassandra.nativeTransportPort}</cassandra.port>
+            <cassandra.host>127.0.0.1</cassandra.host>
+            <archiva.repositorySessionFactory.id>cassandra</archiva.repositorySessionFactory.id>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+            <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+          </systemPropertyVariables>
+          <trimStackTrace>false</trimStackTrace>
+          <skip>false</skip>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.jupiter.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
     </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <executions>
+
+          </executions>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <systemPropertyVariables>
-              <cassandra.port>${cassandraPort}</cassandra.port>
-              <archiva.repositorySessionFactory.id>cassandra</archiva.repositorySessionFactory.id>
-              <appserver.base>${project.build.directory}/appserver-base</appserver.base>
-            </systemPropertyVariables>
-            <trimStackTrace>false</trimStackTrace>
+            <excludes>
+              <exclude>src/cassandra/**</exclude>
+            </excludes>
           </configuration>
         </plugin>
       </plugins>