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

11932 Commits

Author SHA1 Message Date
Phillip Webb 66598ed4ad Merge branch '2.4.x' 2021-01-11 16:42:17 -08:00
Phillip Webb bd21c43d71 Simplify resource registration 
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
 2021-01-11 16:40:42 -08:00
Phillip Webb e50d61a78d Start building against Spring Framework 5.3.3 snapshots 
See gh-24750
 2021-01-11 16:30:35 -08:00
Phillip Webb a8f291b252 Merge branch '2.4.x' 
Closes gh-24749
 2021-01-11 15:24:25 -08:00
Phillip Webb f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x 
Closes gh-24748
 2021-01-11 14:53:57 -08:00
Phillip Webb 72dd3b5628 Merge branch '2.2.x' into 2.3.x 
Closes gh-24747
 2021-01-11 14:21:56 -08:00
Phillip Webb f9e3e0d532 Register default resource path using a Resource 
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
 2021-01-11 14:20:46 -08:00
Phillip Webb 21a08ed37d Merge branch '2.4.x' 
Closes gh-24746
 2021-01-11 13:58:48 -08:00
Phillip Webb 53a6fa2fed Respect spring.dao.exceptiontranslation setting 
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.

Fixes gh-24321
 2021-01-11 13:57:47 -08:00
Phillip Webb 3fc1d319fe Merge branch '2.4.x' 2021-01-11 13:40:32 -08:00
Phillip Webb cff3e4c831 Fix tests following upstream framework changes 2021-01-11 13:39:21 -08:00
Phillip Webb 3301f6b6ee Merge branch '2.4.x' 2021-01-11 12:05:01 -08:00
Phillip Webb 039df1d96d Test spring.profiles.include in profile file 
Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.

See gh-24733
 2021-01-11 12:04:14 -08:00
Phillip Webb 26a68ca2cf Polish 2021-01-11 12:04:07 -08:00
Stephane Nicoll 7ad8646153 Merge branch '2.4.x' 
Closes gh-24740
 2021-01-11 16:34:50 +01:00
Stephane Nicoll 31de36565f Upgrade to Reactor 2020.0.3 
Closes gh-24698
 2021-01-11 16:29:13 +01:00
Stephane Nicoll 6bf74e5752 Polish 2021-01-11 14:39:56 +01:00
Stephane Nicoll 0897af0dfa Add customizer for jOOQ's configuration 
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.

Closes gh-24732
 2021-01-11 14:16:34 +01:00
Pascal Schumacher aa24f78d85 Polish "Add support for GET requests for /actuator/startup" 
See gh-24717
See gh-24734
 2021-01-11 13:11:26 +01:00
Andy Wilkinson f34eb86a21 Merge branch '2.4.x' 
Closes gh-24739
 2021-01-11 11:49:59 +00:00
Andy Wilkinson 5ae9fbedcd Merge branch '2.3.x' into 2.4.x 
Closes gh-24738
 2021-01-11 11:33:30 +00:00
Andy Wilkinson 7625a979db Configure bootRun to use project's Java toolchain by default 
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
 2021-01-11 11:21:53 +00:00
Andy Wilkinson f07e470765 Merge branch '2.4.x' 
Closes gh-24736
 2021-01-11 11:05:03 +00:00
Andy Wilkinson 3c3aa9e486 Merge branch '2.3.x' into 2.4.x 
Closes gh-24735
 2021-01-11 11:03:35 +00:00
Andy Wilkinson 064de4e073 Check configured JavaLauncher when determining version of the JVM 
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.

This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.

Fixes gh-24512
 2021-01-11 10:36:16 +00:00
Stephane Nicoll 097f878981 Upgrade to Kafka 2.6.1 
Closes gh-24247
 2021-01-11 09:20:59 +01:00
Stephane Nicoll 50019a7f44 Upgrade to Thymeleaf Layout Dialect 2.5.2 
Closes gh-24731
 2021-01-11 09:20:24 +01:00
Stephane Nicoll aad3de2ba7 Upgrade to Spring Retry 1.3.1 
Closes gh-24730
 2021-01-11 09:20:22 +01:00
Stephane Nicoll d7e6f963ab Upgrade to Netty 4.1.56.Final 
Closes gh-24729
 2021-01-11 09:20:20 +01:00
Stephane Nicoll 5f63b22286 Upgrade to Johnzon 1.2.9 
Closes gh-24728
 2021-01-11 09:20:19 +01:00
Stephane Nicoll 8867544d0d Upgrade to Jetty Reactive HTTPClient 1.1.5 
Closes gh-24727
 2021-01-11 09:20:17 +01:00
Stephane Nicoll fc6fa74691 Upgrade to Jackson Bom 2.11.4 
Closes gh-24726
 2021-01-11 09:20:16 +01:00
