Skip to content

Commit 092a170

Browse files
smiklosovicsmiklosovic
committed
update to Cassandra 4.1
1 parent 2f20a2c commit 092a170

20 files changed

+1363
-0
lines changed

‎.circleci/config.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
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"
36+
- "cassandra-4.1/target/cassandra-ldap-4.1*.jar"
3637

3738
build-2-2:
3839
machine:
@@ -174,6 +175,41 @@ jobs:
174175
- "cassandra-ldap-4.0*.deb"
175176
- "cassandra-ldap-4.0*.rpm"
176177

178+
build-4-1:
179+
machine:
180+
image: ubuntu-2004:202201-02
181+
182+
working_directory: ~/cassandra-ldap
183+
184+
environment:
185+
MAVEN_OPTS: -Xmx3200m
186+
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
187+
188+
steps:
189+
190+
- checkout
191+
192+
- restore_cache:
193+
keys:
194+
- m2-{{ checksum "pom.xml" }}
195+
- m2-
196+
197+
# Java 8 for Cassandra as image contains Java 11
198+
- run: sudo apt install openjdk-8-jdk
199+
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
200+
201+
- save_cache:
202+
paths:
203+
- ~/.m2
204+
key: m2-{{ checksum "pom.xml" }}
205+
206+
- persist_to_workspace:
207+
root: /tmp/artifacts
208+
paths:
209+
- "cassandra-ldap-4.1*.jar"
210+
- "cassandra-ldap-4.1*.deb"
211+
- "cassandra-ldap-4.1*.rpm"
212+
177213
publish-github-release-2-2:
178214
docker:
179215
- image: cimg/go:1.17
@@ -227,6 +263,19 @@ jobs:
227263
go get github.com/tcnksm/ghr
228264
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
229265
266+
publish-github-release-4-1:
267+
docker:
268+
- image: cimg/go:1.17
269+
steps:
270+
- attach_workspace:
271+
at: ./artifacts
272+
- run:
273+
name: "Publish 4.1 Release on GitHub"
274+
command: |
275+
set -xue
276+
go get github.com/tcnksm/ghr
277+
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
278+
230279
workflows:
231280
version: 2
232281
main:
@@ -259,6 +308,12 @@ workflows:
259308
ignore: /.*/
260309
tags:
261310
only: /^v4.0.\d+-\d+\.\d+\.\d+$/
311+
- build-4-1:
312+
filters:
313+
branches:
314+
ignore: /.*/
315+
tags:
316+
only: /^v4.1.\d+-\d+\.\d+\.\d+$/
262317
- publish-github-release-2-2:
263318
requires:
264319
- build-2-2
@@ -291,3 +346,11 @@ workflows:
291346
ignore: /.*/
292347
tags:
293348
only: /^v4.0.\d+-\d+\.\d+\.\d+$/
349+
- publish-github-release-4-1:
350+
requires:
351+
- build-4-1
352+
filters:
353+
branches:
354+
ignore: /.*/
355+
tags:
356+
only: /^v4.1.\d+-\d+\.\d+\.\d+$/

