diff --git a/Dockerfile b/Dockerfile index cf084b5..4fdf93a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.13_11-jre-focal +FROM eclipse-temurin:21.0.11_10-jre-noble ARG jar diff --git a/build.gradle b/build.gradle index 13ad992..80d65ea 100644 --- a/build.gradle +++ b/build.gradle @@ -35,10 +35,10 @@ allprojects { } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } tasks.withType(JavaCompile).configureEach { diff --git a/iexec-result-proxy-library/build.gradle b/iexec-result-proxy-library/build.gradle index d8299b4..f305e1f 100644 --- a/iexec-result-proxy-library/build.gradle +++ b/iexec-result-proxy-library/build.gradle @@ -12,8 +12,8 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 withJavadocJar() withSourcesJar() } diff --git a/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java b/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java index 1ef1c58..145392d 100644 --- a/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java +++ b/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.net.InetAddress; +import java.net.URI; import java.net.URL; import java.util.Optional; @@ -40,7 +41,7 @@ public class IpfsService implements SmartLifecycle { public IpfsService(final IpfsConfig ipfsConfig) { try { - final URL ipfsUrl = new URL(ipfsConfig.getUrl()); + final URL ipfsUrl = new URI(ipfsConfig.getUrl()).toURL(); final String ipfsHost = ipfsUrl.getHost(); final int port = ipfsUrl.getPort() != -1 ? ipfsUrl.getPort() : ipfsUrl.getDefaultPort(); final String ipfsNodeIp = InetAddress.getByName(ipfsHost).getHostAddress();