upgrade to 3.0.28, 3.11.14, 4.0.7, 4.1.0, 2.2.19

instaclustr · Dec 14, 2022 · 6004f12 · 6004f12
1 parent 092a170
commit 6004f12
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 42 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,12 +24,12 @@ jobs:
           key: m2-{{ checksum "pom.xml" }}
 
       - run: sudo apt install openjdk-8-jdk
-      - run: mvn --version && whereis java && mvn clean install
+      - run: mvn --version && whereis java && mvn clean install -Dversion.cassandra22=2.2.19 -Dversion.cassandra30=3.0.28 -Dversion.cassandra311=3.11.14 -Dversion.cassandra4=4.0.7 -Dversion.cassandra41=4.1.0
 
       - persist_to_workspace:
           root: ~/cassandra-ldap
           paths:
-            - "cassandra-2.2/target/cassandra-ldap-2.2.18*.jar"
+            - "cassandra-2.2/target/cassandra-ldap-2.2**.jar"
             - "cassandra-3.0/target/cassandra-ldap-3.0*.jar"
             - "cassandra-3.11/target/cassandra-ldap-3.11*.jar"
             - "cassandra-4.0/target/cassandra-ldap-4.0*.jar"

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ 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
 
 # Compiled class file
 *.class

diff --git a/base/pom.xml b/base/pom.xml
@@ -16,7 +16,7 @@
      -->
 
     <artifactId>cassandra-ldap-base</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 
     <name>Cassandra LDAP Authenticator common code</name>
     <description>Common code for Apache Cassandra LDAP plugin</description>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
-            <version>3.0.25</version>
+            <version>3.0.28</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/cassandra-2.2/pom.xml b/cassandra-2.2/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.instaclustr</groupId>
         <artifactId>cassandra-ldap-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>cassandra-ldap-2.2.19</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 2.2</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 2.2</description>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.instaclustr</groupId>
             <artifactId>cassandra-ldap-base</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.cassandra</groupId>

