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

3227 Commits

Author SHA1 Message Date
Andy Wilkinson da13871f84 Merge branch '2.0.x' 2018-09-05 14:28:11 +01:00
Andy Wilkinson 86d87ad215 Polish 2018-09-05 14:26:51 +01:00
Andy Wilkinson 7442e37154 Add JAXB API to Data JPA starter so it works out-of-the-box on Java 9+ 
Closes gh-14287
 2018-09-05 14:23:18 +01:00
Stephane Nicoll 304c6a02ba Polish "Make it possible to disable the BackgroundPreinitializer" 
Closes gh-14298
 2018-09-05 14:33:54 +02:00
artsiom 5779767513 Make it possible to disable the BackgroundPreinitializer 
See gh-14298
 2018-09-05 14:32:56 +02:00
Stephane Nicoll 5f56adc334 Add activation API to WebServices samples on Java 11+ 
Closes gh-14308
 2018-09-05 14:17:31 +02:00
Stephane Nicoll 7ff41e7c8c Polish 2018-09-05 13:39:51 +02:00
Stephane Nicoll ca8be3f6bd Polish "Add Health details using maps" 
Closes gh-14305
 2018-09-05 13:39:18 +02:00
Michael Pratt 5c86f9eca4 Add Health details using maps 
See gh-14305
 2018-09-05 13:20:03 +02:00
Stephane Nicoll 45204d7ee0 Harmonize JAXB version in dependency management 
Closes gh-14308
 2018-09-05 10:35:28 +02:00
Stephane Nicoll 5df75e74ae Update property description 2018-09-05 09:31:38 +02:00
Stephane Nicoll 9da0b25890 Merge branch '2.0.x' 2018-09-05 09:29:45 +02:00
Stephane Nicoll c410f7d153 Merge branch '1.5.x' into 2.0.x 2018-09-05 09:29:29 +02:00
Johnny Lim 49c760d275 Update @since tag 
This commit updates @since tag in CloudServiceConnectorsAutoConfiguration
as it has been renamed in cfd0ab7646.

Closes gh-14297
 2018-09-05 08:46:25 +02:00
Madhura Bhave f0d7533e0b Merge branch '2.0.x' 2018-09-04 17:09:52 -07:00
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe 
Fixes gh-14161
 2018-09-04 17:06:24 -07:00
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 2018-09-04 16:25:17 -07:00
Phillip Webb cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07:00
Phillip Webb 9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Madhura Bhave 75937f5b5c Make jmsListenerContainerFactory @ConditionalOnSingleCandidate 
Closes gh-12700
 2018-09-04 16:06:18 -07:00
Phillip Webb 59b5c54489 Upgrade to Rabbit AMQP Client to 5.4.0 
Closes gh-14303
 2018-09-04 15:21:06 -07:00
Phillip Webb 0cd64ea690 Merge branch '2.0.x' 2018-09-04 15:15:57 -07:00
Phillip Webb 45613f8c3c Merge branch '1.5.x' into 2.0.x 2018-09-04 15:12:22 -07:00
Andy Wilkinson 8ee4775820 Polish 2018-09-04 20:46:35 +01:00
Brian Clozel 2af8a9617b Revert temporary workaround for reactor resources 
This switches back the Reactor resources on global by default.

See gh-14058
See SPR-17199
 2018-09-04 15:37:39 +02:00
Stephane Nicoll 3e745eefc0 Upgrade to Spring Batch 4.1.0.M3 
Closes gh-14296
 2018-09-04 15:18:54 +02:00
Stephane Nicoll 1ceb076035 Harmonize Metrics test 
This commit harmonizes metrics test to rely on `MetricRun.simple()`
rather than configuring a simple `MeterRegistry` manually. Rather than
applying related auto-configurations automatically, `MetricsRun` only
enable the absolute minimum.

See gh-14255
 2018-09-04 15:04:02 +02:00
Stephane Nicoll c0e45b7333 Adapt to Spring Framework API change 2018-09-04 14:09:57 +02:00
Stephane Nicoll cb7de2a963 Allow binding number to DataSize 
Closes gh-14294
 2018-09-04 11:04:22 +02:00
Stephane Nicoll 8771b34c15 Polish "Align max HTTP header size configuration" 
Closes gh-14234
 2018-09-04 10:51:54 +02:00
qct dbbb378650 Align max HTTP header size configuration 
See gh-14234
 2018-09-04 10:51:36 +02:00
Johnny Lim 5427d778fe Polish 
Closes gh-14293
 2018-09-04 08:52:55 +02:00
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim ca57e58ee5 Polish 
See gh-14293
 2018-09-04 08:52:13 +02:00
Stephane Nicoll e0ee4f22a5 Merge branch '2.0.x' 2018-09-04 08:49:04 +02:00
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint 
Closes gh-14291
 2018-09-04 08:33:33 +02:00
Brian Clozel 1a20e7efa1 Merge branch '2.0.x' 2018-09-03 21:05:18 +02:00
Kedar Joshi 72ebfb0332 Update default compressible media types 
Closes gh-14278
 2018-09-03 19:13:09 +02:00
Stephane Nicoll 3dfece779c Upgrade to Kotlin 1.2.61 
Closes gh-14290
 2018-09-03 14:10:30 +02:00
Stephane Nicoll 960acb0cbf Merge branch '2.0.x' 2018-09-03 12:16:32 +02:00
Stephane Nicoll 42bf594d96 Polish condition name 
See gh-14285
 2018-09-03 12:16:18 +02:00
artsiom 11f0f668ff Throw an exception on invalid syntax in SPRING_APPLICATION_JSON 
Closes gh-14251
 2018-09-03 11:28:02 +02:00
Stephane Nicoll 5a1aefc76f Merge branch '2.0.x' 2018-09-03 11:17:59 +02:00
Stephane Nicoll ddeae9b58e Polish "Fix WSDL locations condition to work with a list" 
Closes gh-14285
 2018-09-03 11:09:44 +02:00
Eneias Cordeiro da Silva 80358f7fbf Fix WSDL locations condition to work with a list 
See gh-14285
 2018-09-03 11:06:34 +02:00
Stephane Nicoll 143ca5d1fa Merge branch '2.0.x' 2018-09-03 10:00:54 +02:00
Stephane Nicoll 6078865372 Merge branch '1.5.x' into 2.0.x 2018-09-03 10:00:31 +02:00
Johnny Lim d510bc71b1 Polish 
Closes gh-14271
 2018-09-03 08:53:07 +02:00
Stephane Nicoll 7dff13b632 Merge branch '2.0.x' 2018-09-03 08:52:46 +02:00
Stephane Nicoll 8950c3ebb4 Polish 
See gh-14271
 2018-09-03 08:51:51 +02:00