spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 10:19:13 +00:00
Code Issues Projects Releases Wiki Activity
54,624 Commits 24 Branches 395 Tags
4e8a85ed336ff02747462157353e544cd6359099
Commit Graph
54624 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson 4e8a85ed33 Merge branch 'main' into 4.0.x 2025-05-15 08:28:43 +01:00
Andy Wilkinson 6aad22565b Merge branch '3.4.x' 
Closes gh-45563
 2025-05-15 08:28:17 +01:00
Andy Wilkinson 363aeaa28a Merge branch '3.3.x' into 3.4.x 
Closes gh-45562
 2025-05-15 08:28:03 +01:00
Andy Wilkinson 2bb4278f96 Use Framework's ResolvableType 
Replace accidental use of Lettuce's class of the same name.

Closes gh-45561
 2025-05-15 08:25:14 +01:00
Stéphane Nicoll 607183f4d5 Merge branch 'main' into 4.0.x 2025-05-15 08:41:51 +02:00
Stéphane Nicoll d35ee8e924 Merge branch '3.4.x' 2025-05-15 08:41:39 +02:00
Stéphane Nicoll 134bc1be34 Start building against Spring Session 3.5.0 snapshots 
See gh-45560
 2025-05-15 08:38:43 +02:00
Stéphane Nicoll ce86665a01 Start building against Spring HATEOAS 2.5.0 snapshots 
See gh-45559
 2025-05-15 08:38:40 +02:00
Stéphane Nicoll 55c636d99f Start building against Spring Security 6.4.6 snapshots 
See gh-45558
 2025-05-15 08:37:17 +02:00
Stéphane Nicoll 0b4cb4bff1 Merge branch 'main' into 4.0.x 2025-05-15 08:27:48 +02:00
Stéphane Nicoll 698821a916 Merge branch '3.4.x' 
Closes gh-45557
 2025-05-15 08:27:32 +02:00
Stéphane Nicoll b3f3b06fdb Merge branch '3.3.x' into 3.4.x 
Closes gh-45556
 2025-05-15 08:27:24 +02:00
Stéphane Nicoll e1ec866b6a Merge pull request #45554 from quaff 
* pr/45554:
  Remove unused imports in sample

Closes gh-45554
 2025-05-15 08:27:19 +02:00
Yanming Zhou 0d153dd91a Remove unused imports in sample 
See gh-45554

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-05-15 08:27:01 +02:00
Phillip Webb 666a98a4b4 Merge branch 'main' into 4.0.x 2025-05-14 18:14:10 -07:00
Phillip Webb 91d14fa27c Merge branch '3.4.x' 
Closes gh-45553
 2025-05-14 18:14:04 -07:00
Phillip Webb bd40779bc6 Merge branch '3.3.x' into 3.4.x 
Closes gh-45552
 2025-05-14 18:14:00 -07:00
Phillip Webb 27c4d1ff24 Document the way that primary Kotlin constructors are used when binding 
Improve constructor binding documentation for Kotlin and add a test
to prove a no-param primary constructor disables constructor binding.

Closes gh-44849
 2025-05-14 18:13:54 -07:00
Phillip Webb 050d0edb09 Merge branch 'main' into 4.0.x 2025-05-14 16:22:45 -07:00
Phillip Webb fee8aa07a6 Merge branch '3.4.x' 
Closes gh-45551
 2025-05-14 16:22:39 -07:00
Phillip Webb 6c02f587f3 Merge branch '3.3.x' into 3.4.x 
Closes gh-45550
 2025-05-14 16:22:32 -07:00
Phillip Webb 34dee77a3e Improve "profile" reference documentation with additional admonitions 
Closes gh-45522
 2025-05-14 16:20:35 -07:00
Phillip Webb 3ac2315240 Merge branch 'main' into 4.0.x 2025-05-14 15:27:00 -07:00
Phillip Webb e0a23e5e38 Merge branch '3.4.x' 
Closes gh-45549
 2025-05-14 15:26:50 -07:00
Phillip Webb c2d2c95091 Merge branch '3.3.x' into 3.4.x 
Closes gh-45548
 2025-05-14 15:26:33 -07:00
Phillip Webb ce900b1304 Ensure setEnvironmentPrefix works with spring.profiles.active 
Update `ConfigDataEnvironmentContributor` to ensure that origin prefixes
are considered when binding properties.

