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

2316 Commits

Author SHA1 Message Date
Andy Wilkinson ebb99d1c20 Merge branch '2.0.x' 2018-06-04 19:38:53 +01:00
Andy Wilkinson 1a0dfa06ab Add log4j-jul to Log4j 2 starter 
Closes gh-12659
 2018-06-04 19:38:25 +01:00
Phillip Webb 1d35b629bb Merge branch '2.0.x' 2018-06-04 11:02:06 -07:00
Phillip Webb abe92eba2e Protect Inet test against "helpful" DNS resolvers 
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.

Closes gh-11897
 2018-06-04 10:50:36 -07:00
Brian Clozel bd8106d77f Upgrade to Spring Framework 5.1 
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.

Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.

See gh-13321
 2018-06-04 18:59:17 +02:00
Andy Wilkinson 0f321abe66 Merge branch '2.0.x' 2018-06-04 17:53:50 +01:00
Andy Wilkinson 70c0d6a005 Test the Gradle plugin against Gradle 4.8 
Closes gh-13359
 2018-06-04 17:53:34 +01:00
Andy Wilkinson 00449bef6a Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts 
Closes gh-12631
 2018-06-04 17:53:34 +01:00
Andy Wilkinson aee6aecfc2 Merge branch '2.0.x' 2018-06-04 17:06:23 +01:00
Andy Wilkinson 624946a779 Upgrade to Maven Invoker Plugin 3.1.0 
Closes gh-12687
 2018-06-04 17:05:22 +01:00
Stephane Nicoll 93396aef51 Polish 2018-06-04 17:50:29 +02:00
Andy Wilkinson b38f60a631 Merge branch '2.0.x' 2018-06-04 16:40:06 +01:00
Andy Wilkinson d54072e0a8 More accurately document buildInfo's effect on up-to-date checking 
Closes gh-13152
 2018-06-04 16:39:59 +01:00
Stephane Nicoll ee158df993 Merge branch '2.0.x' 2018-06-04 17:36:01 +02:00
Dmytro Nosan 20003489be Auto-configure jOOQ with TransactionListenerProvider 
Closes gh-13331
 2018-06-04 17:35:40 +02:00
Andy Wilkinson d0ce919d8c Merge branch '2.0.x' 2018-06-04 16:30:23 +01:00
Andy Wilkinson 0df37b917b Ignore unresolvable placeholders during property binding 
Closes gh-13122
 2018-06-04 16:27:30 +01:00
Andy Wilkinson 9c8d2c8016 Improve analysis of bind failures caused by a conversion failure 
Closes gh-13357
 2018-06-04 16:26:43 +01:00
Andy Wilkinson 92629ac5af Merge branch '2.0.x' 2018-06-04 15:43:58 +01:00
Andy Wilkinson ea51cfabca Avoid uri tag explosion when use of path variable is undetected 
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.

Closes gh-12447
 2018-06-04 15:43:48 +01:00
Stephane Nicoll 4a6102091e Merge branch '2.0.x' 2018-06-04 15:24:18 +02:00
Stephane Nicoll bc59434bcc Start building against Spring Framework 5.0.7 snapshots 
See gh-13353
 2018-06-04 15:21:46 +02:00
Stephane Nicoll 99f0270fce Merge branch '2.0.x' 2018-06-04 14:15:08 +02:00
Stephane Nicoll a9b2826c26 Merge branch '1.5.x' into 2.0.x 2018-06-04 14:14:52 +02:00
Stephane Nicoll 8bcea0d8cc Polish "Add auto-configuration for WebServiceTemplate" 
Closes gh-1270
 2018-06-04 12:27:29 +02:00
Stephane Nicoll ef9c1a8e35 Extract ClientHttpRequestFactory detection to its own class 
See gh-12707
 2018-06-04 11:12:02 +02:00
dnosan c9df1c551a Add auto-configuration for WebServiceTemplate 
See gh-12707
 2018-06-04 11:12:02 +02:00
Stephane Nicoll 283ceaa071 Merge branch '2.0.x' 2018-06-04 10:32:21 +02:00
dreis2211 8bb7b8af51 Remove usage of deprecated Matchers class 
Closes gh-13345
 2018-06-04 10:31:25 +02:00
Stephane Nicoll d924c89525 Merge branch '2.0.x' 2018-06-03 16:57:34 +02:00
dreis2211 29605bacd2 Polish stream creation in some PropertySources 
Closes gh-13343
 2018-06-03 16:56:51 +02:00
Madhura Bhave 37a7457f36 Polish 2018-06-01 15:02:46 -07:00
Madhura Bhave 458d574d1f Merge branch '2.0.x' 2018-06-01 14:59:27 -07:00
Madhura Bhave 95174a0773 Don't fail if aggregate merge can't get existing value 
Fixes gh-13303
 2018-06-01 14:52:55 -07:00
Madhura Bhave 8ce13c765b Support binding to immutable maps 
Closes gh-13323
 2018-06-01 14:52:55 -07:00
Andy Wilkinson 78b1a37d7d Merge branch '2.0.x' 2018-06-01 17:58:03 +01:00
Andy Wilkinson 68cd27c47b Do not require DataSourcePoolMetrics to auto-configure Hikari meters 
Closes gh-13330
 2018-06-01 17:55:43 +01:00
Andy Wilkinson e306aad28c Merge branch '2.0.x' 2018-06-01 17:27:10 +01:00
Andy Wilkinson 27267a7090 Ensure that condition evaluator uses runner’s class loader 
Closes gh-13319
 2018-06-01 17:26:32 +01:00
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1 
Closes gh-13322
 2018-06-01 09:30:42 +02:00
Johnny Lim 5d5a14e4f7 Make MetricsProperties fields final if possible 
Closes gh-13324
 2018-06-01 09:29:34 +02:00
Stephane Nicoll 77dcbdb1e5 Polish 
See gh-13320
 2018-06-01 09:28:55 +02:00
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 2018-06-01 09:26:29 +02:00
Johnny Lim 6b0ce46491 Polish 
Closes gh-13320
 2018-06-01 09:22:20 +02:00
Madhura Bhave 817c228906 Merge branch '2.0.x' 2018-05-31 16:53:51 -07:00
Madhura Bhave 0afd947350 BindFailureAnalyzer should show original failure message 
Fixes gh-13122
 2018-05-31 16:51:42 -07:00
Stephane Nicoll 58d634f498 Merge branch '2.0.x' 2018-05-31 21:05:16 +02:00
Stephane Nicoll fa21333e4d Upgrade to Spring Cloud Connectors 2.0.2.RELEASE 
Closes gh-13318
 2018-05-31 21:04:02 +02:00
Stephane Nicoll 5790a26bcb Merge branch '2.0.x' 2018-05-31 17:36:10 +02:00
Stephane Nicoll 20e349c332 Polish 2018-05-31 17:35:56 +02:00