spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 02:49:03 +00:00
Code Issues Projects Releases Wiki Activity
53,994 Commits 28 Branches 395 Tags
3241cd7e94de3c78f560f307b117a0f6973c4e33
Commit Graph
53994 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson 6105c5e50f Polish javadoc of SqlR2dbcScriptDatabaseInitializer 
Closes gh-44763
 2025-03-18 19:26:14 +00:00
Andy Wilkinson e237390e66 Ignore prototype DataSource beans for metrics and health 
Previously, if a prototype DataSource bean was defined, Actuator's
metrics and health would try to access an instance of it. At best
this was wasteful as the new instance would only be used for metrics
and health and would not be indicative of the app's DataSource usage.
At worst, it could cause a failure in the unusual case of the
prototype bean definition requiring arguments to be supplied using
ObjectProvider.getObject(Object...) or the like.

This commit address the problem by ignoring prototype DataSource
for metrics and health.

Other types of beans for which Actuator provides metrics and health
are similarly affected. They have not be fixed here as the situation
is so unusual. Should another problem arise in the future, it can be
addressed at that time when there's a clear need.

Closes gh-44706
 2025-03-18 19:10:45 +00:00
Stéphane Nicoll 4dea97141c Merge branch '3.3.x' into 3.4.x 
Closes gh-44759
 2025-03-18 15:25:57 +01:00
Stéphane Nicoll 08b2c560dd Order dependencies 
Closes gh-44757
 2025-03-18 15:22:26 +01:00
Moritz Halbritter c2075bf8e0 Document support for Java 24 
Closes gh-44754
 2025-03-18 14:00:14 +01:00
Stéphane Nicoll 9515c6fb43 Merge branch '3.3.x' into 3.4.x 
Closes gh-44750
 2025-03-18 09:53:43 +01:00
Stéphane Nicoll 86d08fb76f Merge pull request #44747 from quaff 
* pr/44747:
  Udate copyright year of changed file
  Remove workaround for Java Records in tests

Closes gh-44747
 2025-03-18 09:53:38 +01:00
Stéphane Nicoll 19de2263e2 Udate copyright year of changed file 
See gh-44747
 2025-03-18 09:50:20 +01:00
Yanming Zhou aa72f4d553 Remove workaround for Java Records in tests 
See gh-44747

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-18 09:48:42 +01:00
Stéphane Nicoll 274e2ed1ea Merge branch '3.3.x' into 3.4.x 
Closes gh-44748
 2025-03-18 09:48:04 +01:00
Stéphane Nicoll af13323d32 Merge pull request #44724 from ngocnhan-tran1996 
* pr/44724:
  Remove redhat architect guide link

Closes gh-44724
 2025-03-18 09:47:55 +01:00
Tran Ngoc Nhan 5909d1e919 Remove redhat architect guide link 
See gh-44724

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
 2025-03-18 09:47:39 +01:00
Stéphane Nicoll c63111cc99 Merge branch '3.3.x' into 3.4.x 2025-03-17 17:51:11 +01:00
Stéphane Nicoll 928d61f864 Upgrade to Spring Pulsar 1.2.4 
Closes gh-44571
 2025-03-17 17:41:34 +01:00
Stéphane Nicoll e91da7be51 Upgrade to Spring AMQP 3.2.4 
Closes gh-44740
 2025-03-17 17:41:34 +01:00
Stéphane Nicoll 55b035bcf5 Upgrade to Hibernate 6.6.11.Final 
Closes gh-44739
 2025-03-17 17:41:29 +01:00
Stéphane Nicoll a0146f2f83 Upgrade to Spring Pulsar 1.1.10 
Closes gh-44562
 2025-03-17 17:39:15 +01:00
Stéphane Nicoll 2a5083c9ac Upgrade to Spring AMQP 3.1.10 
Closes gh-44738
 2025-03-17 17:39:15 +01:00
Stéphane Nicoll 0f7d46a992 Polish "Stop relying on broker's auto-configuration" 
See gh-44735
 2025-03-17 16:06:12 +01:00
Stéphane Nicoll aec59c7369 Merge branch '3.3.x' into 3.4.x 
Closes gh-44735
 2025-03-17 15:55:54 +01:00
Stéphane Nicoll bf4fface23 Stop relying on broker's auto-configuration 
This commit isolates JmsAutoConfiguration tests so that they do not
rely on an actual broker. Some tests that are no longer relevant have
been adapted as well.

Closes gh-44734
 2025-03-17 15:50:34 +01:00
Stéphane Nicoll 4bdf898e02 Start building against Spring Framework 6.2.5 snapshots 
See gh-44731
 2025-03-17 14:12:05 +01:00
