Commit Graph

18320 Commits

Author SHA1 Message Date
Andy Wilkinson a6271927b2 Merge branch '2.7.x'
Closes gh-31985
2022-08-04 11:47:31 +01:00
Andy Wilkinson 8d93040c59 Merge branch '2.6.x' into 2.7.x
Closes gh-31984
2022-08-04 11:46:56 +01:00
Andy Wilkinson 7c0ccdf78c Log allocated port when Livereload server is using an ephemeral port
Closes gh-31983
2022-08-04 11:45:39 +01:00
Andy Wilkinson 74283c3549 Merge branch '2.7.x'
Closes gh-31977
2022-08-03 19:42:46 +01:00
Andy Wilkinson f6ce25f9c5 Merge branch '2.6.x' into 2.7.x
Closes gh-31976
2022-08-03 19:42:34 +01:00
Andy Wilkinson c500d8e784 Note need to record req start time to use %D with Undertow access log
Closes gh-31103
2022-08-03 19:42:19 +01:00
Andy Wilkinson ae86707bca Merge branch '2.7.x'
Closes gh-31975
2022-08-03 19:34:32 +01:00
Andy Wilkinson 3e6b4e68ad Merge branch '2.6.x' into 2.7.x
Closes gh-31974
2022-08-03 19:34:15 +01:00
Andy Wilkinson 591cd0feb3 Mention TLS-terminating proxy as a usecase for h2c
Closes gh-25855
2022-08-03 19:33:34 +01:00
Phillip Webb dd87cf47a4 Revert SpringBootContextLoader and ErrorPageFilterIntegrationTests changes"
Spring Framework has change the signature so we no longer need the updates.
2022-08-03 15:43:57 +01:00
Andy Wilkinson 2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2022-08-03 15:20:34 +01:00
Andy Wilkinson 700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Andy Wilkinson cb18eb095b Make transitive runtime dependencies available to AOT processing
Closes gh-31970
2022-08-03 13:54:50 +01:00
Phillip Webb 080ce92ac8 Adapt ErrorPageFilterIntegrationTests to upstream Framework changes 2022-08-03 13:09:19 +01:00
Phillip Webb db21bafd68 Merge branch '2.7.x'
Closes gh-31968
2022-08-03 12:35:02 +01:00
Phillip Webb cfde1878dd Merge branch '2.6.x' into 2.7.x
Closes gh-31967
2022-08-03 12:34:52 +01:00
Phillip Webb d540eefce0 Set running to false when stop method is called
Update `WebServerStartStopLifecycle` to change the `running` state when
the `stop()` method is called.

Fixes gh-31966
2022-08-03 12:34:37 +01:00
Phillip Webb 2dae04b2f4 Adapt SpringBootContextLoader to upstream Spring Framework changes 2022-08-03 12:27:30 +01:00
Phillip Webb 040ab4da5b Merge branch '2.7.x'
Closes gh-31964
2022-08-03 11:35:33 +01:00
Phillip Webb c652d3d95b Merge branch '2.6.x' into 2.7.x
Closes gh-31963
2022-08-03 11:34:24 +01:00
Phillip Webb 45ad1557c3 Perform LoggingSystem cleanup after web server shutdown
Update `LoggingApplicationListener` so that logging system cleanup is
performed by a `SmartLifecycle` phased after web server shutdown.

Prior to this commit, cleanup occurred on the `ContextClosedEvent` which
was published before Lifecycle beans were stopped. This meant that any
exceptions output during web server shutdown were not logged.

Fixes gh-9457
2022-08-03 11:34:05 +01:00
Johnny Lim 6a4681baf5 Polish
See gh-31948
2022-08-02 15:14:23 +02:00
Stephane Nicoll c05d0c51b7 Restore constructor binding support with AOT
This commit restores the generation of the BindMethod attribute that
is required at runtime to figure out how to bind a particular
configuration properties target.

It also improves the test to use TestCompiler and assert that the
generated contribution restores the proper behavior for both java
bean and value object binding.

Closes gh-31956
2022-08-02 15:08:48 +02:00
Brian Clozel a8c558a671 Fix build after Spring Framework deprecation
See spring-projects/spring-framework#28905
2022-08-02 15:03:13 +02:00
Brian Clozel 09c753d445 Remove duplicate reflection hints for Logback
Prior to this commit, the Spring Boot team contributed reflection hints
for the default Logback converters for native image compilation. Now
that some of those hints were contributed to the GraalVM reachability
metadata repository, we can safely remove the duplicates.

