Commit Graph

46683 Commits

Author SHA1 Message Date
Phillip Webb 9f031b04e5 Merge branch '3.1.x'
Closes gh-38507
2023-11-22 11:13:12 -08:00
Phillip Webb bc504a8a03 Fix @ConditionalOnBean with annotation early FactoryBean initialization
Update `OnBeanCondition` with a variant of `getBeanNamesForAnnotation`
that does not cause early `FactoryBean` initialization.

Fixes gh-38473
2023-11-22 11:10:59 -08:00
Andy Wilkinson 152acf8a59 Merge branch '3.1.x' 2023-11-22 18:24:03 +00:00
Andy Wilkinson e7aeeb87cf Upgrade to Spring Integration 6.1.5
Closes gh-38303
2023-11-22 18:23:57 +00:00
Andy Wilkinson fc00c4006a Upgrade to Spring Integration 6.2.0
Closes gh-38315
2023-11-22 18:19:47 +00:00
Andy Wilkinson 4d33676c04 Upgrade to Spring Batch 5.1.0
Closes gh-38310
2023-11-22 18:19:46 +00:00
Brian Clozel 4b21c12e12 Merge branch '3.1.x' 2023-11-22 16:32:12 +01:00
Brian Clozel f1dc740316 Merge branch '3.0.x' into 3.1.x 2023-11-22 16:31:52 +01:00
Brian Clozel d09959d799 Merge branch '2.7.x' into 3.0.x 2023-11-22 16:30:42 +01:00
Brian Clozel 5490e73922 Improve Tags generation for methods names
This commit optimizes the `Tag` generation for method names by only
allocating new `Tag` instances for well-known method names. Others will
be marked as "UNKNOWN".
2023-11-22 16:29:41 +01:00
Andy Wilkinson 22d752ccf7 Merge branch '3.1.x' 2023-11-22 14:24:50 +00:00
Andy Wilkinson 7cb02b4387 Merge branch '3.0.x' into 3.1.x 2023-11-22 14:24:41 +00:00
Andy Wilkinson 1d7d6d1797 Merge branch '2.7.x' into 3.0.x 2023-11-22 14:24:29 +00:00
Andy Wilkinson 7ad6e4470c Upgrade to Spring Batch 4.3.10
Closes gh-38281
2023-11-22 14:23:48 +00:00
Andy Wilkinson a40f3da028 Merge branch '3.1.x'
Closes gh-38499
2023-11-22 12:35:58 +00:00
Andy Wilkinson ae5bae393b Remove unnecessary toLowerCase call from remainderIsDashes
Closes gh-38498
2023-11-22 12:35:36 +00:00
Andy Wilkinson a7571cf667 Use different default database names for Oracle XE and Oracle Free
Closes gh-38476
2023-11-22 10:48:35 +00:00
Moritz Halbritter 2323c7a838 Merge branch '3.1.x'
Closes gh-38496
2023-11-22 11:15:33 +01:00
Moritz Halbritter 74239ad689 Merge branch '3.0.x' into 3.1.x
Closes gh-38495
2023-11-22 11:15:20 +01:00
Moritz Halbritter 48e06af7ec Merge branch '2.7.x' into 3.0.x
Closes gh-38494
2023-11-22 11:15:07 +01:00
Moritz Halbritter a6346fba08 Merge pull request #38385 from PENEKhun
* pr/38385:
  Polish "Document comments in SQL for database initialization"
  Document comments in SQL for database initialization

