Commit Graph

900 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
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
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
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
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
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
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
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
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
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
Yanming Zhou
72294c24fb Deprecate unused EnvironmentUtils (#1456)
EnvironmentUtils is not used in all spring-cloud projects, see https://github.com/search?q=org%3Aspring-cloud%20getSubProperties&type=code

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-23 11:18:21 -05:00
Ryan Baxter
c50e97641f Merge branch '4.1.x' into 4.2.x 2025-01-22 09:34:16 -05:00
Yanming Zhou
1e15993f73 Remove workaround for data source cycle (#1445)
It should be fixed at Spring Boot side, see 2f83a6714b

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-22 09:34:01 -05:00
Yanming Zhou
c507a221d1 Remove workaround for data source cycle (#1445)
It should be fixed at Spring Boot side, see 2f83a6714b

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-22 09:33:35 -05:00
Ryan Baxter
2298cdba50 Merge branch '4.1.x' into 4.2.x 2025-01-21 15:35:34 -05:00
Yanming Zhou
375bc032e4 Polish RefreshAutoConfiguration to reuse constants (#1443)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:35:18 -05:00
Yanming Zhou
129d490229 Polish RefreshAutoConfiguration to reuse constants (#1443)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:34:54 -05:00
Ryan Baxter
5853b051b7 Merge branch '4.1.x' into 4.2.x 2025-01-21 15:29:55 -05:00
Yanming Zhou
d9a0bf923e Use Objects.equals() instead (#1452)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:29:40 -05:00
Yanming Zhou
e7aa45e88e Use Objects.equals() instead (#1452)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:29:20 -05:00
Ryan Baxter
10583b09cd Merge branch '4.1.x' into 4.2.x 2025-01-21 15:25:31 -05:00
Yanming Zhou
6002301d1b Fix typo (#1444)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:25:15 -05:00
Yanming Zhou
f4e078ad03 Fix typo (#1444)
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:24:33 -05:00
spencergibb
6bf064c1a3 Updates to version 4.3.0-SNAPSHOT 2025-01-16 12:40:20 -05:00
spring-builds
1ea54c78ed Bumping versions to 4.2.1-SNAPSHOT after release 2024-12-03 00:32:09 +00:00
spring-builds
f13e86b11e Going back to snapshots 2024-12-03 00:32:08 +00:00
spring-builds
f4671d6e31 Update SNAPSHOT to 4.2.0 2024-12-03 00:30:49 +00:00
spring-builds
5bc726e0aa Going back to snapshots 2024-11-27 01:00:26 +00:00
spring-builds
d9e7b1f066 Update SNAPSHOT to 4.1.5 2024-11-27 00:58:46 +00:00
spring-builds
134ea7a23c Going back to snapshots 2024-11-26 15:38:18 +00:00
spring-builds
0d3221f69e Update SNAPSHOT to 4.1.5 2024-11-26 15:36:54 +00:00
spring-builds
d299f1d13c Going back to snapshots 2024-11-26 14:57:36 +00:00
spring-builds
93c012bcd9 Update SNAPSHOT to 4.1.5 2024-11-26 14:55:58 +00:00
spring-builds
dd1cba8d10 Bumping versions to 4.1.6-SNAPSHOT after release 2024-11-26 14:11:02 +00:00
spring-builds
f849dfb07c Going back to snapshots 2024-11-26 14:11:01 +00:00
spring-builds
a4926b6d9d Update SNAPSHOT to 4.1.5 2024-11-26 14:09:40 +00:00
spring-builds
4f7a10fc3f Bumping versions 2024-11-26 13:27:18 +00:00