Skip to content

Commit 475e3a1

Browse files
committed
Drop Java 8 support
1 parent c777983 commit 475e3a1

37 files changed

Lines changed: 182 additions & 146 deletions

File tree

.github/workflows/docs-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
with:
3737
python-version: '3.13'
3838

39-
- name: Set up JDK 8.0
39+
- name: Set up JDK 11
4040
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4141
with:
42-
java-version: '8'
42+
java-version: '11'
4343
distribution: 'temurin'
4444

4545
- name: Install uv

.github/workflows/docs-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
with:
3232
python-version: '3.13'
3333

34-
- name: Set up JDK 8.0
34+
- name: Set up JDK 11
3535
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3636
with:
37-
java-version: '8'
37+
java-version: '11'
3838
distribution: 'temurin'
3939

4040
- name: Install uv
@@ -44,4 +44,4 @@ jobs:
4444
run: make -C docs setupenv
4545

4646
- name: Build docs
47-
run: make -C docs test
47+
run: make -C docs test

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
RELEASE_TARGET_TAG: ${{ inputs.target-tag }}
4040
run: make checkout-one-commit-before
4141

42-
- name: Set up Java
42+
- name: Set up JDK 11
4343
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4444
with:
45-
java-version: '8'
45+
java-version: '11'
4646
distribution: 'temurin'
4747
server-id: central
4848
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/tests@v1.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
strategy:
3737
matrix:
38-
java-version: [8]
38+
java-version: [11, 17]
3939
fail-fast: false
4040

4141
steps:
@@ -80,7 +80,7 @@ jobs:
8080

8181
strategy:
8282
matrix:
83-
java-version: [8]
83+
java-version: [11, 17]
8484
fail-fast: false
8585

8686
steps:
@@ -109,14 +109,14 @@ jobs:
109109

110110
strategy:
111111
matrix:
112-
java-version: [8]
112+
java-version: [11, 17]
113113
fail-fast: false
114114

115115
steps:
116116
- name: Checkout source
117117
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
118118

119-
- name: Set up JDK 8
119+
- name: Set up JDK ${{ matrix.java-version }}
120120
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
121121
with:
122122
java-version: ${{ matrix.java-version }}
@@ -142,14 +142,14 @@ jobs:
142142
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
143143
if: always()
144144
with:
145-
name: test-results
145+
name: test-results-${{ matrix.java-version }}
146146
path: "*/**/target/*-reports/*.xml"
147147

148148
- name: Parse test results
149149
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5.6.2
150150
if: always()
151151
with:
152-
check_name: Unit tests report
152+
check_name: Unit tests report (JDK ${{ matrix.java-version }})
153153
require_tests: true
154154
report_paths: "*/**/target/*-reports/*.xml"
155155
follow_symlink: true
@@ -180,7 +180,7 @@ jobs:
180180
strategy:
181181
matrix:
182182
cassandra-version: [3-LATEST, 4-LATEST]
183-
java-version: [8]
183+
java-version: [11, 17]
184184
test-group: [parallelizable, serial, isolated]
185185
fail-fast: false
186186

@@ -275,7 +275,7 @@ jobs:
275275
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5.6.2
276276
if: always()
277277
with:
278-
check_name: Integration tests report for Cassandra ${{ steps.cassandra-version.outputs.value }} (${{ matrix.test-group }})
278+
check_name: Integration tests report for Cassandra ${{ steps.cassandra-version.outputs.value }} (${{ matrix.test-group }}, JDK ${{ matrix.java-version }})
279279
require_tests: true
280280
report_paths: "*/**/target/*-reports/*.xml"
281281
follow_symlink: true
@@ -292,7 +292,7 @@ jobs:
292292
strategy:
293293
matrix:
294294
scylla-version: [LTS-LATEST, LTS-PRIOR, LATEST]
295-
java-version: [8]
295+
java-version: [11, 17]
296296
test-group: [parallelizable, serial, isolated]
297297
fail-fast: false
298298

@@ -387,7 +387,7 @@ jobs:
387387
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5.6.2
388388
if: always()
389389
with:
390-
check_name: Integration tests report for Scylla ${{ steps.scylla-version.outputs.value }} (${{ matrix.test-group }})
390+
check_name: Integration tests report for Scylla ${{ steps.scylla-version.outputs.value }} (${{ matrix.test-group }}, JDK ${{ matrix.java-version }})
391391
require_tests: true
392392
report_paths: "*/**/target/*-reports/*.xml"
393393
follow_symlink: true

