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

16854 Commits

Author SHA1 Message Date
Stephane Nicoll f6c99361a4 Merge branch '1.5.x' into 2.0.x 2018-06-06 11:00:02 +02:00
Stephane Nicoll 584d2de9f3 Document use of component scan exclude filters on SpringBootApplication 
Closes gh-10933
 2018-06-06 10:53:55 +02:00
Stephane Nicoll d0b71a7d43 Document usage of auto-configuration AP for 3rd party starters 
Closes gh-13368
 2018-06-06 10:37:57 +02:00
Stephane Nicoll 9f16326305 Merge pull request #13378 from dreis2211:remove-commons-codec-imports 
* pr/13378:
  Polish "Replace commons-codec Base64 usage"
  Replace commons-codec Base64 usage
 2018-06-06 09:30:17 +02:00
Stephane Nicoll 68380b68ef Polish "Replace commons-codec Base64 usage" 
Closes gh-13378
 2018-06-06 09:26:59 +02:00
dreis2211 ba8a32fa4e Replace commons-codec Base64 usage 
See gh-13378
 2018-06-06 09:19:17 +02:00
Phillip Webb e3bf518819 Merge branch '1.5.x' into 2.0.x 2018-06-05 17:13:47 -07:00
Phillip Webb 6c7289b822 Allow META-INF/resources in WAR classes folder 
Update `TomcatResources` so that `META-INF/resources` folders in
`src/main/resources` no longer fail with a "URI is not hierarchical"
exception.

Closes gh-13265
 2018-06-05 17:00:52 -07:00
Madhura Bhave d0a2a8e929 Document ConfigurableServletWebServerFactory variants 
Closes gh-13083
 2018-06-05 13:48:43 -07:00
Stephane Nicoll bf56ec496d Polish 2018-06-05 13:29:56 +02:00
Stephane Nicoll fff06822dc Polish 2018-06-05 13:15:38 +02:00
Stephane Nicoll d84e2b90d7 Fix wrong usage of ManagementContextConfiguration 
Closes gh-13366
 2018-06-05 13:15:21 +02:00
Stephane Nicoll b4f8361989 Make JMX metrics domain configurable 
Closes gh-13356
 2018-06-05 10:12:26 +02:00
Phillip Webb 571c50e43f Switch to functional web code to use static imports 
Update the samples and tests to use the more idiomatic static import
style.
 2018-06-04 17:27:34 -07:00
Phillip Webb 8eba37500c Upgrade to spring-javaformat 0.0.3 2018-06-04 17:26:40 -07:00
Phillip Webb 2274ac5214 Move spring-javaformat plugins to root POM 
Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
 2018-06-04 17:25:19 -07:00
Phillip Webb e1d21e52d5 Allow multi-value spring.profiles properties 
Update `ConfigFileApplicationListener` to correctly load properties
that have `spring.profiles` values containing a list.

Prior to this commit the loaded would attempt to add the same document
twice resulting in a "property source cannot be added relative to
itself" error.

Closes gh-13362
 2018-06-04 15:39:16 -07:00
Phillip Webb 67b548dafb Protect against infinite property include loop 
Update `ConfigFileApplicationListener` to ensure that a
`spring.profiles.include` property that refers to an already processed
profile doesn't cause an infinite loop.

Closes gh-13361
 2018-06-04 14:59:29 -07:00
Madhura Bhave 378c4c9535 Stop included profiles overriding active profiles 
Update `ConfigFileApplicationListener` so that `spring.profiles.include`
properties do not override higher priority active profiles.

This commit also changes when profiles get added to the environment.
Profiles are now added to the environment at the time of profile
processing so that they get logged in the order that they are processed.

Closes gh-13151
 2018-06-04 14:46:44 -07:00
Madhura Bhave 60a4d67b13 Handle special characters in TraceableHttpServletRequest 
Fixes gh-13273
 2018-06-04 12:50:11 -07:00
Andy Wilkinson 1a0dfa06ab Add log4j-jul to Log4j 2 starter 
Closes gh-12659
 2018-06-04 19:38:25 +01: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
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 624946a779 Upgrade to Maven Invoker Plugin 3.1.0 
Closes gh-12687
 2018-06-04 17:05:22 +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 9e871816d6 Merge pull request #13331 from nosan:gh-13329 
* pr/13331:
  Auto-configure jOOQ with TransactionListenerProvider
 2018-06-04 17:35:45 +02:00
Dmytro Nosan 20003489be Auto-configure jOOQ with TransactionListenerProvider 
Closes gh-13331
 2018-06-04 17:35:40 +02: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 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 bc59434bcc Start building against Spring Framework 5.0.7 snapshots 
See gh-13353
 2018-06-04 15:21:46 +02:00
Stephane Nicoll 0da425794e Merge branch '1.5.x' into 2.0.x 2018-06-04 15:20:49 +02:00
Stephane Nicoll 628cce567f Start building against Spring Framework 4.3.18 snapshots 
See gh-13352
 2018-06-04 15:04:49 +02:00
Stephane Nicoll a9b2826c26 Merge branch '1.5.x' into 2.0.x 2018-06-04 14:14:52 +02:00
Stephane Nicoll a562cb5d6c Merge pull request #13338 from mtheiss:master 
* pr/13338:
  Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
  Retrieve javax.cache.CacheManager using Bean ClassLoader
 2018-06-04 14:11:08 +02:00
Stephane Nicoll c67aedd8bc Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader" 
Closes gh-13338
 2018-06-04 14:08:58 +02:00
Martin Theiss 76b9d0d243 Retrieve javax.cache.CacheManager using Bean ClassLoader 
This commit uses the bean's classloader to retrieve the CacheManager to
prevent issues with off-heap serialization.

See gh-13338
 2018-06-04 14:08:57 +02:00
Stephane Nicoll 6be208ed04 Merge pull request #13345 from dreis2211:remove-deprecated-matcher 
* pr/13345:
  Remove usage of deprecated Matchers class
 2018-06-04 10:32:07 +02:00
dreis2211 8bb7b8af51 Remove usage of deprecated Matchers class 
Closes gh-13345
 2018-06-04 10:31:25 +02:00
Stephane Nicoll d5ccd43feb Merge pull request #13343 from dreis2211:property-source-stream-polish 
* pr/13343:
  Polish stream creation in some PropertySources
 2018-06-03 16:57:24 +02:00
dreis2211 29605bacd2 Polish stream creation in some PropertySources 
Closes gh-13343
 2018-06-03 16:56:51 +02: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 68cd27c47b Do not require DataSourcePoolMetrics to auto-configure Hikari meters 
Closes gh-13330
 2018-06-01 17:55:43 +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
Stephane Nicoll 152ce145fd Merge pull request #13320 from izeye:polish-20180601 
* pr/13320:
  Polish
 2018-06-01 09:25:48 +02:00
Johnny Lim 6b0ce46491 Polish 
Closes gh-13320
 2018-06-01 09:22:20 +02:00
Madhura Bhave 0afd947350 BindFailureAnalyzer should show original failure message 
Fixes gh-13122
 2018-05-31 16:51:42 -07:00
Stephane Nicoll fa21333e4d Upgrade to Spring Cloud Connectors 2.0.2.RELEASE 
Closes gh-13318
 2018-05-31 21:04:02 +02:00