diff --git a/cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java b/cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java
@@ -78,8 +78,6 @@ protected void testLDAPinternal() throws Exception {
             logger.info("[first node]: login bill");
             context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
 
-            logger.info("[second node]: login cassandra");
-            context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
             logger.info("[second node]: login bill");
             context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
         } catch (final Exception ex) {

diff --git a/...2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra22LDAPIntegrationTest.java b/...2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra22LDAPIntegrationTest.java
@@ -10,7 +10,7 @@ public String getCassandraVersion() {
 
     @Override
     public String getImplementationGAV() {
-        return "com.instaclustr:cassandra-ldap-2.2.19:1.0.1";
+        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.2";
     }
 
     @Test

diff --git a/cassandra-3.0/pom.xml b/cassandra-3.0/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>com.instaclustr</groupId>
         <artifactId>cassandra-ldap-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-3.0.25</artifactId>
+    <artifactId>cassandra-ldap-3.0.28</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 3.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 3.0</description>
 
     <properties>
-        <version.cassandra30>3.0.25</version.cassandra30>
+        <version.cassandra30>3.0.28</version.cassandra30>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.instaclustr</groupId>
             <artifactId>cassandra-ldap-base</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.cassandra</groupId>

diff --git a/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java b/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java
@@ -73,8 +73,6 @@ protected void testLDAPinternal() throws Exception {
             logger.info("[first node]: login bill");
             context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
 
-            logger.info("[second node]: login cassandra");
-            context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
             logger.info("[second node]: login bill");
             context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
         } catch (final Exception ex) {

diff --git a/...3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java b/...3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java
@@ -5,12 +5,12 @@
 public class Cassandra30LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra30", "3.0.25");
+        return System.getProperty("version.cassandra30", "3.0.28");
     }
 
     @Override
     public String getImplementationGAV() {
-        return "com.instaclustr:cassandra-ldap-3.0.25:1.0.0";
+        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";
     }
 
     @Test

diff --git a/cassandra-3.11/pom.xml b/cassandra-3.11/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>com.instaclustr</groupId>
         <artifactId>cassandra-ldap-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-3.11.11</artifactId>
+    <artifactId>cassandra-ldap-3.11.14</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 3.11</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 3.11</description>
 
     <properties>
-        <version.cassandra311>3.11.11</version.cassandra311>
+        <version.cassandra311>3.11.14</version.cassandra311>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.instaclustr</groupId>
             <artifactId>cassandra-ldap-base</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.cassandra</groupId>

diff --git a/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java b/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java
@@ -76,8 +76,6 @@ protected void testLDAPinternal() throws Exception {
             logger.info("[first node]: login bill");
             context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
 
-            logger.info("[second node]: login cassandra");
-            context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
             logger.info("[second node]: login bill");
             context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
         } catch (final Exception ex) {

diff --git a/...11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java b/...11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java
@@ -5,12 +5,12 @@
 public class Cassandra311LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("version.cassandra311", "3.11.11");
+        return System.getProperty("version.cassandra311", "3.11.14");
     }
 
     @Override
     public String getImplementationGAV() {
-        return "com.instaclustr:cassandra-ldap-3.11.11:1.0.0";
+        return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";
     }
 
     @Test

diff --git a/cassandra-4.0/pom.xml b/cassandra-4.0/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>com.instaclustr</groupId>
         <artifactId>cassandra-ldap-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>cassandra-ldap-4.0.0</artifactId>
+    <artifactId>cassandra-ldap-4.0.7</artifactId>
     <version>1.0.0</version>
 
     <name>Cassandra LDAP Authenticator for Cassandra 4.0</name>
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 4.0</description>
 
     <properties>
-        <version.cassandra4>4.0.0</version.cassandra4>
+        <version.cassandra4>4.0.7</version.cassandra4>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.instaclustr</groupId>
             <artifactId>cassandra-ldap-base</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.cassandra</groupId>

diff --git a/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java b/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java
@@ -76,8 +76,6 @@ protected void testLDAPinternal() throws Exception {
             logger.info("[first node]: login bill");
             context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
 
-            logger.info("[second node]: login cassandra");
-            context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
             logger.info("[second node]: login bill");
             context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
         } catch (final Exception ex) {

diff --git a/...4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java b/...4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra40LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("cassandra4.version", "4.0.0");
+        return System.getProperty("version.cassandra4", "4.0.7");
     }
 
     @Override

diff --git a/cassandra-4.1/pom.xml b/cassandra-4.1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.instaclustr</groupId>
         <artifactId>cassandra-ldap-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <description>Pluggable LDAP authentication implementation for Apache Cassandra 4.1</description>
 
     <properties>
-        <version.cassandra4>4.1.0</version.cassandra4>
+        <version.cassandra41>4.1.0</version.cassandra41>
 
         <version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
         <version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -45,14 +45,14 @@
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
-            <version>${version.cassandra4}</version>
+            <version>${version.cassandra41}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.instaclustr</groupId>
             <artifactId>cassandra-ldap-base</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.cassandra</groupId>
@@ -144,7 +144,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>${maven.shade.plugin.version}</version>
                 <configuration>
-                    <finalName>cassandra-ldap-${version.cassandra4}-${project.version}</finalName>
+                    <finalName>cassandra-ldap-${version.cassandra41}-${project.version}</finalName>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java b/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java
@@ -76,8 +76,6 @@ protected void testLDAPinternal() throws Exception {
             logger.info("[first node]: login bill");
             context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
 
-            logger.info("[second node]: login cassandra");
-            context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
             logger.info("[second node]: login bill");
             context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
         } catch (final Exception ex) {

diff --git a/...4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java b/...4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
@@ -5,7 +5,7 @@
 public class Cassandra41LDAPIntegrationTest extends AbstractLDAPTest {
     @Override
     public String getCassandraVersion() {
-        return System.getProperty("cassandra4.version", "4.1.0");
+        return System.getProperty("version.cassandra41", "4.1.0");
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.instaclustr</groupId>
     <artifactId>cassandra-ldap-parent</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>pom</packaging>
 
     <modules>