From e16148fe148117ee8580f4169ae5dc70c0a97a8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 4 Apr 2026 15:22:18 +0000
Subject: [PATCH 1/2] Bump java-service.version from 1.9.0 to 2.0.0

Bumps `java-service.version` from 1.9.0 to 2.0.0.

Updates `com.github.nbbrd.java-service-util:java-service-processor` from 1.9.0 to 2.0.0
- [Release notes](https://github.com/nbbrd/java-service-util/releases)
- [Changelog](https://github.com/nbbrd/java-service-util/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/nbbrd/java-service-util/compare/v1.9.0...v2.0.0)

Updates `com.github.nbbrd.java-service-util:java-service-bom` from 1.9.0 to 2.0.0
- [Release notes](https://github.com/nbbrd/java-service-util/releases)
- [Changelog](https://github.com/nbbrd/java-service-util/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/nbbrd/java-service-util/compare/v1.9.0...v2.0.0)

---
updated-dependencies:
- dependency-name: com.github.nbbrd.java-service-util:java-service-processor
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.github.nbbrd.java-service-util:java-service-bom
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fbf76a..45e13d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@
             </activation>
             <properties>
                 <lombok.version>1.18.44</lombok.version>
-                <java-service.version>1.9.0</java-service.version>
+                <java-service.version>2.0.0</java-service.version>
                 <java-design.version>1.9.0</java-design.version>
             </properties>
             <dependencyManagement>

From 059476b328ed61886e44894d1cbfe512c060143e Mon Sep 17 00:00:00 2001
From: Philippe Charles <philippe.charles@nbb.be>
Date: Tue, 7 Apr 2026 10:25:29 +0200
Subject: [PATCH 2/2] Fix API changes

---
 .../java/nbbrd/net/proxy/SystemProxySelector.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/nbbrd/net/proxy/SystemProxySelector.java b/src/main/java/nbbrd/net/proxy/SystemProxySelector.java
index ef44d48..437791e 100644
--- a/src/main/java/nbbrd/net/proxy/SystemProxySelector.java
+++ b/src/main/java/nbbrd/net/proxy/SystemProxySelector.java
@@ -18,6 +18,12 @@
 
 import internal.net.proxy.FailsafeSystemProxySpi;
 import internal.net.proxy.SystemProxySpiLoader;
+import lombok.NonNull;
+import nbbrd.design.ThreadSafe;
+import nbbrd.service.Quantifier;
+import nbbrd.service.ServiceDefinition;
+import org.jspecify.annotations.Nullable;
+
 import java.io.IOException;
 import java.net.Proxy;
 import java.net.ProxySelector;
@@ -28,11 +34,7 @@
 import java.util.Objects;
 import java.util.function.UnaryOperator;
 
-import nbbrd.design.ThreadSafe;
-import nbbrd.service.Quantifier;
-import nbbrd.service.ServiceDefinition;
-import lombok.NonNull;
-import org.jspecify.annotations.Nullable;
+import static java.util.stream.Collectors.toList;
 
 /**
  *
@@ -45,7 +47,7 @@ public final class SystemProxySelector extends ProxySelector {
     @NonNull
     public static SystemProxySelector ofServiceLoader() {
         return builder()
-                .providers(new SystemProxySpiLoader().get())
+                .providers(SystemProxySpiLoader.load().stream().map(FailsafeSystemProxySpi::wrap).collect(toList()))
                 .systemProperties(System::getProperty)
                 .fallback(ProxySelector.getDefault())
                 .build();
@@ -96,7 +98,6 @@ private boolean hasProperty(String property) {
     @ThreadSafe
     @ServiceDefinition(
             quantifier = Quantifier.MULTIPLE,
-            wrapper = FailsafeSystemProxySpi.class,
             loaderName = "internal.net.proxy.SystemProxySpiLoader")
     public interface Spi {