Skip to content

Commit 6004f12

Browse files
smiklosovicsmiklosovic
committed
upgrade to 3.0.28, 3.11.14, 4.0.7, 4.1.0, 2.2.19
1 parent 092a170 commit 6004f12

File tree

19 files changed

+33
-42
lines changed

19 files changed

+33
-42
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
key: m2-{{ checksum "pom.xml" }}
2525

2626
- run: sudo apt install openjdk-8-jdk
27-
- run: mvn --version && whereis java && mvn clean install
27+
- 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
2828

2929
- persist_to_workspace:
3030
root: ~/cassandra-ldap
3131
paths:
32-
- "cassandra-2.2/target/cassandra-ldap-2.2.18*.jar"
32+
- "cassandra-2.2/target/cassandra-ldap-2.2**.jar"
3333
- "cassandra-3.0/target/cassandra-ldap-3.0*.jar"
3434
- "cassandra-3.11/target/cassandra-ldap-3.11*.jar"
3535
- "cassandra-4.0/target/cassandra-ldap-4.0*.jar"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cassandra-2.2/dependency-reduced-pom.xml
22
cassandra-3.0/dependency-reduced-pom.xml
33
cassandra-3.11/dependency-reduced-pom.xml
44
cassandra-4.0/dependency-reduced-pom.xml
5+
cassandra-4.1/dependency-reduced-pom.xml
56

67
# Compiled class file
78
*.class

‎base/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-->
1717

1818
<artifactId>cassandra-ldap-base</artifactId>
19-
<version>1.1.1</version>
19+
<version>1.1.2</version>
2020

2121
<name>Cassandra LDAP Authenticator common code</name>
2222
<description>Common code for Apache Cassandra LDAP plugin</description>
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.apache.cassandra</groupId>
2727
<artifactId>cassandra-all</artifactId>
28-
<version>3.0.25</version>
28+
<version>3.0.28</version>
2929
<scope>provided</scope>
3030
</dependency>
3131
</dependencies>

‎cassandra-2.2/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>com.instaclustr</groupId>
88
<artifactId>cassandra-ldap-parent</artifactId>
9-
<version>1.1.1</version>
9+
<version>1.1.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

1313
<artifactId>cassandra-ldap-2.2.19</artifactId>
14-
<version>1.0.1</version>
14+
<version>1.0.2</version>
1515

1616
<name>Cassandra LDAP Authenticator for Cassandra 2.2</name>
1717
<description>Pluggable LDAP authentication implementation for Apache Cassandra 2.2</description>
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.instaclustr</groupId>
5454
<artifactId>cassandra-ldap-base</artifactId>
55-
<version>1.1.1</version>
55+
<version>1.1.2</version>
5656
<exclusions>
5757
<exclusion>
5858
<groupId>org.apache.cassandra</groupId>