README-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To build the documentation of this project, you need a UNIX-based operating syst
66

77
You also need the following software installed to generate the reference documentation of the driver:
88

9-
- Java JDK 8 or higher
9+
- Java JDK 11 or higher
1010
- Maven
1111

1212
Once you have installed the above software, you can build and preview the documentation by following the steps outlined in the `Quickstart guide <https://sphinx-theme.scylladb.com/stable/getting-started/quickstart.html>`_.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ builder](manual/query_builder/), [mapper](manual/mapper)).
5050

5151
The driver is compatible with Scylla and Apache Cassandra® 2.1 and higher.
5252

53-
It requires Java 8 or higher.
53+
It requires Java 11 or higher.
5454

5555
## Migrating from previous versions
5656

@@ -103,4 +103,4 @@ Apache Cassandra, Apache, Tomcat, Lucene, Solr, Hadoop, Spark, TinkerPop, and Ca
103103
trademarks of the [Apache Software Foundation](http://www.apache.org/) or its subsidiaries in
104104
Canada, the United States and/or other countries.
105105

106-
Binary artifacts of this product bundle Java Native Runtime libraries, which is available under the Eclipse Public License version 2.0.
106+
Binary artifacts of this product bundle Java Native Runtime libraries, which is available under the Eclipse Public License version 2.0.

core-shaded/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@
280280
</plugin>
281281
<plugin>
282282
<artifactId>maven-javadoc-plugin</artifactId>
283+
<configuration>
284+
<skip>true</skip>
285+
</configuration>
283286
<executions>
284287
<execution>
285288
<id>attach-javadocs</id>

core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ public enum DateRangePrecision {
131131
private final ChronoUnit roundingUnit;
132132
// The formatter is only used for formatting (parsing is done with DateRangeUtil.parseCalendar to
133133
// be exactly the same as DSE's).
134-
// If that ever were to change, note that DateTimeFormatters with a time zone have a parsing bug
135-
// in Java 8: the formatter's zone will always be used, even if the input string specifies one
136-
// explicitly.
134+
// If that ever were to change, note that DateTimeFormatters with a time zone had a parsing bug
135+
// on older JDKs: the formatter's zone would always be used, even if the input string specified
136+
// one explicitly.
137137
// See https://stackoverflow.com/questions/41999421
138138
private final DateTimeFormatter formatter;
139139

core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
*
4444
* Examples:
4545
*
46-
* <table summary="examples">
46+
* <table>
47+
* <caption>Examples</caption>
4748
* <tr><th>Create statement</th><th>Case-sensitive?</th><th>CQL id</th><th>Internal id</th></tr>
4849
* <tr><td>CREATE TABLE t(foo int PRIMARY KEY)</td><td>No</td><td>foo</td><td>foo</td></tr>
4950
* <tr><td>CREATE TABLE t(Foo int PRIMARY KEY)</td><td>No</td><td>foo</td><td>foo</td></tr>

core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,26 @@ public interface DriverContext extends AttachmentPoint {
4848
@NonNull
4949
String getSessionName();
5050

51-
/** @return The driver's configuration; never {@code null}. */
51+
/** Returns the driver's configuration; never {@code null}. */
5252
@NonNull
5353
DriverConfig getConfig();
5454

55-
/** @return The driver's configuration loader; never {@code null}. */
55+
/** Returns the driver's configuration loader; never {@code null}. */
5656
@NonNull
5757
DriverConfigLoader getConfigLoader();
5858

5959
/**
60-
* @return The driver's load balancing policies, keyed by profile name; the returned map is
61-
* guaranteed to never be {@code null} and to always contain an entry for the {@value
62-
* DriverExecutionProfile#DEFAULT_NAME} profile.
60+
* Returns the driver's load balancing policies, keyed by profile name; the returned map is
61+
* guaranteed to never be {@code null} and to always contain an entry for the {@value
62+
* DriverExecutionProfile#DEFAULT_NAME} profile.
6363
*/
6464
@NonNull
6565
Map<String, LoadBalancingPolicy> getLoadBalancingPolicies();
6666

6767
/**
68+
* Returns the driver's load balancing policy for the given profile; never {@code null}.
69+
*
6870
* @param profileName the profile name; never {@code null}.
69-
* @return The driver's load balancing policy for the given profile; never {@code null}.
7071
*/
7172
@NonNull
7273
default LoadBalancingPolicy getLoadBalancingPolicy(@NonNull String profileName) {
@@ -78,16 +79,17 @@ default LoadBalancingPolicy getLoadBalancingPolicy(@NonNull String profileName)
7879
}
7980

8081
/**
81-
* @return The driver's retry policies, keyed by profile name; the returned map is guaranteed to
82-
* never be {@code null} and to always contain an entry for the {@value
83-
* DriverExecutionProfile#DEFAULT_NAME} profile.
82+
* Returns the driver's retry policies, keyed by profile name; the returned map is guaranteed to
83+
* never be {@code null} and to always contain an entry for the {@value
84+
* DriverExecutionProfile#DEFAULT_NAME} profile.
8485
*/
8586
@NonNull
8687
Map<String, RetryPolicy> getRetryPolicies();
8788

8889
/**
90+
* Returns the driver's retry policy for the given profile; never {@code null}.
91+
*
8992
* @param profileName the profile name; never {@code null}.
90-
* @return The driver's retry policy for the given profile; never {@code null}.
9193
*/
9294
@NonNull
9395
default RetryPolicy getRetryPolicy(@NonNull String profileName) {
@@ -96,16 +98,17 @@ default RetryPolicy getRetryPolicy(@NonNull String profileName) {
9698
}
9799

98100
/**
99-
* @return The driver's speculative execution policies, keyed by profile name; the returned map is
100-
* guaranteed to never be {@code null} and to always contain an entry for the {@value
101-
* DriverExecutionProfile#DEFAULT_NAME} profile.
101+
* Returns the driver's speculative execution policies, keyed by profile name; the returned map is
102+
* guaranteed to never be {@code null} and to always contain an entry for the {@value
103+
* DriverExecutionProfile#DEFAULT_NAME} profile.
102104
*/
103105
@NonNull
104106
Map<String, SpeculativeExecutionPolicy> getSpeculativeExecutionPolicies();
105107

106108
/**
109+
* Returns the driver's speculative execution policy for the given profile; never {@code null}.
110+
*
107111
* @param profileName the profile name; never {@code null}.
108-
* @return The driver's speculative execution policy for the given profile; never {@code null}.
109112
*/
110113
@NonNull
111114
default SpeculativeExecutionPolicy getSpeculativeExecutionPolicy(@NonNull String profileName) {
@@ -115,39 +118,39 @@ default SpeculativeExecutionPolicy getSpeculativeExecutionPolicy(@NonNull String
115118
: getSpeculativeExecutionPolicies().get(DriverExecutionProfile.DEFAULT_NAME);
116119
}
117120

118-
/** @return The driver's timestamp generator; never {@code null}. */
121+
/** Returns the driver's timestamp generator; never {@code null}. */
119122
@NonNull
120123
TimestampGenerator getTimestampGenerator();
121124

122-
/** @return The driver's reconnection policy; never {@code null}. */
125+
/** Returns the driver's reconnection policy; never {@code null}. */
123126
@NonNull
124127
ReconnectionPolicy getReconnectionPolicy();
125128

126-
/** @return The driver's address translator; never {@code null}. */
129+
/** Returns the driver's address translator; never {@code null}. */
127130
@NonNull
128131
AddressTranslator getAddressTranslator();
129132

130-
/** @return The authentication provider, if authentication was configured. */
133+
/** Returns the authentication provider, if authentication was configured. */
131134
@NonNull
132135
Optional<AuthProvider> getAuthProvider();
133136

134-
/** @return The SSL engine factory, if SSL was configured. */
137+
/** Returns the SSL engine factory, if SSL was configured. */
135138
@NonNull
136139
Optional<SslEngineFactory> getSslEngineFactory();
137140

138-
/** @return The driver's request tracker; never {@code null}. */
141+
/** Returns the driver's request tracker; never {@code null}. */
139142
@NonNull
140143
RequestTracker getRequestTracker();
141144

142-
/** @return The driver's request throttler; never {@code null}. */
145+
/** Returns the driver's request throttler; never {@code null}. */
143146
@NonNull
144147
RequestThrottler getRequestThrottler();
145148

146-
/** @return The driver's node state listener; never {@code null}. */
149+
/** Returns the driver's node state listener; never {@code null}. */
147150
@NonNull
148151
NodeStateListener getNodeStateListener();
149152

150-
/** @return The driver's schema change listener; never {@code null}. */
153+
/** Returns the driver's schema change listener; never {@code null}. */
151154
@NonNull
152155
SchemaChangeListener getSchemaChangeListener();
153156
}

0 commit comments

Comments
 (0)