Stephane Nicoll d691d63b1e Upgrade to Hibernate Validator 6.1.7.Final 
Closes gh-24725
 2021-01-11 09:20:14 +01:00
Stephane Nicoll bc0a1ff852 Upgrade to Hibernate 5.4.27.Final 
Closes gh-24724
 2021-01-11 09:20:13 +01:00
Stephane Nicoll 487f694872 Upgrade to Dropwizard Metrics 4.1.17 
Closes gh-24723
 2021-01-11 09:20:11 +01:00
Stephane Nicoll a60b5e0f70 Upgrade to Byte Buddy 1.10.19 
Closes gh-24722
 2021-01-11 09:20:10 +01:00
Stephane Nicoll 180493422d Upgrade to AppEngine SDK 1.9.84 
Closes gh-24721
 2021-01-11 09:20:08 +01:00
Stephane Nicoll 632c1239e6 Polish "Add support for GET requests for /actuator/startup" 
See gh-24717
 2021-01-11 09:12:53 +01:00
bono007 4b8d6efc12 Add support for GET requests for /actuator/startup 
See gh-24717
 2021-01-11 08:49:06 +01:00
Stephane Nicoll 8a6e79dc8b Configure Couchbase to use the application's ObjectMapper 
Closes gh-24616
 2021-01-10 10:10:42 +01:00
Andy Wilkinson 45f298bc7a Merge branch '2.4.x' 
Closes gh-24711
 2021-01-08 17:08:52 +00:00
Andy Wilkinson 9e389c8376 Merge branch '2.3.x' into 2.4.x 
Closes gh-24710
 2021-01-08 17:07:45 +00:00
Andy Wilkinson 5ad4d627fd Fix classpath index so entries match those expected by the launcher 
This reverts commit ad164269e9 and adds
some additional tests.

Fixes gh-24192
 2021-01-08 15:32:19 +00:00
Stephane Nicoll 1d30a4716e Merge branch '2.4.x' 
Closes gh-24708
 2021-01-08 15:54:36 +01:00
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x 
Closes gh-24707
 2021-01-08 15:53:53 +01:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide 
Closes gh-24705
 2021-01-08 15:50:16 +01:00
Stephane Nicoll 40f1f9a25c Start building against Spring Kafka 2.6.5 snapshots 
See gh-24703
 2021-01-08 09:24:42 +01:00
Stephane Nicoll a27b87a118 Start building against Spring AMQP 2.3.3 snapshots 
See gh-24702
 2021-01-08 09:23:34 +01:00
Stephane Nicoll 0bfb072467 Start building against Spring Integration 5.4.3 snapshots 
See gh-24701
 2021-01-08 09:22:59 +01:00
Stephane Nicoll 5bfc0285c6 Start building against Spring Data 2020.0.3 snapshots 
See gh-24700
 2021-01-08 09:22:03 +01:00
Stephane Nicoll 11d20eba82 Start building against Spring Framework 5.3.3 snapshots 
See gh-24699
 2021-01-08 08:36:21 +01:00
Stephane Nicoll 9f70b71036 Start building against Reactor 2020.0.3 snapshots 
See gh-24698
 2021-01-08 08:35:34 +01:00
Scott Frederick c82165694d Merge branch '2.4.x' 
Closes gh-24690
 2021-01-07 16:00:03 -06:00
Scott Frederick 210438ee5b Merge branch '2.3.x' into 2.4.x 
Closes gh-24689
 2021-01-07 15:59:37 -06:00
Scott Frederick a302238e21 Remove layout parameters from build-image Maven goal 
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
 2021-01-07 15:59:02 -06:00
Scott Frederick bd4c6e51fa Merge branch '2.4.x' 
Closes gh-24687
 2021-01-07 10:36:06 -06:00
Scott Frederick ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans 
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
 2021-01-07 10:29:13 -06:00
Phillip Webb bd027de736 Merge branch '2.4.x' 
Closes gh-24685
 2021-01-06 17:40:20 -08:00
asheCarry 17c0c7d9d6 Fix javadoc typo in ConfigDataLocation 
See gh-24660
 2021-01-06 17:39:39 -08:00
Phillip Webb fdeee9776e Merge branch '2.4.x' 
Closes gh-24684
 2021-01-06 17:31:09 -08:00
Phillip Webb 48661e79f5 Merge branch '2.3.x' into 2.4.x 
Closes gh-24683
 2021-01-06 17:30:55 -08:00
Phillip Webb 7cbd57b635 Log FailureAnalyzer errors at trace level 
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
 2021-01-06 17:29:24 -08:00