Fixes gh-45387
 2025-05-14 15:25:30 -07:00
Stéphane Nicoll 0915ecc6ec Upgrade to Jackson Bom 2.19.0 
Closes gh-45542
 2025-05-14 12:52:58 +02:00
Stéphane Nicoll e1ff4fbaf9 Upgrade to Jackson Bom 2.19.0 
Closes gh-45542
 2025-05-14 12:38:43 +02:00
Andy Wilkinson 0b12cebff4 Fix warnings reported in Eclipse 2025-05-14 11:37:07 +01:00
Andy Wilkinson 379b2ceb56 Fix Eclipse warnings caused by deprecation of Jackson 2 support 
See gh-45535
 2025-05-14 11:37:07 +01:00
Stéphane Nicoll ee90996e5f Merge pull request #45509 from quaff 
* pr/45509:
  Remove FILE_LOG_PATTERN property from console-only log4j2.xml

Closes gh-45509
 2025-05-14 11:49:06 +02:00
Yanming Zhou e723dffb97 Remove FILE_LOG_PATTERN property from console-only log4j2.xml 
See gh-45509

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-05-14 11:48:21 +02:00
Stéphane Nicoll 1f84689cd4 Merge branch 'main' into 4.0.x 2025-05-14 11:43:57 +02:00
Stéphane Nicoll 2ca0ac075b Merge branch '3.4.x' 2025-05-14 11:43:38 +02:00
Stéphane Nicoll 68f7eef287 Merge branch '3.3.x' into 3.4.x 2025-05-14 11:43:32 +02:00
Stéphane Nicoll 3a97b9a4db Upgrade to Reactor Bom 2024.0.6 
Closes gh-45434
 2025-05-14 11:34:23 +02:00
Stéphane Nicoll 9d5095f4b6 Prevent upgrade to Prometheus Client 1.3.7 
Closes gh-45541
 2025-05-14 11:34:19 +02:00
Stéphane Nicoll ca60b83790 Upgrade to Reactor Bom 2024.0.6 
Closes gh-45414
 2025-05-14 11:01:29 +02:00
Stéphane Nicoll a471082d2b Prevent upgrade to Prometheus Client 1.3.7 
Closes gh-45538
 2025-05-14 11:01:10 +02:00
Stéphane Nicoll 5e85e8f61e Upgrade to Hibernate 6.6.15.Final 
Closes gh-45540
 2025-05-14 09:53:06 +02:00
Stéphane Nicoll a156c08243 Upgrade to Couchbase Client 3.8.1 
Closes gh-45539
 2025-05-14 09:53:01 +02:00
Stéphane Nicoll 603204f263 Upgrade to Hibernate 6.6.15.Final 
Closes gh-45537
 2025-05-14 09:51:06 +02:00
Stéphane Nicoll 0946de87e1 Upgrade to Reactor Bom 2023.0.18 
Closes gh-45420
 2025-05-14 09:50:02 +02:00
Phillip Webb 02ee7fdb30 Suppress Jackson 2 warnings 
See gh-45535
 2025-05-13 11:42:25 -07:00
Olga Maciaszek-SharmaandPhillip Webb 5bdb0ecbb4 Improve HttpServiceClientAutoConfiguration conditions 
See gh-18366

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
 2025-05-13 08:23:21 -07:00
Stéphane Nicoll 2ae354d6ec Polish "Remove outdated Session's Cookie override" 
Closes gh-45523
 2025-05-13 17:03:45 +02:00
Stéphane Nicoll 083b49030e Remove outdated Session's Cookie override 
Closes gh-45523
 2025-05-13 16:28:38 +02:00
Stéphane Nicoll c25e330b2e Merge pull request #45521 from quaff 
* pr/45521:
  Polish MetricsAutoConfiguration

Closes gh-45521
 2025-05-13 16:18:38 +02:00
Yanming Zhou 658764bfd8 Polish MetricsAutoConfiguration 
Align `meterRegistryPostProcessor` with `meterRegistryCloser`, the
`@Bean` method shouldn't be public if the return type is not public.

See gh-45521

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-05-13 16:18:25 +02:00
Stéphane Nicoll b054a01b55 Merge pull request #45503 from quaff 
* pr/45503:
  Polish PrometheusProperties

Closes gh-45503
 2025-05-13 16:17:11 +02:00