root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
39,073 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

18179 Commits

Author SHA1 Message Date
Phillip Webb 06b537e2a0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31943
 2022-08-01 12:35:23 +01:00
vilmos 00be9e4e94 Fix property placeholder references in @Value example 
See gh-31941
 2022-08-01 12:34:00 +01:00
Johnny Lim c9c435cdae Polish DataSourceBuilder.derivedFrom() 
Fix duplication accidentally introduced in commit
fa43e1f378.

See gh-31928
 2022-08-01 08:48:40 +01:00
Andy Wilkinson bdebdb5cc2 Start building against Spring Kafka 3.0.0-M6 snapshots 
See gh-31925
 2022-07-29 19:56:50 +01:00
Madhura Bhave a82b95c955 Merge branch '2.7.x' into main 
Closes gh-31927
 2022-07-29 11:33:41 -07:00
Madhura Bhave 2884ec81e9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31926
 2022-07-29 11:33:17 -07:00
Madhura Bhave cc15eb0b96 Configure existing probes at additional path when necessary 
Fixes gh-30612
 2022-07-29 11:31:19 -07:00
Stephane Nicoll db0e008c01 Register composed annotations explicitly 
Closes gh-31919
 2022-07-29 16:41:50 +02:00
Stephane Nicoll 0e9f8a5994 Merge branch '2.7.x' 
Closes gh-31922
 2022-07-29 14:47:20 +02:00
Stephane Nicoll 4806881716 Merge branch '2.6.x' into 2.7.x 
Closes gh-31921
 2022-07-29 14:35:15 +02:00
Stephane Nicoll 3a5b40645a Restore support for C3P0 
Closes gh-31920
 2022-07-29 14:07:59 +02:00
Phillip Webb 22144987e9 Update copyright year of changed files 2022-07-29 12:10:03 +01:00
Phillip Webb e08c16dfd6 Polish 2022-07-29 12:10:02 +01:00
Stephane Nicoll 41e8697445 Polish 2022-07-29 10:00:54 +02:00
Andy Wilkinson 44beb11d38 Merge branch '2.7.x' 
Closes gh-31915
 2022-07-29 07:06:30 +01:00
Andy Wilkinson 6d279abe21 Merge branch '2.6.x' into 2.7.x 
Closes gh-31914
 2022-07-29 07:06:09 +01:00
Andy Wilkinson d39e146a7d Polish "Allow config prop annotation processor to find reactive cookie props" 
See gh-31912
 2022-07-29 07:05:21 +01:00
Kalpesh 1f0d5f1130 Allow config prop annotation processor to find reactive cookie props 
See gh-31912
 2022-07-29 07:05:21 +01:00
Stephane Nicoll da324c8b03 Merge branch '2.7.x' 2022-07-28 16:07:26 +02:00
Stephane Nicoll 6786659aae Merge branch '2.6.x' into 2.7.x 2022-07-28 16:07:18 +02:00
Stephane Nicoll 7d860df5f0 Polish 2022-07-28 16:05:16 +02:00
Stephane Nicoll b0bc7cd85b Reuse JavaProcessExecutor 
See gh-31682
 2022-07-28 16:00:06 +02:00
Stephane Nicoll c3ae6519f4 Reuse SpringApplicationClassFinder 
See gh-31682
 2022-07-28 16:00:05 +02:00
Stephane Nicoll 472b0b8bcb Remove AbstractApplicationRunMojo intermediate layer 
This commit reverts the intermediate layer that was created to
accommodate with the AOT use case.

See gh-31682
 2022-07-28 16:00:05 +02:00
Stephane Nicoll 6f8b9288f3 Extract AotGenerateMojo to its own structure 
This commit stops AotGenerateMojo from being an extension of the
regular run infrastructure and used the opportunity to extract a
number of utility classes to run a Java process.

As a result, not all features of running an application is supported
and exposed options now are targeted against AOT.

See gh-31682
 2022-07-28 16:00:05 +02:00