Phillip Webb 86bb3b7dcd Merge branch '2.4.x' 2021-01-06 17:02:13 -08:00
Phillip Webb 76aa33b65a Merge branch '2.3.x' into 2.4.x 2021-01-06 17:01:53 -08:00
Phillip Webb a24ec9d372 Merge branch '2.2.x' into 2.3.x 2021-01-06 17:01:22 -08:00
Phillip Webb 46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap 
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
 2021-01-06 16:58:05 -08:00
Phillip Webb 42e649debe Merge branch '2.4.x' 
Closes gh-24682
 2021-01-06 16:47:46 -08:00
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x 
Closes gh-24681
 2021-01-06 16:47:24 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x 
Closes gh-24680
 2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap 
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
 2021-01-06 16:45:10 -08:00
Madhura Bhave 012fb3d3b9 Merge branch '2.4.x' 
Closes gh-24679
 2021-01-06 16:44:58 -08:00
Madhura Bhave 920136d908 Merge branch '2.3.x' into 2.4.x 
Closes gh-24678
 2021-01-06 16:44:32 -08:00
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl 
Fixes gh-24168
 2021-01-06 16:42:09 -08:00
Phillip Webb cb0069f385 Merge branch '2.4.x' 
Closes gh-24674
 2021-01-06 13:32:09 -08:00
Phillip Webb 5b126b01c0 Replace binder as contributors are processed 
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.

Closes gh-24669
 2021-01-06 13:31:29 -08:00
Phillip Webb 45ca4a5a56 Merge branch '2.4.x' 
Closes gh-24673
 2021-01-06 12:34:13 -08:00
Phillip Webb ac4243d615 Merge branch '2.3.x' into 2.4.x 
Closes gh-24672
 2021-01-06 12:33:53 -08:00
Phillip Webb 52e47c4275 Fix test for JSR-350 @Nonnull 
Closes gh-24647
 2021-01-06 12:33:25 -08:00
Phillip Webb 2dfb9b0911 Merge branch '2.4.x' 
Closes gh-24671
 2021-01-06 12:24:05 -08:00
Phillip Webb 2b497b6aff Merge branch '2.3.x' into 2.4.x 
Closes gh-24670
 2021-01-06 12:23:45 -08:00
Phillip Webb 848ed65f5b Add test for JSR-350 @Nonnull 
Closes gh-24647
 2021-01-06 12:04:58 -08:00
Stephane Nicoll 2547a9e255 Merge branch '2.4.x' 
See gh-24655
 2021-01-06 14:24:34 +01:00
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x 
See gh-24647
 2021-01-06 14:24:13 +01:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference 
See gh-24647
 2021-01-06 14:23:38 +01:00
Stephane Nicoll b3278f459e Merge branch '2.4.x' 
See gh-24655
 2021-01-06 08:59:14 +01:00
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x 
See gh-24647
 2021-01-06 08:58:48 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide 
See gh-24647
 2021-01-06 08:58:13 +01:00
Phillip Webb 11c4ce2135 Merge branch '2.4.x' 
Closes gh-24658
 2021-01-05 16:03:23 -08:00
Phillip Webb c9f9246c59 Merge branch '2.3.x' into 2.4.x 
Closes gh-24657
 2021-01-05 16:03:01 -08:00
Phillip Webb 9b9c3edfcd Polish "Return -1 port for non-listening WebServers" 
See gh-24606
 2021-01-05 16:02:26 -08:00
Stefan Partusch 5c61df3131 Return -1 port for non-listening WebServers 
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
 2021-01-05 15:56:25 -08:00
Phillip Webb bd3dd0a526 Merge branch '2.4.x' 
Closes gh-24655
 2021-01-05 14:08:57 -08:00
Phillip Webb ab8080353e Merge branch '2.3.x' into 2.4.x 
Closes gh-24654
 2021-01-05 14:08:41 -08:00
Phillip Webb 2ad9a47d08 Support JSR-305 annotations on endpoint methods 
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
 2021-01-05 14:07:22 -08:00
Scott Frederick d0fba2473f Merge branch '2.4.x' 
Closes gh-24652
 2021-01-05 14:05:58 -06:00
Scott Frederick 505340909a Support symlinks in configtree property paths 
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.

Fixes gh-24530
 2021-01-05 14:04:59 -06:00
Madhura Bhave f8cc7180e5 Merge branch '2.4.x' 
Closes gh-24651
 2021-01-05 10:49:17 -08:00
Madhura Bhave 615a8ae56e Ignore documents that do not apply when checking mandatory locations 
Closes gh-24584
 2021-01-05 10:47:06 -08:00
Andy Wilkinson 77652961cd Merge branch '2.4.x' 
Closes gh-24650
 2021-01-05 17:13:45 +00:00
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x 
Closes gh-24649
 2021-01-05 17:13:30 +00:00