‎cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ protected void testLDAPinternal() throws Exception {
7878
logger.info("[first node]: login bill");
7979
context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
8080

81-
logger.info("[second node]: login cassandra");
82-
context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
8381
logger.info("[second node]: login bill");
8482
context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
8583
} catch (final Exception ex) {

‎cassandra-2.2/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra22LDAPIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public String getCassandraVersion() {
1010

1111
@Override
1212
public String getImplementationGAV() {
13-
return "com.instaclustr:cassandra-ldap-2.2.19:1.0.1";
13+
return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.2";
1414
}
1515

1616
@Test

‎cassandra-3.0/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<groupId>com.instaclustr</groupId>
88
<artifactId>cassandra-ldap-parent</artifactId>
9-
<version>1.1.1</version>
9+
<version>1.1.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

13-
<artifactId>cassandra-ldap-3.0.25</artifactId>
13+
<artifactId>cassandra-ldap-3.0.28</artifactId>
1414
<version>1.0.0</version>
1515

1616
<name>Cassandra LDAP Authenticator for Cassandra 3.0</name>
1717
<description>Pluggable LDAP authentication implementation for Apache Cassandra 3.0</description>
1818

1919
<properties>
20-
<version.cassandra30>3.0.25</version.cassandra30>
20+
<version.cassandra30>3.0.28</version.cassandra30>
2121

2222
<version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
2323
<version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.instaclustr</groupId>
5454
<artifactId>cassandra-ldap-base</artifactId>
55-
<version>1.1.1</version>
55+
<version>1.1.2</version>
5656
<exclusions>
5757
<exclusion>
5858
<groupId>org.apache.cassandra</groupId>

‎cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ protected void testLDAPinternal() throws Exception {
7373
logger.info("[first node]: login bill");
7474
context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
7575

76-
logger.info("[second node]: login cassandra");
77-
context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
7876
logger.info("[second node]: login bill");
7977
context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
8078
} catch (final Exception ex) {

‎cassandra-3.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra30LDAPIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
public class Cassandra30LDAPIntegrationTest extends AbstractLDAPTest {
66
@Override
77
public String getCassandraVersion() {
8-
return System.getProperty("version.cassandra30", "3.0.25");
8+
return System.getProperty("version.cassandra30", "3.0.28");
99
}
1010

1111
@Override
1212
public String getImplementationGAV() {
13-
return "com.instaclustr:cassandra-ldap-3.0.25:1.0.0";
13+
return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";
1414
}
1515

1616
@Test

‎cassandra-3.11/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<groupId>com.instaclustr</groupId>
88
<artifactId>cassandra-ldap-parent</artifactId>
9-
<version>1.1.1</version>
9+
<version>1.1.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

13-
<artifactId>cassandra-ldap-3.11.11</artifactId>
13+
<artifactId>cassandra-ldap-3.11.14</artifactId>
1414
<version>1.0.0</version>
1515

1616
<name>Cassandra LDAP Authenticator for Cassandra 3.11</name>
1717
<description>Pluggable LDAP authentication implementation for Apache Cassandra 3.11</description>
1818

1919
<properties>
20-
<version.cassandra311>3.11.11</version.cassandra311>
20+
<version.cassandra311>3.11.14</version.cassandra311>
2121

2222
<version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
2323
<version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.instaclustr</groupId>
5454
<artifactId>cassandra-ldap-base</artifactId>
55-
<version>1.1.1</version>
55+
<version>1.1.2</version>
5656
<exclusions>
5757
<exclusion>
5858
<groupId>org.apache.cassandra</groupId>

‎cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ protected void testLDAPinternal() throws Exception {
7676
logger.info("[first node]: login bill");
7777
context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
7878

79-
logger.info("[second node]: login cassandra");
80-
context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
8179
logger.info("[second node]: login bill");
8280
context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
8381
} catch (final Exception ex) {

‎cassandra-3.11/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra311LDAPIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
public class Cassandra311LDAPIntegrationTest extends AbstractLDAPTest {
66
@Override
77
public String getCassandraVersion() {
8-
return System.getProperty("version.cassandra311", "3.11.11");
8+
return System.getProperty("version.cassandra311", "3.11.14");
99
}
1010

1111
@Override
1212
public String getImplementationGAV() {
13-
return "com.instaclustr:cassandra-ldap-3.11.11:1.0.0";
13+
return "com.instaclustr:cassandra-ldap-" + getCassandraVersion() + ":1.0.0";
1414
}
1515

1616
@Test

‎cassandra-4.0/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<groupId>com.instaclustr</groupId>
88
<artifactId>cassandra-ldap-parent</artifactId>
9-
<version>1.1.1</version>
9+
<version>1.1.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

13-
<artifactId>cassandra-ldap-4.0.0</artifactId>
13+
<artifactId>cassandra-ldap-4.0.7</artifactId>
1414
<version>1.0.0</version>
1515

1616
<name>Cassandra LDAP Authenticator for Cassandra 4.0</name>
1717
<description>Pluggable LDAP authentication implementation for Apache Cassandra 4.0</description>
1818

1919
<properties>
20-
<version.cassandra4>4.0.0</version.cassandra4>
20+
<version.cassandra4>4.0.7</version.cassandra4>
2121

2222
<version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
2323
<version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.instaclustr</groupId>
5454
<artifactId>cassandra-ldap-base</artifactId>
55-
<version>1.1.1</version>
55+
<version>1.1.2</version>
5656
<exclusions>
5757
<exclusion>
5858
<groupId>org.apache.cassandra</groupId>

‎cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ protected void testLDAPinternal() throws Exception {
7676
logger.info("[first node]: login bill");
7777
context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
7878

79-
logger.info("[second node]: login cassandra");
80-
context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
8179
logger.info("[second node]: login bill");
8280
context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
8381
} catch (final Exception ex) {

‎cassandra-4.0/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra40LDAPIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public class Cassandra40LDAPIntegrationTest extends AbstractLDAPTest {
66
@Override
77
public String getCassandraVersion() {
8-
return System.getProperty("cassandra4.version", "4.0.0");
8+
return System.getProperty("version.cassandra4", "4.0.7");
99
}
1010

1111
@Override

‎cassandra-4.1/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.instaclustr</groupId>
88
<artifactId>cassandra-ldap-parent</artifactId>
9-
<version>1.1.1</version>
9+
<version>1.1.2</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -17,7 +17,7 @@
1717
<description>Pluggable LDAP authentication implementation for Apache Cassandra 4.1</description>
1818

1919
<properties>
20-
<version.cassandra4>4.1.0</version.cassandra4>
20+
<version.cassandra41>4.1.0</version.cassandra41>
2121

2222
<version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
2323
<version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
@@ -45,14 +45,14 @@
4545
<dependency>
4646
<groupId>org.apache.cassandra</groupId>
4747
<artifactId>cassandra-all</artifactId>
48-
<version>${version.cassandra4}</version>
48+
<version>${version.cassandra41}</version>
4949
<scope>provided</scope>
5050
</dependency>
5151

5252
<dependency>
5353
<groupId>com.instaclustr</groupId>
5454
<artifactId>cassandra-ldap-base</artifactId>
55-
<version>1.1.1</version>
55+
<version>1.1.2</version>
5656
<exclusions>
5757
<exclusion>
5858
<groupId>org.apache.cassandra</groupId>
@@ -144,7 +144,7 @@
144144
<artifactId>maven-shade-plugin</artifactId>
145145
<version>${maven.shade.plugin.version}</version>
146146
<configuration>
147-
<finalName>cassandra-ldap-${version.cassandra4}-${project.version}</finalName>
147+
<finalName>cassandra-ldap-${version.cassandra41}-${project.version}</finalName>
148148
</configuration>
149149
</plugin>
150150
<plugin>

‎cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/AbstractLDAPTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ protected void testLDAPinternal() throws Exception {
7676
logger.info("[first node]: login bill");
7777
context.execute(context.firstNode, "bill", "test", "select * from system.local", "datacenter1", true);
7878

79-
logger.info("[second node]: login cassandra");
80-
context.execute(context.secondNode, "cassandra", "cassandra", "select * from system_auth.roles", "datacenter2", true);
8179
logger.info("[second node]: login bill");
8280
context.execute(context.secondNode, "bill", "test", "select * from system.local", "datacenter2", true);
8381
} catch (final Exception ex) {

‎cassandra-4.1/src/test/java/com/instaclustr/cassandra/ldap/auth/Cassandra41LDAPIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public class Cassandra41LDAPIntegrationTest extends AbstractLDAPTest {
66
@Override
77
public String getCassandraVersion() {
8-
return System.getProperty("cassandra4.version", "4.1.0");
8+
return System.getProperty("version.cassandra41", "4.1.0");
99
}
1010

1111
@Override

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.instaclustr</groupId>
77
<artifactId>cassandra-ldap-parent</artifactId>
8-
<version>1.1.1</version>
8+
<version>1.1.2</version>
99
<packaging>pom</packaging>
1010

1111
<modules>

0 commit comments

Comments
 (0)