‎cassandra-4.1/pom.xml‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>com.instaclustr</groupId>
8+
<artifactId>cassandra-ldap-parent</artifactId>
9+
<version>1.1.1</version>
10+
<relativePath>../pom.xml</relativePath>
11+
</parent>
12+
13+
<artifactId>cassandra-ldap-4.1.0</artifactId>
14+
<version>1.0.0</version>
15+
16+
<name>Cassandra LDAP Authenticator for Cassandra 4.1</name>
17+
<description>Pluggable LDAP authentication implementation for Apache Cassandra 4.1</description>
18+
19+
<properties>
20+
<version.cassandra4>4.1.0</version.cassandra4>
21+
22+
<version.shrinkwrap.bom>1.2.6</version.shrinkwrap.bom>
23+
<version.shrinkwrap.resolvers>3.1.3</version.shrinkwrap.resolvers>
24+
25+
<version.embedded.cassandra>4.0.1</version.embedded.cassandra>
26+
<version.cassandra.driver>3.11.0</version.cassandra.driver>
27+
<version.testng>6.14.3</version.testng>
28+
<version.awaitility>4.0.3</version.awaitility>
29+
<version.testcontainers>1.15.3</version.testcontainers>
30+
</properties>
31+
32+
<dependencyManagement>
33+
<dependencies>
34+
<dependency>
35+
<groupId>org.jboss.shrinkwrap</groupId>
36+
<artifactId>shrinkwrap-bom</artifactId>
37+
<version>${version.shrinkwrap.bom}</version>
38+
<type>pom</type>
39+
<scope>import</scope>
40+
</dependency>
41+
</dependencies>
42+
</dependencyManagement>
43+
44+
<dependencies>
45+
<dependency>
46+
<groupId>org.apache.cassandra</groupId>
47+
<artifactId>cassandra-all</artifactId>
48+
<version>${version.cassandra4}</version>
49+
<scope>provided</scope>
50+
</dependency>
51+
52+
<dependency>
53+
<groupId>com.instaclustr</groupId>
54+
<artifactId>cassandra-ldap-base</artifactId>
55+
<version>1.1.1</version>
56+
<exclusions>
57+
<exclusion>
58+
<groupId>org.apache.cassandra</groupId>
59+
<artifactId>cassandra-all</artifactId>
60+
</exclusion>
61+
</exclusions>
62+
</dependency>
63+
64+
<!-- test -->
65+
66+
<dependency>
67+
<groupId>org.jboss.shrinkwrap</groupId>
68+
<artifactId>shrinkwrap-depchain</artifactId>
69+
<type>pom</type>
70+
<scope>test</scope>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>org.jboss.shrinkwrap.resolver</groupId>
75+
<artifactId>shrinkwrap-resolver-depchain</artifactId>
76+
<version>${version.shrinkwrap.resolvers}</version>
77+
<scope>test</scope>
78+
<type>pom</type>
79+
</dependency>
80+
81+
<dependency>
82+
<groupId>com.github.nosan</groupId>
83+
<artifactId>embedded-cassandra</artifactId>
84+
<version>${version.embedded.cassandra}</version>
85+
<scope>test</scope>
86+
<exclusions>
87+
<exclusion>
88+
<groupId>com.datastax.oss</groupId>
89+
<artifactId>java-driver-core</artifactId>
90+
</exclusion>
91+
</exclusions>
92+
</dependency>
93+
94+
<dependency>
95+
<groupId>com.datastax.cassandra</groupId>
96+
<artifactId>cassandra-driver-core</artifactId>
97+
<version>${version.cassandra.driver}</version>
98+
<exclusions>
99+
<exclusion>
100+
<groupId>com.google.guava</groupId>
101+
<artifactId>guava</artifactId>
102+
</exclusion>
103+
<exclusion>
104+
<groupId>io.netty</groupId>
105+
<artifactId>netty-handler</artifactId>
106+
</exclusion>
107+
<exclusion>
108+
<groupId>io.netty</groupId>
109+
<artifactId>netty-buffer</artifactId>
110+
</exclusion>
111+
<exclusion>
112+
<groupId>io.netty</groupId>
113+
<artifactId>netty-codec</artifactId>
114+
</exclusion>
115+
</exclusions>
116+
</dependency>
117+
118+
<dependency>
119+
<groupId>org.testng</groupId>
120+
<artifactId>testng</artifactId>
121+
<version>${version.testng}</version>
122+
<scope>test</scope>
123+
</dependency>
124+
125+
<dependency>
126+
<groupId>org.awaitility</groupId>
127+
<artifactId>awaitility</artifactId>
128+
<version>${version.awaitility}</version>
129+
<scope>test</scope>
130+
</dependency>
131+
132+
<dependency>
133+
<groupId>org.testcontainers</groupId>
134+
<artifactId>testcontainers</artifactId>
135+
<version>${version.testcontainers}</version>
136+
<scope>test</scope>
137+
</dependency>
138+
</dependencies>
139+
140+
<build>
141+
<plugins>
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-shade-plugin</artifactId>
145+
<version>${maven.shade.plugin.version}</version>
146+
<configuration>
147+
<finalName>cassandra-ldap-${version.cassandra4}-${project.version}</finalName>
148+
</configuration>
149+
</plugin>
150+
<plugin>
151+
<groupId>org.vafer</groupId>
152+
<artifactId>jdeb</artifactId>
153+
<version>${version.jdeb}</version>
154+
</plugin>
155+
<plugin>
156+
<groupId>de.dentrassi.maven</groupId>
157+
<artifactId>rpm</artifactId>
158+
<version>${version.rpm}</version>
159+
<executions>
160+
<execution>
161+
<phase>package</phase>
162+
<goals>
163+
<goal>rpm</goal>
164+
</goals>
165+
<configuration>
166+
<requires>
167+
<require>
168+
<name>cassandra</name>
169+
<version>4.0</version>
170+
<greaterOrEqual/>
171+
</require>
172+
</requires>
173+
</configuration>
174+
</execution>
175+
</executions>
176+
</plugin>
177+
</plugins>
178+
</build>
179+
180+
</project>
181+

‎cassandra-4.1/src/deb/control/control‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Package: [[name]]
2+
Version: [[version]]
3+
Section: misc
4+
Priority: optional
5+
Architecture: all
6+
Depends: cassandra (>= 4.1)
7+
Maintainer: [[maintainer]]

0 commit comments

Comments
 (0)