Skip to content

Bump java-service.version from 1.9.0 to 2.0.0 #465

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
charphi merged 2 commits into from
Apr 7, 2026
Merged

Bump java-service.version from 1.9.0 to 2.0.0 #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16148f
Bump java-service.version from 1.9.0 to 2.0.0
dependabot[bot] Apr 4, 2026
059476b
Fix API changes
charphi Apr 7, 2026
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/nbbrd/net/proxy/SystemProxySelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
*
Expand All @@ -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();
Expand Down Expand Up @@ -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 {

Expand Down
Loading