Commit Graph

2249 Commits

Author SHA1 Message Date
Ryan Baxter
b730ac3dba Merge branch '4.2.x' 2025-04-16 11:35:41 -04:00
Ryan Baxter
45bbe08a7d Merge branch '4.1.x' into 4.2.x 2025-04-16 11:35:29 -04:00
Yanming Zhou
999a323a1b Improve GenericScope to remove unused evaluationContext (#1486)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-04-16 11:35:01 -04:00
Olga Maciaszek-Sharma
467e868792 Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java
2025-04-11 16:25:31 +02:00
Olga Maciaszek-Sharma
67d37c4247 Merge remote-tracking branch 'origin/main' 2025-04-11 16:18:38 +02:00
Olga Maciaszek-Sharma
f7b088edb7 Fix typo.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-04-11 16:17:45 +02:00
Olga Maciaszek-Sharma
5afd8d1abc Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	docs/package.json
2025-04-11 16:16:37 +02:00
Olga Maciaszek-Sharma
76cbd135f7 Merge remote-tracking branch 'origin/4.1.x' into 4.1.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-04-11 16:09:57 +02:00
Olga Maciaszek-Sharma
10ed7213ec Fix checkstyle. Revert debug changes. Refactor.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-04-11 15:50:10 +02:00
Olga Maciaszek-Sharma
3322cfc8eb Merge remote-tracking branch 'origin/4.1.x' into 4.1.x 2025-04-11 15:13:48 +02:00
spring-builds
502ccae23d Going back to snapshots 2025-04-07 10:36:00 +00:00
spring-builds
cbb7b4d977 Update SNAPSHOT to 4.3.0-M3 2025-04-07 10:35:03 +00:00
Ryan Baxter
cf58952a14 Merge branch '4.2.x' 2025-03-27 11:10:40 -04:00
Ryan Baxter
039513439e Use okhttp bom to manage all okhttp dependencies (#1484)
Fixes #1479
2025-03-27 11:03:34 -04:00
dependabot[bot]
7371f12603 Bump @springio/asciidoctor-extensions in /docs (#1483)
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.16 to 1.0.0-alpha.17.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.16...v1.0.0-alpha.17)

---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
  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>
2025-03-24 15:42:25 -04:00
dependabot[bot]
815f34e954 Bump @springio/asciidoctor-extensions in /docs (#1482)
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.16 to 1.0.0-alpha.17.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.16...v1.0.0-alpha.17)

---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
  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>
2025-03-24 15:41:57 -04:00
dependabot[bot]
53623dbda1 Bump @springio/asciidoctor-extensions in /docs (#1480)
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.16 to 1.0.0-alpha.17.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.16...v1.0.0-alpha.17)

---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
  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>
2025-03-24 15:40:59 -04:00
spring-builds
f1bfd51d4c Bumping versions 2025-03-20 01:45:19 +00:00
spring-builds
44cd9c0f86 Bumping versions 2025-03-19 01:46:26 +00:00
spring-builds
498ba65203 Bumping dependency versions after release 2025-03-18 22:31:22 +00:00
spring-builds
72aeed000b Bumping versions to 4.2.2-SNAPSHOT after release 2025-03-18 22:30:36 +00:00
spring-builds
44483f857c Going back to snapshots 2025-03-18 22:30:35 +00:00
spring-builds
279a1d7233 Update SNAPSHOT to 4.2.1 2025-03-18 22:29:15 +00:00
spring-builds
06b2d216b0 Bumping versions 2025-03-13 14:46:24 +00:00
Yanming Zhou
7b4daa219c Add unit test to verify spring.config.activate.on-profile is supported in bootstrap.yaml (#1469)
See GH-1416

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-13 11:48:57 +01:00
spring-builds
5f20639a2c Bumping versions 2025-03-13 01:47:18 +00:00
Olga Maciaszek-Sharma
a7cb111a76 Merge remote-tracking branch 'origin/main' 2025-03-05 14:22:10 +01:00
Olga Maciaszek-Sharma
6ed6e440fb Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	docs/package.json
2025-03-04 15:37:21 +01:00
Olga Maciaszek-Sharma
ae520ef20a Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	docs/package.json
2025-03-04 15:30:40 +01:00
dependabot[bot]
a196c33610 Bump @springio/antora-extensions from 1.14.2 to 1.14.4 in /docs (#1474)
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.2 to 1.14.4.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.2...v1.14.4)

---
updated-dependencies:
- dependency-name: "@springio/antora-extensions"
  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>
2025-03-04 15:29:02 +01:00
spring-builds
b68fb324c7 Going back to snapshots 2025-02-27 19:00:15 +00:00
spring-builds
f4c6446afb Update SNAPSHOT to 4.3.0-M2 2025-02-27 18:59:15 +00:00
Ryan Baxter
12395661e1 Manage the version of okhttp in commons (#1470) 2025-02-14 10:06:21 -05:00
Olga Maciaszek-Sharma
4a1daae7f9 Update dependabot settings.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
2025-02-10 15:09:24 +01:00
Olga Maciaszek-Sharma
0f4407b303 Fix checkstyle rules. 2025-02-07 13:33:34 +01:00
Ryan Baxter
c8cade1a7d Update maven.yml
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:39:21 -05:00
dependabot[bot]
531f273339 Bump @springio/asciidoctor-extensions in /docs (#1462)
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16)

---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
  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>
2025-02-03 10:36:11 -05:00
dependabot[bot]
290428598e Bump org.bouncycastle:bcprov-jdk18on from 1.78.1 to 1.80 (#1461)
Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.78.1 to 1.80.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk18on
  dependency-type: direct:production
  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>
2025-02-03 10:35:40 -05:00
Ryan Baxter
d541e1300c Adding 4.2.x branch
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:27:38 -05:00
dependabot[bot]
768a0ff386 Bump @springio/asciidoctor-extensions in /docs (#1460)
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16)

---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
  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>
2025-02-03 10:26:17 -05:00
Ryan Baxter
a5080871f5 Adding 4.2.x branches
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:25:02 -05:00
dependabot[bot]
b9dca6f509 Bump @springio/asciidoctor-extensions in /docs (#1459)
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16)

---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
  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>
2025-02-03 10:23:13 -05:00
spring-builds
23d6202a71 Going back to snapshots 2025-01-30 03:11:24 +00:00
spring-builds
21e6811f45 Update SNAPSHOT to 4.3.0-M1 2025-01-30 03:10:25 +00:00
Yanming Zhou
bff2c95fe1 Support configuring bean names as well as bean types for extra-refreshable and never-refreshable (#1457)
Thanks to https://github.com/spring-projects/spring-boot/issues/22403, applications could define a bean in addition to an auto-configured bean of the same type, then we should support configuring bean names for fine-grained control.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 10:55:52 -05:00
Yanming Zhou
b4dac301a0 Support configuring bean names as well as bean types for extra-refreshable and never-refreshable (#1457)
Thanks to https://github.com/spring-projects/spring-boot/issues/22403, applications could define a bean in addition to an auto-configured bean of the same type, then we should support configuring bean names for fine-grained control.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 10:55:10 -05:00
Ryan Baxter
c81458de50 Merge branch '4.2.x' 2025-01-23 16:47:49 -05:00
Ryan Baxter
9450a2dfca Merge branch '4.1.x' into 4.2.x 2025-01-23 16:47:35 -05:00
Yanming Zhou
ee490fe7c8 Move field ContextRefresher.REFRESH_ARGS_PROPERTY_SOURCE down to LegacyContextRefresher (#1450)
It's specific to LegacyContextRefresher.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-23 16:47:20 -05:00
Yanming Zhou
6c352b8dee Move field ContextRefresher.REFRESH_ARGS_PROPERTY_SOURCE down to LegacyContextRefresher (#1450)
It's specific to LegacyContextRefresher.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-23 16:46:20 -05:00