From 0b4733bf325124f834df0423b1577f004fb15015 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Apr 2026 16:02:20 +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] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f5730c..c0059c5 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ 1.18.44 - 1.9.0 + 2.0.0 1.9.0 4.7.7 From 3d00c2b6fbd7b0d331db551b5f0fb75b6fca15f8 Mon Sep 17 00:00:00 2001 From: Philippe Charles Date: Tue, 7 Apr 2026 10:23:06 +0200 Subject: [PATCH 2/2] Fix API changes --- .../java/nbbrd/console/properties/ConsoleProperties.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/nbbrd/console/properties/ConsoleProperties.java b/src/main/java/nbbrd/console/properties/ConsoleProperties.java index 4e06c57..37854b7 100644 --- a/src/main/java/nbbrd/console/properties/ConsoleProperties.java +++ b/src/main/java/nbbrd/console/properties/ConsoleProperties.java @@ -18,12 +18,12 @@ import internal.console.properties.ConsolePropertiesSpiLoader; import internal.console.properties.FailsafeConsolePropertiesSpi; +import lombok.NonNull; import nbbrd.design.ThreadSafe; import nbbrd.service.Quantifier; import nbbrd.service.ServiceDefinition; import nbbrd.service.ServiceFilter; import nbbrd.service.ServiceSorter; -import lombok.NonNull; import org.jspecify.annotations.Nullable; import java.nio.charset.Charset; @@ -32,6 +32,8 @@ import java.util.Optional; import java.util.OptionalInt; +import static java.util.stream.Collectors.toList; + /** * This class allows to retrieve some console properties such as size and * encoding. @@ -51,7 +53,7 @@ public final class ConsoleProperties { public static ConsoleProperties ofServiceLoader() { return ConsoleProperties .builder() - .providers(new ConsolePropertiesSpiLoader().get()) + .providers(ConsolePropertiesSpiLoader.load().stream().map(FailsafeConsolePropertiesSpi::wrap).collect(toList())) .build(); } @@ -121,8 +123,7 @@ private boolean isNotNegative(int value) { @ThreadSafe @ServiceDefinition( loaderName = "internal.console.properties.ConsolePropertiesSpiLoader", - quantifier = Quantifier.MULTIPLE, - wrapper = FailsafeConsolePropertiesSpi.class + quantifier = Quantifier.MULTIPLE ) public interface Spi {