Andy Wilkinson 197b4eede0 Merge branch '2.7.x' 
Closes gh-31907
 2022-07-28 14:50:24 +01:00
Andy Wilkinson 4f0dac7601 Merge branch '2.6.x' into 2.7.x 
Closes gh-31906
 2022-07-28 14:50:00 +01:00
Andy Wilkinson 348b2c28e9 Improve logging of changes that trigger a DevTools upload or restart 
Closes gh-31579
 2022-07-28 14:13:23 +01:00
Phillip Webb c8735c1540 Remove spring.profiles metadata 
See gh-22523
 2022-07-28 10:46:46 +01:00
Phillip Webb 49a8e81dc3 Merge branch '2.7.x' 
Closes gh-31902
 2022-07-28 10:44:57 +01:00
Phillip Webb 5c52882f76 Merge branch '2.6.x' into 2.7.x 
Closes gh-31901
 2022-07-28 10:44:42 +01:00
Phillip Webb 9a2ad6d42d Remove references to ConfigFileApplicationListener 
Update documentation and meta-data to remove referenced to the now
deprecated `ConfigFileApplicationListener` class.

Closes gh-31895
 2022-07-28 10:43:48 +01:00
Phillip Webb 7b2bacb272 Merge branch '2.7.x' 
Closes gh-31900
 2022-07-28 10:37:15 +01:00
Phillip Webb 220c588996 Merge branch '2.6.x' into 2.7.x 
Closes gh-31899
 2022-07-28 10:37:00 +01:00
Phillip Webb 98627e3d71 Fix spring.beaninfo.ignore SourceType 
Fixes gh-31898
 2022-07-28 10:36:19 +01:00
Phillip Webb 57e967576e Adapt to upstream Spring Framework AOT changes 2022-07-27 21:44:18 +01:00
Phillip Webb b68e43f5fd Merge branch '2.7.x' 2022-07-27 19:23:05 +01:00
Phillip Webb 2382e8322b Merge branch '2.6.x' into 2.7.x 2022-07-27 19:22:45 +01:00
Phillip Webb 2709f77ab9 Collect to named contributors to `LinkedHashMap` 
Update `NamedContributorsMapAdapter` to collect items to a
`LinkedHashMap` rather than a `HashMap`.

See gh-31676
 2022-07-27 18:46:42 +01:00
Andy Wilkinson a4bafa88bc Disable schema validation when testing against Hazelcast 3 
We have hazelcast configuration files that are used with multiple
versions of Hazelcast. Version 3's scheme doesn't allow us to set
<auto-detection enabled="false" />. To work around this, we
configure a system property that causes Hazelcast to disable schema
validation.

See gh-38163
 2022-07-27 18:29:54 +01:00
Stephane Nicoll 204354e8ab Merge branch '2.7.x' 
Closes gh-31894
 2022-07-27 18:32:38 +02:00
Stephane Nicoll 04cb239296 Merge branch '2.6.x' into 2.7.x 
Closes gh-31893
 2022-07-27 18:32:28 +02:00
Stephane Nicoll 9184d5483a Remove reference to nitrite-spring-boot-starter 
Closes gh-31892
 2022-07-27 18:32:19 +02:00
Stephane Nicoll 76376d8822 Merge branch '2.7.x' 
Closes gh-31891
 2022-07-27 18:29:17 +02:00
Stephane Nicoll 344afd81de Merge branch '2.6.x' into 2.7.x 
Closes gh-31890
 2022-07-27 18:29:07 +02:00
Stephane Nicoll e6a9e48c54 Remove reference to Azure Application Insights 
Closes gh-31889
 2022-07-27 18:28:52 +02:00
Stephane Nicoll fdb1ee5f97 Adapt to deprecations in Spring Framework 
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
 2022-07-27 18:18:09 +02:00
Stephane Nicoll aac3ccf59c Adapt to deprecations in Spring Framework 
See https://github.com/spring-projects/spring-framework/issues/27780
 2022-07-27 17:47:02 +02:00
