Skip to content

Fix arguments in debug statement#979

Closed
ryanjbaxter wants to merge 72 commits intospring-cloud:4.3.xfrom
ryanjbaxter:logging-error
Closed

Fix arguments in debug statement#979
ryanjbaxter wants to merge 72 commits intospring-cloud:4.3.xfrom
ryanjbaxter:logging-error

Conversation

@ryanjbaxter
Copy link
Copy Markdown
Contributor

Fixes #978

spencergibb and others added 30 commits June 6, 2025 13:10
Bumps `testcontainers.version` from 1.21.1 to 1.21.2.

Updates `org.testcontainers:consul` from 1.21.1 to 1.21.2
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.21.1...1.21.2)

Updates `org.testcontainers:mockserver` from 1.21.1 to 1.21.2
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.21.1...1.21.2)

Updates `org.testcontainers:junit-jupiter` from 1.21.1 to 1.21.2
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.21.1...1.21.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:consul
  dependency-version: 1.21.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:mockserver
  dependency-version: 1.21.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-version: 1.21.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit adapts to Spring Boot 4.0's restructuring.

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
…ng-cloud#901)

Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.4 to 1.14.7.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](spring-io/antora-extensions@v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: "@springio/antora-extensions"
  dependency-version: 1.14.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Migrate health indicator to new http client

Fixes spring-cloudgh-475
Fixes spring-cloudgh-840
Spring doesn't use the `I` in front of interface definitions.
Bumps `testcontainers.version` from 1.21.2 to 1.21.3.

Updates `org.testcontainers:consul` from 1.21.2 to 1.21.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.21.2...1.21.3)

Updates `org.testcontainers:mockserver` from 1.21.2 to 1.21.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.21.2...1.21.3)

Updates `org.testcontainers:junit-jupiter` from 1.21.2 to 1.21.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.21.2...1.21.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:consul
  dependency-version: 1.21.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:mockserver
  dependency-version: 1.21.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-version: 1.21.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
…-cloud#910)

---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-version: 1.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…d#909)

Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.8 to 3.2.0-alpha.9.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.8...v3.2.0-alpha.9)

---
updated-dependencies:
- dependency-name: antora
  dependency-version: 3.2.0-alpha.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
#	spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java
#	spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java
#	spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java
#	spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java
#	spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProvider.java
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistration.java
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationListener.java
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java
#	spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java
#	spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfigurationTests.java
#	spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ActuatorHealthApplicationStatusProviderTests.java
#	spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationTtlCheckWithActuatorHealthTests.java
#	spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulHeartbeatAutoConfigurationTests.java
#	spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java
#	spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryTests.java
#	spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/test/java/org/springframework/cloud/consul/configdatatests/ConsulConfigDataOrderingIntegrationTests.java
jackson 3, environment post processor and bootstrap package changes
jackson 3, environment post processor and bootstrap package changes
…ud#926)

Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.9 to 3.2.0-alpha.10.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.9...v3.2.0-alpha.10)

---
updated-dependencies:
- dependency-name: antora
  dependency-version: 3.2.0-alpha.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ryanjbaxter and others added 23 commits January 28, 2026 10:52
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.14.0...maven-compiler-plugin-3.15.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-version: 3.15.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
Add CI workflow for Spring Cloud Consul with manual and scheduled triggers.

Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
Removed push trigger for specific branches.

Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
The `agentServiceDeregister` and `agentServiceSetMaintenance` operations within `ConsulClient` both required a Consul ACL token passed via the X-Consul-Token request header. This header is now optional for these two operations, consistent with all other token-based operations within this interface.

Signed-off-by: Gareth Davies <womble.abroad@gmail.com>
@ryanjbaxter ryanjbaxter closed this May 4, 2026
@ryanjbaxter ryanjbaxter reopened this May 4, 2026
@ryanjbaxter ryanjbaxter changed the base branch from 4.3.x to main May 4, 2026 13:30
@ryanjbaxter ryanjbaxter closed this May 4, 2026
@ryanjbaxter ryanjbaxter reopened this May 4, 2026
@ryanjbaxter ryanjbaxter changed the base branch from main to 4.3.x May 4, 2026 13:33
@ryanjbaxter ryanjbaxter closed this May 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

log.debug bug

7 participants