Skip to content

Commit 0b53863

Browse files
smiklosovicsmiklosovic
committed
comment out modules older than 3.x, update circleci config
1 parent 13751c3 commit 0b53863

File tree

11 files changed

+75
-178
lines changed

11 files changed

+75
-178
lines changed

‎.circleci/config.yml‎

Lines changed: 41 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ version: 2.1
22
jobs:
33
build:
44
machine:
5-
image: ubuntu-2004:202201-02
5+
image: ubuntu-2204:2024.05.1
66

77
working_directory: ~/cassandra-ldap
88

99
environment:
1010
MAVEN_OPTS: -Xmx3200m
11-
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
11+
JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
1212

1313
steps:
1414

@@ -23,91 +23,19 @@ jobs:
2323
- ~/.m2
2424
key: m2-{{ checksum "pom.xml" }}
2525

26-
- run: sudo apt install openjdk-8-jdk
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
26+
- run: sudo apt-get update && sudo apt install openjdk-11-jdk
27+
- run: mvn --version && whereis java && mvn clean install -Dversion.cassandra4=4.0.7 -Dversion.cassandra41=4.1.0 -Dversion.cassandra50=5.0.0
2828

2929
- persist_to_workspace:
3030
root: ~/cassandra-ldap
3131
paths:
32-
- "cassandra-2.2/target/cassandra-ldap-2.2**.jar"
33-
- "cassandra-3.0/target/cassandra-ldap-3.0*.jar"
34-
- "cassandra-3.11/target/cassandra-ldap-3.11*.jar"
3532
- "cassandra-4.0/target/cassandra-ldap-4.0*.jar"
3633
- "cassandra-4.1/target/cassandra-ldap-4.1*.jar"
34+
- "cassandra-5.0/target/cassandra-ldap-5.0*.jar"
3735

38-
build-2-2:
39-
machine:
40-
image: ubuntu-2004:202201-02
41-
42-
working_directory: ~/cassandra-ldap
43-
44-
environment:
45-
MAVEN_OPTS: -Xmx3200m
46-
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
47-
48-
steps:
49-
50-
- checkout
51-
52-
- restore_cache:
53-
keys:
54-
- m2-{{ checksum "pom.xml" }}
55-
- m2-
56-
57-
# Java 8 for Cassandra as image contains Java 11
58-
- run: sudo apt install openjdk-8-jdk
59-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts -DskipTests
60-
61-
- save_cache:
62-
paths:
63-
- ~/.m2
64-
key: m2-{{ checksum "pom.xml" }}
65-
66-
- persist_to_workspace:
67-
root: /tmp/artifacts
68-
paths:
69-
- "cassandra-ldap-2.2*.jar"
70-
- "cassandra-ldap-2.2*.deb"
71-
- "cassandra-ldap-2.2*.rpm"
72-
73-
build-3-0:
74-
machine:
75-
image: ubuntu-2004:202201-02
76-
77-
working_directory: ~/cassandra-ldap
78-
79-
environment:
80-
MAVEN_OPTS: -Xmx3200m
81-
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
82-
83-
steps:
84-
85-
- checkout
86-
87-
- restore_cache:
88-
keys:
89-
- m2-{{ checksum "pom.xml" }}
90-
- m2-
91-
92-
# Java 8 for Cassandra as image contains Java 11
93-
- run: sudo apt install openjdk-8-jdk
94-
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
95-
96-
- save_cache:
97-
paths:
98-
- ~/.m2
99-
key: m2-{{ checksum "pom.xml" }}
100-
101-
- persist_to_workspace:
102-
root: /tmp/artifacts
103-
paths:
104-
- "cassandra-ldap-3.0*.jar"
105-
- "cassandra-ldap-3.0*.deb"
106-
- "cassandra-ldap-3.0*.rpm"
107-
108-
build-3-11:
36+
build-4-0:
10937
machine:
110-
image: ubuntu-2004:202201-02
38+
image: ubuntu-2204:2024.05.1
11139

11240
working_directory: ~/cassandra-ldap
11341

@@ -124,8 +52,7 @@ jobs:
12452
- m2-{{ checksum "pom.xml" }}
12553
- m2-
12654

127-
# Java 8 for Cassandra as image contains Java 11
128-
- run: sudo apt install openjdk-8-jdk
55+
- run: sudo apt-get update && sudo apt install openjdk-11-jdk
12956
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
13057

13158
- save_cache:
@@ -136,13 +63,13 @@ jobs:
13663
- persist_to_workspace:
13764
root: /tmp/artifacts
13865
paths:
139-
- "cassandra-ldap-3.11*.jar"
140-
- "cassandra-ldap-3.11*.deb"
141-
- "cassandra-ldap-3.11*.rpm"
66+
- "cassandra-ldap-4.0*.jar"
67+
- "cassandra-ldap-4.0*.deb"
68+
- "cassandra-ldap-4.0*.rpm"
14269