Andy Wilkinson ac1203551c Start building against Spring AMQP 3.0.0-M4 snapshots 
See gh-31861
 2022-07-27 15:55:42 +01:00
Stephane Nicoll c413f9adbe Merge branch '2.7.x' 
Closes gh-31884
 2022-07-27 09:23:39 +02:00
Stephane Nicoll 53a652ec65 Merge branch '2.6.x' into 2.7.x 
Closes gh-31883
 2022-07-27 09:23:05 +02:00
Stephane Nicoll 9cb614c626 Migrate Hazelcast 3 sanity tests to Hazelcast 4 
Closes gh-31881
 2022-07-27 09:09:35 +02:00
Stephane Nicoll 59139e632b Polish "Disable auto-detection in tests that start Hazelcast" 
See gh-31863
 2022-07-27 08:30:17 +02:00
Adrian Bob aad9c8906a Disable auto-detection in tests that start Hazelcast 
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
 2022-07-27 08:16:48 +02:00
Stephane Nicoll 782e3f75b6 Polish Hazelcast configuration 
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
 2022-07-27 08:15:53 +02:00
Madhura Bhave aac1829106 Make Batch auto-configuration back-off is spring-jdbc isn't present 
See gh-29487
 2022-07-26 15:11:00 -07:00
Madhura Bhave 2804c84648 Adapt to spring-jdbc being required by Spring Batch 
Closes gh-29487
 2022-07-26 14:03:22 -07:00
Phillip Webb 94ca5b5b53 Merge branch '2.7.x' 
Closes gh-31880
 2022-07-26 18:16:44 +01:00
Phillip Webb bfc703a40d Merge branch '2.6.x' into 2.7.x 
Closes gh-31879
 2022-07-26 18:16:13 +01:00
Phillip Webb 59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction" 
See gh-31676
 2022-07-26 18:15:32 +01:00
Guirong Hu c530f12cc3 Call the value adapter during NamedContributorsMapAdapter construction 
Update `NamedContributorsMapAdapter` so that the adapter function is
called only once per entry. Prior to this commit, the adapter was called
dynamically which made `CompositeHealthContributor` behave differently
from a regular `HealthContributor`.

See gh-31676
 2022-07-26 18:15:32 +01:00
Andy Wilkinson 17aa5d2d23 Merge branch '2.7.x' 
Closes gh-31878
 2022-07-26 17:58:40 +01:00
Andy Wilkinson 3a9525b5b7 Merge branch '2.6.x' into 2.7.x 
Closes gh-31877
 2022-07-26 17:58:12 +01:00
Andy Wilkinson 5243cb8369 Broaded dependency management for REST Assured 
Closes gh-31864
 2022-07-26 17:54:47 +01:00
Phillip Webb 35a65cf82e Merge branch '2.7.x' 
Closes gh-31876
 2022-07-26 17:48:00 +01:00
Phillip Webb fd076ab9ef Merge branch '2.6.x' into 2.7.x 
Closes gh-31875
 2022-07-26 17:46:20 +01:00
aoyvx 8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset 
See gh-31870
 2022-07-26 17:20:55 +01:00
Stephane Nicoll 193c1d7acf Adapt to changes in DefaultGenerationContext 
See https://github.com/spring-projects/spring-framework/issues/28877
 2022-07-26 18:06:46 +02:00
Phillip Webb d6cce1f441 Merge branch '2.7.x' 2022-07-26 16:14:34 +01:00
Phillip Webb fcf12686b7 Merge branch '2.6.x' into 2.7.x 2022-07-26 16:14:18 +01:00
Phillip Webb 9329acdad8 Reduce size of 'repeated-open-array.txt' file 
Attempt to fix CI memory issues.
 2022-07-26 16:13:44 +01:00
