Skip to content

Commit 2cced9d

Browse files
committed
ci: restore Java 11 and JDK 17 validation
Update maintained CI paths for the Java 11 baseline, including JDK 17 compiler flags, javadoc skips, authenticated version lookup, examples compilation, and runtime-specific reports.
1 parent adf6da1 commit 2cced9d

5 files changed

Lines changed: 26 additions & 5 deletions

File tree

.github/workflows/tests@v1.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ jobs:
182182
cassandra-version: [3-LATEST, 4-LATEST]
183183
java-version: [11, 17]
184184
test-group: [parallelizable, serial, isolated]
185+
exclude:
186+
- cassandra-version: 3-LATEST
187+
java-version: 17
188+
- cassandra-version: 4-LATEST
189+
java-version: 11
185190
fail-fast: false
186191

187192
steps:
@@ -297,6 +302,13 @@ jobs:
297302
scylla-version: [LTS-LATEST, LTS-PRIOR, LATEST]
298303
java-version: [11, 17]
299304
test-group: [parallelizable, serial, isolated]
305+
exclude:
306+
- scylla-version: LTS-PRIOR
307+
java-version: 17
308+
- scylla-version: LTS-LATEST
309+
java-version: 17
310+
- scylla-version: LATEST
311+
java-version: 11
300312
fail-fast: false
301313

302314
steps:

.mvn/jvm.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
2+
--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
3+
--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
4+
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
5+
--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
6+
--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
7+
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
8+
--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
9+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
10+
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
11+
--add-exports=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED

mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/MapperProcessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.datastax.oss.driver.api.mapper.annotations.Dao;
2121
import com.datastax.oss.driver.api.mapper.annotations.Entity;
2222
import com.datastax.oss.driver.api.mapper.annotations.Mapper;
23-
import com.datastax.oss.driver.shaded.guava.common.base.Strings;
2423
import com.datastax.oss.driver.shaded.guava.common.base.Throwables;
2524
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet;
2625
import java.lang.annotation.Annotation;
@@ -167,7 +166,7 @@ private String computeIndent(Map<String, String> options) {
167166
if (amountSpec != null) {
168167
try {
169168
int amount = Integer.parseInt(amountSpec);
170-
return Strings.repeat(tabs ? "\t" : " ", amount);
169+
return (tabs ? "\t" : " ").repeat(amount);
171170
} catch (NumberFormatException e) {
172171
messager.warn(
173172
"Could not parse %s: expected a number, got '%s'. Defaulting to %s.",

mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoReturnTypeKind.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public interface DaoReturnTypeKind {
4040
* @param helperFieldName the name of the helper for entity conversions (might not get used for
4141
* certain kinds, in that case it's ok to pass null).
4242
* @param methodElement the return type of the method (in case the result must be cast).
43-
* @param typeParameters
43+
* @param typeParameters the type parameters declared on the DAO method.
4444
*/
4545
void addExecuteStatement(
4646
CodeBlock.Builder methodBuilder,

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,7 @@
717717
<plugin>
718718
<artifactId>maven-compiler-plugin</artifactId>
719719
<configuration>
720-
<source>11</source>
721-
<target>11</target>
720+
<release>11</release>
722721
<compilerArgs combine.children="override">
723722
<compilerArg>-XDcompilePolicy=simple</compilerArg>
724723
<compilerArg>--should-stop=ifError=FLOW</compilerArg>

0 commit comments

Comments
 (0)