Skip to content

Remove the java 2.2.1 patch #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toptobes merged 1 commit into from
Jul 17, 2026
Merged

Remove the java 2.2.1 patch #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/com/dtsx/docs/core/runner/drivers/ClientLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ public enum ClientLanguage {
private final SnapshotsReducer snapshotsReducer;

public @Nullable String defaultArtifact() {
if (this == JAVA) {
return "files(\"" + CLI_DIR.toAbsolutePath() + "/astra-db-java-2.2.1-patched.jar\")"; // TODO remove this once Java is patched + update JavaDriver.extractClientVersion
}
return defaultArtifact;
}

Expand Down
32 changes: 15 additions & 17 deletions src/main/java/com/dtsx/docs/core/runner/drivers/impls/JavaDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,20 @@ public RunResult executeScript(BaseScriptRunnerCtx ctx, ExecutionEnvironment exe

@Override
public Optional<String> extractClientVersion(BaseScriptRunnerCtx ctx, ExecutionEnvironment execEnv) {
return Optional.of("v2.2.1"); // TODO remove once Java is patched and remove ClientLanguage.defaultArtifact

// val result = ExternalPrograms.custom().run(execEnv.envDir(), "./gradlew", "dependencies", "--configuration", "runtimeClasspath");
//
// if (result.notOk()) {
// throw new RunException("Failed to extract Java client version: " + result.output());
// }
//
// val output = result.stdout();
// val pattern = Pattern.compile("com\\.datastax\\.astra:astra-db-java:([\\d.]+(?:-[\\w.]+)?)");
// val matcher = pattern.matcher(output);
//
// if (matcher.find()) {
// return Optional.of("v" + matcher.group(1));
// }
//
// return Optional.of("unknown");
val result = ExternalPrograms.custom().run(execEnv.envDir(), "./gradlew", "dependencies", "--configuration", "runtimeClasspath");

if (result.notOk()) {
throw new RunException("Failed to extract Java client version: " + result.output());
}

val output = result.stdout();
val pattern = Pattern.compile("com\\.datastax\\.astra:astra-db-java:([\\d.]+(?:-[\\w.]+)?)");
val matcher = pattern.matcher(output);

if (matcher.find()) {
return Optional.of("v" + matcher.group(1));
}

return Optional.of("unknown");
}
}
Loading