Closes gh-31959
2022-08-02 14:39:42 +02:00
Moritz Halbritter eaf8683e8d Fix timeunit in ZipkinConfigurations to milliseconds instead of seconds
Closes gh-31957
2022-08-02 13:40:00 +02:00
Moritz Halbritter 767631e2cc Fix bean chicken and egg problem with WavefrontSender
Closes gh-31954
2022-08-02 11:19:24 +02:00
Andy Wilkinson 0857cae943 Merge branch '2.7.x'
Closes gh-31952
2022-08-01 21:10:36 +01:00
Andy Wilkinson 0dde4278db Merge branch '2.6.x' into 2.7.x
Closes gh-31951
2022-08-01 21:09:37 +01:00
Marc Wrobel 3e0665e791 Fix links in documentations
- Fix broken links
- Use HTTPS where possible,
- Remove spring-security-oauth2-docs as it is no longer used
- Remove https://github.com/ThierrySquirrel/rocketmq-spring-boot-starter.
  This starter is 404 and https://github.com/rocketmq/rocketmq-spring-boot-starter
  hasn't been updated for 4 years.
- Clean up nohttp allowlist.lines.

See gh-31887
2022-08-01 21:07:36 +01:00
Andy Wilkinson 8a2cdb9759 Merge branch '2.7.x'
Closes gh-31950
2022-08-01 20:51:40 +01:00
Andy Wilkinson 012fbb3a57 Merge branch '2.6.x' into 2.7.x
Closes gh-31949
2022-08-01 20:51:18 +01:00
Andy Wilkinson c0daede1aa Ensure that jarmode jar added to an app has same SHA as published jar
Closes gh-31862
2022-08-01 20:49:10 +01:00
Brian Clozel 5261e42dab Fix PDF reference docs generation
See gh-31809
2022-08-01 16:17:35 +02:00
Brian Clozel cbf1cd81e9 Polish
See gh-31809
2022-08-01 15:57:32 +02:00
Brian Clozel 184945ab1e Fix graphql imports in reference docs generation
See gh-31809
2022-08-01 15:27:36 +02:00
Moritz Halbritter ed1f6ad543 Add native-image support for RestTemplateBuilder
Closes gh-31888
2022-08-01 15:18:25 +02:00
Brian Clozel 38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Brian Clozel 6e1b68044d Upgrade to GraphQL Java 18.3
Closes gh-31945
2022-08-01 14:32:27 +02:00
Phillip Webb ab469e8b6a Merge branch '2.7.x'
Closes gh-31944
2022-08-01 12:35:42 +01:00
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
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
aoyvx abe938eb2c Use Bean ClassLoader consistently to resolve class names
See gh-31798
2022-07-20 09:45:33 +02:00
Stephane Nicoll b9cf951423 Upgrade to Spring Integration 5.5.14
Closes gh-31800
2022-07-20 09:16:59 +02:00
Stephane Nicoll ac65835103 Upgrade to Spring Integration 5.5.14
Closes gh-31799
2022-07-20 09:16:17 +02:00
Moritz Halbritter c67876f913 Add resource hints for schema and data scripts
This only registers the default locations, not the one users can provide
via 'spring.sql.init.schema-locations' and
'spring.sql.init.data-locations'.

Closes gh-31533
2022-07-20 09:15:50 +02:00
Andy Wilkinson f29eed89ca Reinstate merge of pull request #31713 from dreis2211
This reverts commit 8deef6cb42.
2022-07-19 19:57:24 +01:00
Andy Wilkinson 62ec5c19de Remove temporary workaround for deprecations in Spring Batch
TaskExecutorJobLauncher has been improved so that its inherited
methods are no longer deprecated.

See gh-31623 and b599bfe5ac
2022-07-19 17:59:58 +01:00
Andy Wilkinson 8deef6cb42 Revert "Merge pull request #31713 from dreis2211"
This reverts commit 590bfd8a5c, reversing
changes made to 993e1bf5f2.
2022-07-19 17:29:14 +01:00
Andy Wilkinson 0f7079a05a Add missing auto-config to Elasticsearch reactive repo tests
See 5c057a2730
2022-07-19 17:16:30 +01:00
Brian Clozel 7c7a32a568 Auto-configure GraphQL subscription exception handling
Closes gh-31794
2022-07-19 16:53:11 +02:00
Moritz Halbritter 5030cfedcc Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"
This reverts commit 04391275c1.
2022-07-19 16:33:35 +02:00
Moritz Halbritter e35140d54f Add tests for SpringApplicationRuntimeHints 2022-07-19 16:29:25 +02:00
Andy Wilkinson 5c057a2730 Auto-configure the new Elasticsearch clients
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.

As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.

Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Moritz Halbritter f9ccfc1e12 Register Encoding on ReflectionHints for binding
Closes gh-31528
2022-07-19 16:22:08 +02:00
Moritz Halbritter 750e0aa293 Rename ConfigurationPropertiesReflectionHintsRegistrar 2022-07-19 16:22:08 +02:00