From c9f8e433ea7604231adc2b706d7343ffa8c78c40 Mon Sep 17 00:00:00 2001
From: Stefan Miklosovic <smiklosovic@apache.org>
Date: Sun, 18 Dec 2022 21:09:08 +0100
Subject: [PATCH] update Cassandra versions to 4.0.7 and 3.11.14

---
 .circleci/config.yml                                      | 2 +-
 .gitignore                                                | 8 ++++----
 README.adoc                                               | 7 ++++---
 cassandra-3.0/pom.xml                                     | 2 +-
 cassandra-3.11/pom.xml                                    | 2 +-
 {cassandra-4 => cassandra-4.0}/pom.xml                    | 6 +++---
 {cassandra-4 => cassandra-4.0}/src/deb/control/control    | 0
 .../instaclustr/cassandra/auth/KerberosAuthenticator.java | 0
 cassandra-4.1/pom.xml                                     | 4 ++--
 pom.xml                                                   | 2 +-
 10 files changed, 17 insertions(+), 16 deletions(-)
 rename {cassandra-4 => cassandra-4.0}/pom.xml (91%)
 rename {cassandra-4 => cassandra-4.0}/src/deb/control/control (100%)
 rename {cassandra-4 => cassandra-4.0}/src/main/java/com/instaclustr/cassandra/auth/KerberosAuthenticator.java (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ec98455..76a2905 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
             - ~/.m2
           key: m2-{{ checksum "pom.xml" }}
 
-      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-{2.2,3.0,3.11,4,4.1}/target/cassandra-kerberos-*.jar /tmp/artifacts
+      - run: mvn clean install -DoutputDirectory=/tmp/artifacts && cp cassandra-{2.2,3.0,3.11,4.0,4.1}/target/cassandra-kerberos-*.jar /tmp/artifacts
 
       - store_artifacts:
           path: /tmp/artifacts
diff --git a/.gitignore b/.gitignore
index 2bfaf40..c5eef16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 target
 out
 gen
-/cassandra-4.1/dependency-reduced-pom.xml
-/cassandra-3.11/dependency-reduced-pom.xml
-/cassandra-3.0/dependency-reduced-pom.xml
-/cassandra-4/dependency-reduced-pom.xml
 /cassandra-2.2/dependency-reduced-pom.xml
+/cassandra-3.0/dependency-reduced-pom.xml
+/cassandra-3.11/dependency-reduced-pom.xml
+/cassandra-4.0/dependency-reduced-pom.xml
+/cassandra-4.1/dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/README.adoc b/README.adoc
index dbd4474..b8661f6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -14,6 +14,7 @@ Supported versions:
 * 3.0
 * 3.11
 * 4.0
+* 4.1
 
 NOTE: CQLSH integration works only with Cassandra 4.1 and above.
 
@@ -119,10 +120,10 @@ have a valid ticket. How to obtain it is outside this document, but you should s
 [auth_provider]
 module=cassandra.auth
 classname=SaslAuthProvider
-service = cassandra
+service=cassandra
 keytab=/etc/cassandra/cassandra.keytab
-mechanism = GSSAPI
-qop = auth
+mechanism=GSSAPI
+qop=auth
 ----
 
 After successful login, you should have a ticket granted:
diff --git a/cassandra-3.0/pom.xml b/cassandra-3.0/pom.xml
index 0ce30e5..b1c7cd1 100755
--- a/cassandra-3.0/pom.xml
+++ b/cassandra-3.0/pom.xml
@@ -16,7 +16,7 @@
     <description>An authenticator plugin for Apache Cassandra 3.0 to authenticate via GSS-API</description>
 
     <properties>
-        <cassandra.version>3.0.26</cassandra.version>
+        <cassandra.version>3.0.28</cassandra.version>
     </properties>
 
     <dependencies>
diff --git a/cassandra-3.11/pom.xml b/cassandra-3.11/pom.xml
index 292d065..6b36de1 100755
--- a/cassandra-3.11/pom.xml
+++ b/cassandra-3.11/pom.xml
@@ -16,7 +16,7 @@
     <description>An authenticator plugin for Apache Cassandra 3.11 to authenticate via GSS-API</description>
 
     <properties>
-        <cassandra.version>3.11.12</cassandra.version>
+        <cassandra.version>3.11.14</cassandra.version>
     </properties>
 
     <dependencies>
diff --git a/cassandra-4/pom.xml b/cassandra-4.0/pom.xml
similarity index 91%
rename from cassandra-4/pom.xml
rename to cassandra-4.0/pom.xml
index a2d5eb3..97d020b 100755
--- a/cassandra-4/pom.xml
+++ b/cassandra-4.0/pom.xml
@@ -12,11 +12,11 @@
     <artifactId>cassandra-kerberos-4.0</artifactId>
     <version>1.0.0</version>
     
-    <name>Cassandra Kerberos Authenticator for Cassandra 4</name>
-    <description>An authenticator plugin for Apache Cassandra 4 to authenticate via GSS-API</description>
+    <name>Cassandra Kerberos Authenticator for Cassandra 4.0</name>
+    <description>An authenticator plugin for Apache Cassandra 4.0 to authenticate via GSS-API</description>
 
     <properties>
-        <cassandra.version>4.0.3</cassandra.version>
+        <cassandra.version>4.0.7</cassandra.version>
     </properties>
 
     <dependencies>
diff --git a/cassandra-4/src/deb/control/control b/cassandra-4.0/src/deb/control/control
similarity index 100%
rename from cassandra-4/src/deb/control/control
rename to cassandra-4.0/src/deb/control/control
diff --git a/cassandra-4/src/main/java/com/instaclustr/cassandra/auth/KerberosAuthenticator.java b/cassandra-4.0/src/main/java/com/instaclustr/cassandra/auth/KerberosAuthenticator.java
similarity index 100%
rename from cassandra-4/src/main/java/com/instaclustr/cassandra/auth/KerberosAuthenticator.java
rename to cassandra-4.0/src/main/java/com/instaclustr/cassandra/auth/KerberosAuthenticator.java
diff --git a/cassandra-4.1/pom.xml b/cassandra-4.1/pom.xml
index 343e209..653ccea 100755
--- a/cassandra-4.1/pom.xml
+++ b/cassandra-4.1/pom.xml
@@ -13,10 +13,10 @@
     <version>1.0.0</version>
     
     <name>Cassandra Kerberos Authenticator for Cassandra 4.1</name>
-    <description>An authenticator plugin for Apache Cassandra 4 to authenticate via GSS-API</description>
+    <description>An authenticator plugin for Apache Cassandra 4.1 to authenticate via GSS-API</description>
 
     <properties>
-        <cassandra.version>4.1-alpha1</cassandra.version>
+        <cassandra.version>4.1.0</cassandra.version>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index fff7dc2..61dcef3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
         <module>cassandra-2.2</module>
         <module>cassandra-3.0</module>
         <module>cassandra-3.11</module>
-        <module>cassandra-4</module>
+        <module>cassandra-4.0</module>
         <module>cassandra-4.1</module>
     </modules>