Phillip Webb e08aa84892 Merge branch '2.7.x' 2022-07-26 15:53:33 +01:00
Phillip Webb 96fa4cd63c Merge branch '2.6.x' into 2.7.x 2022-07-26 15:53:17 +01:00
Phillip Webb da91cde304 Protect against deeply nested JSON maps 
See gh-31868
 2022-07-26 15:52:57 +01:00
Phillip Webb a7ea5dfeda Merge branch '2.7.x' 
Closes gh-31874
 2022-07-26 15:52:33 +01:00
Phillip Webb 06805f06af Merge branch '2.6.x' into 2.7.x 
Closes gh-31873
 2022-07-26 15:52:12 +01:00
Phillip Webb 4132414206 Protect against deeply malformed JSON map keys 
Fixes gh-31869
 2022-07-26 15:47:50 +01:00
Phillip Webb 0b1441f119 Merge branch '2.7.x' 
Closes gh-31872
 2022-07-26 15:38:25 +01:00
Phillip Webb 466724f77a Merge branch '2.6.x' into 2.7.x 
Closes gh-31871
 2022-07-26 15:37:41 +01:00
Phillip Webb 6966ebd2a3 Protect against deeply nested JSON lists 
Update `BasicJsonParser` to protect against deeply nested JSON lists
in the same way as Jackson.

Fixes gh-31868
 2022-07-26 15:25:38 +01:00
Phillip Webb 7377d85096 Merge branch '2.7.x' 
Closes gh-31866
 2022-07-26 12:18:14 +01:00
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x 
Closes gh-31865
 2022-07-26 12:13:16 +01:00
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation" 
See gh-31734
 2022-07-26 12:08:30 +01:00
Marc Wrobel dbfc6bded4 Fix typos in code and documentation 
See gh-31734
 2022-07-26 12:08:07 +01:00
Phillip Webb b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +01:00
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb 4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Stephane Nicoll a0dd6ef3b1 Revert "Merge pull request #31828 from quaff" 
This reverts commit 68fc87bc7f.

See gh-31828
 2022-07-25 16:16:51 +02:00
Moritz Halbritter 24cf5fff84 Start building against Spring HATEOAS 2.0.0-SNAPSHOT 
See gh-31855
 2022-07-25 09:34:33 +02:00
Andy Wilkinson b9b25644af Polish "Take MethodType into account to deduce main application class" 
See gh-31828
 2022-07-22 19:39:14 +01:00
Yanming Zhou 10a2471979 Take MethodType into account to deduce main application class 
See gh-31828
 2022-07-22 19:36:30 +01:00
dreis2211 75f375c68e Align Kotlin API and language versions 
See gh-31849
 2022-07-22 19:34:41 +01:00
Stephane Nicoll f962f2a430 Configure NBT so that it works consistently 
This commit configures the Native Build Tools plugin to use Maven's
`target/classes` rather than the default generated JAR of the project.
Previously, this would fail with the default repackage option as the
default JAR is the repackaged archive and it has a specific format that
NBT can't understand.

Closes gh-31848
 2022-07-22 17:36:25 +02:00
Andy Wilkinson 85c41d6698 Merge branch '2.7.x' 
Closes gh-31847
 2022-07-22 14:48:29 +01:00
Andy Wilkinson ac3f552dde Merge branch '2.6.x' into 2.7.x 
Closes gh-31846
 2022-07-22 14:47:45 +01:00
dreis2211 de5834d203 Polish 
See gh-31845
 2022-07-22 14:46:01 +01:00
Andy Wilkinson 6c28156b29 Avoid config-time creation of AOT source set's tasks 
Closes gh-31844
 2022-07-22 14:14:03 +01:00
Andy Wilkinson 0980362a88 Merge branch '2.7.x' 
Closes gh-31843
 2022-07-22 12:20:17 +01:00
Andy Wilkinson 64dcfe520d Merge branch '2.6.x' into 2.7.x 
Closes gh-31842
 2022-07-22 12:15:39 +01:00
Andy Wilkinson a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files 
Closes gh-31575
 2022-07-22 12:09:58 +01:00