143-
build-4-0:
70+
build-4-1:
14471
machine:
145-
image: ubuntu-2004:202201-02
72+
image: ubuntu-2204:2024.05.1
14673

14774
working_directory: ~/cassandra-ldap
14875

@@ -159,8 +86,7 @@ jobs:
15986
- m2-{{ checksum "pom.xml" }}
16087
- m2-
16188

162-
# Java 8 for Cassandra as image contains Java 11
163-
- run: sudo apt install openjdk-8-jdk
89+
- run: sudo apt-get update && sudo apt install openjdk-11-jdk
16490
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
16591

16692
- save_cache:
@@ -171,13 +97,13 @@ jobs:
17197
- persist_to_workspace:
17298
root: /tmp/artifacts
17399
paths:
174-
- "cassandra-ldap-4.0*.jar"
175-
- "cassandra-ldap-4.0*.deb"
176-
- "cassandra-ldap-4.0*.rpm"
100+
- "cassandra-ldap-4.1*.jar"
101+
- "cassandra-ldap-4.1*.deb"
102+
- "cassandra-ldap-4.1*.rpm"
177103

178-
build-4-1:
104+
build-5-0:
179105
machine:
180-
image: ubuntu-2004:202201-02
106+
image: ubuntu-2204:2024.05.1
181107

182108
working_directory: ~/cassandra-ldap
183109

@@ -194,8 +120,7 @@ jobs:
194120
- m2-{{ checksum "pom.xml" }}
195121
- m2-
196122

197-
# Java 8 for Cassandra as image contains Java 11
198-
- run: sudo apt install openjdk-8-jdk
123+
- run: sudo apt-get update && sudo apt install openjdk-11-jdk
199124
- run: mvn clean install -DoutputDirectory=/tmp/artifacts
200125

201126
- save_cache:
@@ -206,75 +131,48 @@ jobs:
206131
- persist_to_workspace:
207132
root: /tmp/artifacts
208133
paths:
209-
- "cassandra-ldap-4.1*.jar"
210-
- "cassandra-ldap-4.1*.deb"
211-
- "cassandra-ldap-4.1*.rpm"
212-
213-
publish-github-release-2-2:
214-
docker:
215-
- image: cimg/go:1.17
216-
steps:
217-
- attach_workspace:
218-
at: ./artifacts
219-
- run:
220-
name: "Publish 2.2 Release on GitHub"
221-
command: |
222-
set -xue
223-
go get github.com/tcnksm/ghr
224-
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
225-
134+
- "cassandra-ldap-5.0*.jar"
135+
- "cassandra-ldap-5.0*.deb"
136+
- "cassandra-ldap-5.0*.rpm"
226137

