Skip to content

Commit 286add3

Browse files
committed
toURI
1 parent c8ae163 commit 286add3

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

Jenkinsfile-astra

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ${status} after ${currentBuild.durationString - ' and counting'}"""
100100

101101
pipeline {
102102
agent {
103-
label 'ubuntu/focal64/java-driver'
103+
label 'ubuntu/jammy64/java-driver'
104104
}
105105

106106
// Global pipeline timeout

Jenkinsfile-datastax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ pipeline {
402402
}
403403

404404
environment {
405-
OS_VERSION = 'ubuntu/focal64/java-driver'
405+
OS_VERSION = 'ubuntu/jammy64/java-driver'
406406
JABBA_SHELL = '/usr/lib/jabba/jabba.sh'
407407
CCM_ENVIRONMENT_SHELL = '/usr/local/bin/ccm_environment.sh'
408408
SERIAL_ITS_ARGUMENT = "-DskipSerialITs=${params.SKIP_SERIAL_ITS}"

core/src/test/java/com/datastax/oss/driver/internal/core/ssl/ReloadingKeyManagerFactoryTest.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.net.InetSocketAddress;
2727
import java.net.SocketAddress;
2828
import java.net.SocketException;
29+
import java.net.URISyntaxException;
2930
import java.nio.file.Files;
3031
import java.nio.file.Path;
3132
import java.nio.file.Paths;
@@ -55,12 +56,22 @@ public class ReloadingKeyManagerFactoryTest {
5556
private static final Logger logger =
5657
LoggerFactory.getLogger(ReloadingKeyManagerFactoryTest.class);
5758

58-
static final Path CERT_BASE =
59-
Paths.get(
60-
ReloadingKeyManagerFactoryTest.class
61-
.getResource(
62-
String.format("/%s/certs/", ReloadingKeyManagerFactoryTest.class.getSimpleName()))
63-
.getPath());
59+
static final Path CERT_BASE;
60+
61+
static {
62+
try {
63+
CERT_BASE =
64+
Paths.get(
65+
ReloadingKeyManagerFactoryTest.class
66+
.getResource(
67+
String.format(
68+
"/%s/certs/", ReloadingKeyManagerFactoryTest.class.getSimpleName()))
69+
.toURI());
70+
} catch (URISyntaxException e) {
71+
throw new RuntimeException(e);
72+
}
73+
}
74+
6475
static final Path SERVER_KEYSTORE_PATH = CERT_BASE.resolve("server.keystore");
6576
static final Path SERVER_TRUSTSTORE_PATH = CERT_BASE.resolve("server.truststore");
6677

0 commit comments

Comments
 (0)