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

11882 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