227-
publish-github-release-3-0:
228-
docker:
229-
- image: cimg/go:1.17
230-
steps:
231-
- attach_workspace:
232-
at: ./artifacts
233-
- run:
234-
name: "Publish 3.0 Release on GitHub"
235-
command: |
236-
set -xue
237-
go get github.com/tcnksm/ghr
238-
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
239-
240-
publish-github-release-3-11:
138+
publish-github-release-4-0:
241139
docker:
242140
- image: cimg/go:1.17
243141
steps:
244142
- attach_workspace:
245143
at: ./artifacts
246144
- run:
247-
name: "Publish 3.11 Release on GitHub"
145+
name: "Publish 4.0 Release on GitHub"
248146
command: |
249147
set -xue
250148
go get github.com/tcnksm/ghr
251149
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
252150
253-
publish-github-release-4-0:
151+
publish-github-release-4-1:
254152
docker:
255153
- image: cimg/go:1.17
256154
steps:
257155
- attach_workspace:
258156
at: ./artifacts
259157
- run:
260-
name: "Publish 4.0 Release on GitHub"
158+
name: "Publish 4.1 Release on GitHub"
261159
command: |
262160
set -xue
263161
go get github.com/tcnksm/ghr
264162
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
265163
266-
publish-github-release-4-1:
164+
publish-github-release-5-0:
267165
docker:
268166
- image: cimg/go:1.17
269167
steps:
270168
- attach_workspace:
271169
at: ./artifacts
272170
- run:
273-
name: "Publish 4.1 Release on GitHub"
171+
name: "Publish 5.0 Release on GitHub"
274172
command: |
275173
set -xue
276174
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/
175+
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./artifacts/
278176
279177
workflows:
280178
version: 2
@@ -284,24 +182,6 @@ workflows:
284182
filters:
285183
tags:
286184
only: /^v\d+\.\d+\.\d+$/
287-
- build-2-2:
288-
filters:
289-
branches:
290-
ignore: /.*/
291-
tags:
292-
only: /^v2.2.\d+\-\d+\.\d+\.\d+$/
293-
- build-3-0:
294-
filters:
295-
branches:
296-
ignore: /.*/
297-
tags:
298-
only: /^v3.0.\d+\-\d+\.\d+\.\d+$/
299-
- build-3-11:
300-
filters:
301-
branches:
302-
ignore: /.*/
303-
tags:
304-
only: /^v3.11.\d+\-\d+\.\d+\.\d+$/
305185
- build-4-0:
306186
filters:
307187
branches:
@@ -314,30 +194,12 @@ workflows:
314194
ignore: /.*/
315195
tags:
316196
only: /^v4.1.\d+-\d+\.\d+\.\d+$/
317-
- publish-github-release-2-2:
318-
requires:
319-
- build-2-2
197+
- build-5-0:
320198
filters:
321199
branches:
322200
ignore: /.*/
323201
tags:
324-
only: /^v2.2.\d+\-\d+\.\d+\.\d+$/
325-
- publish-github-release-3-0:
326-
requires:
327-
- build-3-0
328-
filters:
329-
branches:
330-
ignore: /.*/
331-
tags:
332-
only: /^v3.0.\d+\-\d+\.\d+\.\d+$/
333-
- publish-github-release-3-11:
334-
requires:
335-
- build-3-11
336-
filters:
337-
branches:
338-
ignore: /.*/
339-
tags:
340-
only: /^v3.11.\d+\-\d+\.\d+\.\d+$/
202+
only: /^v5.0.\d+-\d+\.\d+\.\d+$/
341203
- publish-github-release-4-0:
342204
requires:
343205
- build-4-0
@@ -353,4 +215,12 @@ workflows:
353215
branches:
354216
ignore: /.*/
355217
tags:
356-
only: /^v4.1.\d+-\d+\.\d+\.\d+$/
218+
only: /^v4.1.\d+-\d+\.\d+\.\d+$/
219+
- publish-github-release-5-0:
220+
requires:
221+
- build-5-0
222+
filters:
223+
branches:
224+
ignore: /.*/
225+
tags:
226+
only: /^v5.0.\d+-\d+\.\d+\.\d+$/

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cassandra-3.0/dependency-reduced-pom.xml
33
cassandra-3.11/dependency-reduced-pom.xml
44
cassandra-4.0/dependency-reduced-pom.xml
55
cassandra-4.1/dependency-reduced-pom.xml
6+
cassandra-5.0/dependency-reduced-pom.xml
67

78
# Compiled class file
89
*.class

‎README.adoc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ and create users based on a configured LDAP server. This implementation provides
1212
Role management must be performed through the usual Cassandra role management— CassandraAuthorizer.
1313
See **How it works** for more details.
1414

15+
## Deprecation note
16+
17+
By releasing of Cassandra 5.0, the Cassandra team has stopped to actively develop / support Cassandra versions
18+
3.0 and 3.11. We keep the source code of respective 3.0 and 3.11 modules in the repository, but they are
19+
commented out from main `pom.xml` as they require Java 8 but Cassandra 5.0 requires Java 11 and the testing framework we use for running embedded Cassandra can not deal with Java 11 while testing Cassandra 3.x even we set source and target for Maven to 1.8. If you want to build 3.x modules, please be sure you run Java 8 and you build only the respective module you want.
20+
1521
## Project Structure and Building
1622

1723
This project consists of 5 modules; the `base` module is the module on which all other implementation modules

‎base/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<name>Cassandra LDAP Authenticator common code</name>
2222
<description>Common code for Apache Cassandra LDAP plugin</description>
2323

24+
<properties>
25+
<maven.compiler.source>1.8</maven.compiler.source>
26+
<maven.compiler.target>1.8</maven.compiler.target>
27+
</properties>
28+
2429
<dependencies>
2530
<dependency>
2631
<groupId>org.apache.cassandra</groupId>

‎cassandra-2.2/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<version.testng>6.14.3</version.testng>
2828
<version.awaitility>4.0.3</version.awaitility>
2929
<version.testcontainers>1.15.3</version.testcontainers>
30+
31+
<maven.compiler.source>1.8</maven.compiler.source>
32+
<maven.compiler.target>1.8</maven.compiler.target>
3033
</properties>
3134

3235
<dependencyManagement>

‎cassandra-3.0/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<version.testng>6.14.3</version.testng>
2828
<version.awaitility>4.0.3</version.awaitility>
2929
<version.testcontainers>1.15.3</version.testcontainers>
30+
31+
<maven.compiler.source>1.8</maven.compiler.source>
32+
<maven.compiler.target>1.8</maven.compiler.target>
3033
</properties>
3134

3235
<dependencyManagement>

0 commit comments

Comments
 (0)