Closes gh-38385
2023-11-22 11:14:55 +01:00
Moritz Halbritter 0171ed205c Polish "Document comments in SQL for database initialization"
See gh-38385
2023-11-22 11:14:13 +01:00
penekhun 578d0436e0 Document comments in SQL for database initialization
See gh-38385
2023-11-22 11:10:14 +01:00
Andy Wilkinson 9b6a614023 Merge branch '3.1.x' 2023-11-22 09:45:05 +00:00
Andy Wilkinson a7bcb67cce Merge branch '3.0.x' into 3.1.x 2023-11-22 09:44:54 +00:00
Andy Wilkinson 3f12c36198 Prepare for the final OSS release of 3.0.x
Closes gh-38474
2023-11-22 09:43:47 +00:00
Andy Wilkinson 1fd534ae4c Merge branch '3.1.x' 2023-11-22 09:43:13 +00:00
Andy Wilkinson a67825c320 Merge branch '3.0.x' into 3.1.x 2023-11-22 09:43:04 +00:00
Andy Wilkinson 9cdb17c9eb Merge branch '2.7.x' into 3.0.x 2023-11-22 09:42:54 +00:00
Andy Wilkinson 49c4f33919 Prepare for the final OSS release of 2.7.x
Closes gh-38472
2023-11-22 09:41:07 +00:00
Andy Wilkinson 470ae150e3 Merge branch '3.1.x' 2023-11-22 09:39:42 +00:00
Andy Wilkinson 2d7c8a144c Start building against Spring Batch 5.0.4 snapshots
See gh-38493
2023-11-22 09:39:31 +00:00
Andy Wilkinson b61b657275 Merge branch '3.1.x' 2023-11-22 09:38:50 +00:00
Andy Wilkinson eb006efa8d Merge branch '3.0.x' into 3.1.x 2023-11-22 09:38:40 +00:00
Andy Wilkinson 7d6a64bb56 Start building against Spring Batch 5.0.4 snapshots
See gh-38492
2023-11-22 09:38:09 +00:00
Moritz Halbritter b1da6f941f Merge branch '3.1.x' 2023-11-22 10:29:28 +01:00
Moritz Halbritter eddb17473b Fix deprecation clause on MongoPropertiesClientSettingsBuilderCustomizer 2023-11-22 10:29:12 +01:00
Moritz Halbritter cb4bfdab1d Merge pull request #38389 from izeye
* pr/38389:
  Polish

Closes gh-38389
2023-11-22 10:18:13 +01:00
Johnny Lim 175b6473c7 Polish
See gh-38389
2023-11-22 10:16:19 +01:00
Moritz Halbritter 9c43ed716a Merge pull request #38368 from pirgeo
* pr/38368:
  Update Dynatrace docs with info about the meter metadata toggle

Closes gh-38368
2023-11-22 10:14:37 +01:00
Georg Pirklbauer 969e142c34 Update Dynatrace docs with info about the meter metadata toggle
See gh-38368
2023-11-22 10:14:25 +01:00
Andy Wilkinson bcaa3fe046 Merge branch '3.1.x' 2023-11-22 08:30:00 +00:00
Andy Wilkinson d7202b4fda Merge branch '3.0.x' into 3.1.x 2023-11-22 08:29:45 +00:00
Andy Wilkinson 0e36411c5a Merge branch '2.7.x' into 3.0.x 2023-11-22 08:29:09 +00:00
Andy Wilkinson b473ffdea2 Upgrade to Spring Integration 5.5.20
Closes gh-38491
2023-11-22 08:28:52 +00:00
Scott Frederick 5d06ee5370 Merge branch '3.1.x'
Closes gh-38487
2023-11-21 18:02:58 -06:00
Scott Frederick d433deb737 Merge branch '3.0.x' into 3.1.x
Closes gh-38485
2023-11-21 17:30:54 -06:00
Scott Frederick dabcebf8a3 Merge branch '2.7.x' into 3.0.x
Closes gh-38484
2023-11-21 17:30:07 -06:00
Scott Frederick d1cce0f8ef Upgrade default CNB builders to Paketo Jammy
Closes gh-38477
2023-11-21 17:22:32 -06:00
Phillip Webb f37d6c9294 Upgrade to WebJars Locator Core 0.55
Closes gh-38481
2023-11-21 12:20:06 -08:00