diff --git a/.circleci/config.yml b/.circleci/config.yml
index 91b48d4..39e8976 100644
--- 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
index 1400e38..75c2b0a 100644
--- 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
index 50eebf2..67e0c36 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -16,7 +16,7 @@
-->
cassandra-ldap-base
- 1.1.1
+ 1.1.2
Cassandra LDAP Authenticator common code
Common code for Apache Cassandra LDAP plugin
@@ -25,7 +25,7 @@
org.apache.cassandra
cassandra-all
- 3.0.25
+ 3.0.28
provided
diff --git a/cassandra-2.2/pom.xml b/cassandra-2.2/pom.xml
index 518f87a..c6f3391 100644
--- a/cassandra-2.2/pom.xml
+++ b/cassandra-2.2/pom.xml
@@ -6,12 +6,12 @@
com.instaclustr
cassandra-ldap-parent
- 1.1.1
+ 1.1.2
../pom.xml
cassandra-ldap-2.2.19
- 1.0.1
+ 1.0.2
Cassandra LDAP Authenticator for Cassandra 2.2
Pluggable LDAP authentication implementation for Apache Cassandra 2.2
@@ -52,7 +52,7 @@
com.instaclustr
cassandra-ldap-base
- 1.1.1
+ 1.1.2
org.apache.cassandra
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
index 353a211..6526bba 100644
--- 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/cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra22LDAPIntegrationTest.java b/cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra22LDAPIntegrationTest.java
index e29ce7a..638ce68 100644
--- a/cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra22LDAPIntegrationTest.java
+++ b/cassandra-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
index 6eedbd4..2986128 100644
--- a/cassandra-3.0/pom.xml
+++ b/cassandra-3.0/pom.xml
@@ -6,18 +6,18 @@
com.instaclustr
cassandra-ldap-parent
- 1.1.1
+ 1.1.2
../pom.xml
- cassandra-ldap-3.0.25
+ cassandra-ldap-3.0.28
1.0.0
Cassandra LDAP Authenticator for Cassandra 3.0
Pluggable LDAP authentication implementation for Apache Cassandra 3.0
- 3.0.25
+ 3.0.28
1.2.6
3.1.3
@@ -52,7 +52,7 @@
com.instaclustr
cassandra-ldap-base
- 1.1.1
+ 1.1.2
org.apache.cassandra
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
index 372b31b..4addf80 100644
--- 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/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java b/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java
index 84217f5..cc483e0 100644
--- a/cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java
+++ b/cassandra-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
index 747fe75..9b693b4 100644
--- a/cassandra-3.11/pom.xml
+++ b/cassandra-3.11/pom.xml
@@ -6,18 +6,18 @@
com.instaclustr
cassandra-ldap-parent
- 1.1.1
+ 1.1.2
../pom.xml
- cassandra-ldap-3.11.11
+ cassandra-ldap-3.11.14
1.0.0
Cassandra LDAP Authenticator for Cassandra 3.11
Pluggable LDAP authentication implementation for Apache Cassandra 3.11
- 3.11.11
+ 3.11.14
1.2.6
3.1.3
@@ -52,7 +52,7 @@
com.instaclustr
cassandra-ldap-base
- 1.1.1
+ 1.1.2
org.apache.cassandra
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
index f77dac2..486b984 100644
--- 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/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java b/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java
index 05e6874..6ed0551 100644
--- a/cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java
+++ b/cassandra-3.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
index 4c70b78..c47fbf8 100644
--- a/cassandra-4.0/pom.xml
+++ b/cassandra-4.0/pom.xml
@@ -6,18 +6,18 @@
com.instaclustr
cassandra-ldap-parent
- 1.1.1
+ 1.1.2
../pom.xml
- cassandra-ldap-4.0.0
+ cassandra-ldap-4.0.7
1.0.0
Cassandra LDAP Authenticator for Cassandra 4.0
Pluggable LDAP authentication implementation for Apache Cassandra 4.0
- 4.0.0
+ 4.0.7
1.2.6
3.1.3
@@ -52,7 +52,7 @@
com.instaclustr
cassandra-ldap-base
- 1.1.1
+ 1.1.2
org.apache.cassandra
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
index f77dac2..486b984 100644
--- 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/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java b/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
index 92fb062..34a0f15 100644
--- a/cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java
+++ b/cassandra-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
index 66ac6e8..7d424db 100644
--- a/cassandra-4.1/pom.xml
+++ b/cassandra-4.1/pom.xml
@@ -6,7 +6,7 @@
com.instaclustr
cassandra-ldap-parent
- 1.1.1
+ 1.1.2
../pom.xml
@@ -17,7 +17,7 @@
Pluggable LDAP authentication implementation for Apache Cassandra 4.1
- 4.1.0
+ 4.1.0
1.2.6
3.1.3
@@ -45,14 +45,14 @@
org.apache.cassandra
cassandra-all
- ${version.cassandra4}
+ ${version.cassandra41}
provided
com.instaclustr
cassandra-ldap-base
- 1.1.1
+ 1.1.2
org.apache.cassandra
@@ -144,7 +144,7 @@
maven-shade-plugin
${maven.shade.plugin.version}
- cassandra-ldap-${version.cassandra4}-${project.version}
+ cassandra-ldap-${version.cassandra41}-${project.version}
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
index f77dac2..486b984 100644
--- 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/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java b/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
index f3da4f5..243a2f0 100644
--- a/cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java
+++ b/cassandra-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
index 6a55ea5..b907524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.instaclustr
cassandra-ldap-parent
- 1.1.1
+ 1.1.2
pom