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,018 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

18134 Commits

Author SHA1 Message Date
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
Moritz Halbritter 35c49afd97 Generate hints for nested generics in configuration properties 
See gh-31708
 2022-07-21 16:32:40 +02:00
Olga Maciaszek-Sharma 57dc274284 Switch to Spring Framework SNAPSHOTs 
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
 2022-07-21 13:42:48 +01:00
Stephane Nicoll e18398236f Upgrade to Maven Install Plugin 3.0.0 
Closes gh-31833
 2022-07-21 08:04:30 +02:00
Stephane Nicoll a98c30866a Upgrade to Maven Deploy Plugin 3.0.0 
Closes gh-31832
 2022-07-21 08:04:27 +02:00
Stephane Nicoll aa93b2153a Upgrade to Embedded Mongo 3.4.7 
Closes gh-31830
 2022-07-21 07:50:49 +02:00
Stephane Nicoll 939481b9d7 Upgrade to Spring Batch 5.0.0-M4 
Closes gh-31623
 2022-07-21 07:43:45 +02:00
Stephane Nicoll dfda08fd0d Upgrade to Spring Integration 6.0.0-M4 
Closes gh-31624
 2022-07-21 07:43:24 +02:00
Madhura Bhave 4057dd198b Change preference of session store implementations 
The order has been determined based on usage statistics.

Closes gh-27756
 2022-07-20 15:36:52 -07:00
Scott Frederick 6f65777035 Merge branch '2.7.x' 
Closes gh-31827
 2022-07-20 17:31:37 -05:00
Scott Frederick 9da38c8d2d Merge branch '2.6.x' into 2.7.x 
Closes gh-31826
 2022-07-20 17:29:58 -05:00
Scott Frederick 4e0b3aad9f Clarify how docker image publishing registry is determined 
Closes gh-31820
 2022-07-20 17:29:40 -05:00
Scott Frederick cf7a163c6d Merge branch '2.7.x' 2022-07-20 16:07:32 -05:00
Scott Frederick f9cf31e59e Fix compile errors 
See gh-28844
 2022-07-20 16:07:19 -05:00
Scott Frederick 36d6106bb0 Merge branch '2.7.x' 
Closes gh-31825
 2022-07-20 15:11:30 -05:00
Scott Frederick 09c7ce6dab Merge branch '2.6.x' into 2.7.x 
Closes gh-31824
 2022-07-20 15:10:43 -05:00
Scott Frederick a7dfeae09c Merge branch 'gh-28844' into 2.6.x 
Closes gh-31823
 2022-07-20 15:10:27 -05:00
Scott Frederick 9b0cdac58a Simplify support for pushing images to unauthenticated registries 
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
 2022-07-20 15:06:05 -05:00
Andy Wilkinson de672f4330 Merge branch '2.7.x' 
Closes gh-31819
 2022-07-20 21:02:06 +01:00
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x 
Closes gh-31818
 2022-07-20 21:01:47 +01:00
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps 
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
 2022-07-20 20:52:02 +01:00
Andy Wilkinson 818e0d69a5 Merge branch '2.7.x' 
Closes gh-31815
 2022-07-20 19:26:42 +01:00
Andy Wilkinson cd1ce50105 Merge branch '2.6.x' into 2.7.x 
Closes gh-31814
 2022-07-20 19:24:38 +01:00
Andy Wilkinson 182adeed35 Add modules to dependency management for Derby 
Closes gh-31570
 2022-07-20 19:23:50 +01:00
Moritz Halbritter a4e84c26f0 Revert "Fix nested type discovery in ConfigurationPropertiesReflectionHintsProcessor" 
This reverts commit 785588826e.
 2022-07-20 18:04:13 +02:00
Brian Clozel 53b9ff5e89 Upgrade to Spring for GraphQL 1.0.1 
Closes gh-31616
 2022-07-20 17:37:41 +02:00
Brian Clozel 8cb2a0de94 Upgrade to GraphQL Java 18.2 
Closes gh-31812
 2022-07-20 17:36:45 +02:00
Andy Wilkinson 4bd82bb5af Polish "Upgrade to Flyway 9.0.1" 
See gh-31723
 2022-07-20 15:44:01 +01:00
Vedran Pavic f1bf80f5e1 Upgrade to Flyway 9.0.1 
See gh-31723
 2022-07-20 15:44:00 +01:00
Moritz Halbritter 785588826e Fix nested type discovery in ConfigurationPropertiesReflectionHintsProcessor 
The old implementation picked up nested types only if they have been
annotated with NestedConfigurationProperty, which not all nested
properties are. Now the processor takes into account all referenced
types. It ignores only types in the java package and interfaces.

This commit also moves some of the tests from
ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests to
ConfigurationPropertiesReflectionHintsProcessorTests for easier
discoverability

Closes gh-31708
 2022-07-20 16:39:28 +02:00
Andy Wilkinson 38fedcff34 Polish "Use StackWalker to deduce main application class" 
See gh-31701
 2022-07-20 14:57:43 +01:00
GGGGGHT ea3fe95881 Use StackWalker to deduce main application class 
See gh-31701
 2022-07-20 12:37:11 +01:00
Andy Wilkinson 2814175505 Polish "Add auto-configuration for JdkClientHttpConnector" 
See gh-31709
 2022-07-20 12:18:50 +01:00
lihan e16734f937 Add auto-configuration for JdkClientHttpConnector 
See gh-31709
 2022-07-20 12:16:14 +01:00
Andy Wilkinson c3f3a2a707 Merge branch '2.6.x' into 2.7.x 
Closes gh-31810
 2022-07-20 11:54:01 +01:00
Andy Wilkinson efdd844c7a Log a warning if determining the app's PID takes too long 
Closes gh-31572
 2022-07-20 11:53:12 +01:00
Andy Wilkinson 1acc7857e6 Merge branch '2.7.x' 
Closes gh-31807
 2022-07-20 10:52:30 +01:00
Andy Wilkinson 84efc89d76 Merge branch '2.6.x' into 2.7.x 
Closes gh-31806
 2022-07-20 10:52:00 +01:00
Andy Wilkinson bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function 
Closes gh-31784
 2022-07-20 10:42:56 +01:00
Andy Wilkinson 18d3d4de5d Merge branch '2.7.x' 
Closes gh-31805
 2022-07-20 10:17:56 +01:00
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x 
Closes gh-31804
 2022-07-20 10:17:39 +01:00
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy 
Closes gh-31718
 2022-07-20 10:15:52 +01:00
Andy Wilkinson 6da8c88b2b Include library resources on classpath of AOT source generation 
Closes gh-31803
 2022-07-20 10:07:02 +01:00
Stephane Nicoll c31ad5f175 Merge branch '2.7.x' 
Closes gh-31802
 2022-07-20 09:52:51 +02:00
Stephane Nicoll 6469a02c35 Merge branch '2.6.x' into 2.7.x 
Closes gh-31801
 2022-07-20 09:52:41 +02:00
Stephane Nicoll 585a57be76 Update copyright year of changed file 
See gh-31798
 2022-07-20 09:45:57 +02:00