Stéphane Nicoll 0ca4be2d52 Merge branch '3.3.x' into 3.4.x 
Closes gh-44729
 2025-03-17 09:02:00 +01:00
Stéphane Nicoll 15efbd675f Merge pull request #44725 from quaff 
* pr/44725:
  Update copyright year of changed files
  Polish usage of @ConfigurationProperties

Closes gh-44725
 2025-03-17 09:01:52 +01:00
Stéphane Nicoll 6ec6132cc2 Update copyright year of changed files 
See gh-44725
 2025-03-17 09:01:35 +01:00
Yanming Zhou fa9c1f0c41 Polish usage of @ConfigurationProperties 
See gh-44725

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-17 09:01:08 +01:00
Moritz Halbritter 01719c41fa Merge branch '3.3.x' into 3.4.x 
Closes gh-44727
 2025-03-17 08:55:16 +01:00
Moritz Halbritter 135fb1a254 Merge pull request #44718 from KmYgJn 
* pr/44718:
  Fix Integer conversion in getProgress() method

Closes gh-44718
 2025-03-17 08:52:24 +01:00
youngjin_dev a164dab25d Fix Integer conversion in getProgress() method 
See gh-44718

Signed-off-by: youngjin_dev <qazkyj0310@gmail.com>
 2025-03-17 08:52:15 +01:00
Phillip Webb 14e00c0c75 Merge branch '3.3.x' into 3.4.x 2025-03-14 17:24:26 -07:00
Phillip Webb 109e4c8572 Update copyright year of changed files 2025-03-14 17:24:06 -07:00
Phillip Webb 5d688502ae Polish 2025-03-14 15:44:23 -07:00
Phillip Webb 6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb 896b5767fe Polish 2025-03-14 13:36:04 -07:00
Stéphane Nicoll af18d8a884 Merge branch '3.3.x' into 3.4.x 2025-03-14 17:06:59 +01:00
Stéphane Nicoll e851832efe Upgrade to Spring Data Bom 2024.1.4 
Closes gh-44569
 2025-03-14 17:04:33 +01:00
Stéphane Nicoll 4c5ceb8c33 Upgrade to AspectJ 1.9.23 
Closes gh-44720
 2025-03-14 17:04:33 +01:00
Stéphane Nicoll 2d6eb6618b Upgrade to Spring Data Bom 2024.0.10 
Closes gh-44561
 2025-03-14 16:59:43 +01:00
Stéphane Nicoll e90e6355ed Upgrade to AspectJ 1.9.23 
Closes gh-44719
 2025-03-14 16:59:43 +01:00
Moritz Halbritter a2a0adea8a Merge branch '3.3.x' into 3.4.x 
Closes gh-44716
 2025-03-14 14:53:40 +01:00
Moritz Halbritter 09b3461394 Remove use of self-signed.badssl.com 
Closes gh-43708
 2025-03-14 14:45:14 +01:00
Moritz Halbritter 84612f36ce Move UseApr enum inside the Tomcat class 
See gh-44033
 2025-03-13 12:03:27 +01:00
Stéphane Nicoll 75413d9a70 Merge branch '3.3.x' into 3.4.x 2025-03-13 11:27:46 +01:00
Stéphane Nicoll 1d284198bf Upgrade to Spring Framework 6.2.4 
Closes gh-44442
 2025-03-13 11:09:29 +01:00
Stéphane Nicoll 6f0ed7325e Upgrade to Native Build Tools Plugin 0.10.6 
Closes gh-44708
 2025-03-13 11:09:29 +01:00
Stéphane Nicoll 3c8e65c2b4 Upgrade to Spring Framework 6.1.18 
Closes gh-44491
 2025-03-13 11:08:54 +01:00
Stéphane Nicoll 92754353f6 Upgrade to Native Build Tools Plugin 0.10.6 
Closes gh-44707
 2025-03-13 11:08:54 +01:00
Moritz Halbritter 7fcf34eaeb Add property 'server.tomcat.use-apr' to control Tomcat's APR 
The property's default depends on the Java version. On Java < 24, it defaults
to WHEN_AVAILABLE, on Java >=24 it defaults to NEVER.

Closes gh-44033
 2025-03-13 08:40:16 +01:00
Andy Wilkinson 59ddba1063 Merge branch '3.3.x' into 3.4.x 
Closes gh-44697
 2025-03-12 15:48:36 +00:00
Andy Wilkinson 9b15b4bce9 Consolidate mock web server factories 
Closes gh-44674
 2025-03-12 15:26:47 +00:00