Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,208 Commits 23 Branches 0 Tags
5f1bbf8c72da1702081da57226304ccb9008a642
Commit Graph

21208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
bf56ec496d Polish 2018-06-05 13:29:56 +02:00
Stephane Nicoll
47634f5587 Polish 2018-06-05 13:21:03 +02:00
Stephane Nicoll
1901008d6f Merge branch '2.0.x' 2018-06-05 13:18:40 +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
df469abdb0 Merge pull request #13214 from eddumelendez:gh-13176 
* pr/13214:
  Polish "Add support to set visibility via JacksonProperties"
  Add support to set visibility via JacksonProperties
 2018-06-05 10:31:53 +02:00
Stephane Nicoll
51cf4e5d74 Polish "Add support to set visibility via JacksonProperties" 
Closes gh-13214
 2018-06-05 10:30:15 +02:00
Eddú Meléndez
ca3659059a Add support to set visibility via JacksonProperties 
This commit allows to configure properties visibility.

See gh-13214
 2018-06-05 10:20:25 +02:00
Stephane Nicoll
3248400665 Merge branch '2.0.x' 2018-06-05 10:12:46 +02:00
Stephane Nicoll
b4f8361989 Make JMX metrics domain configurable 
Closes gh-13356
 2018-06-05 10:12:26 +02:00
Stephane Nicoll
48c078f0d0 Merge pull request #13358 from nosan:rest-template-customizers 
* pr/13358:
  Polish "RestTemplateCustomizers should be applied at the end"
  RestTemplateCustomizers should be applied at the end
 2018-06-05 09:45:48 +02:00
Stephane Nicoll
c612ed2695 Polish "RestTemplateCustomizers should be applied at the end" 
Closes gh-13358
 2018-06-05 09:45:19 +02:00
Dmytro Nosan
ce3420748f RestTemplateCustomizers should be applied at the end 
See gh-13358
 2018-06-05 09:42:42 +02:00
Phillip Webb
ade1397ea2 Merge branch '2.0.x' 2018-06-04 17:28:54 -07: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
d47e7ebb5b Merge branch '2.0.x' 2018-06-04 15:42:12 -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
a12baed5de Merge branch '2.0.x' 2018-06-04 15:02:14 -07:00
Phillip Webb
c1ab3eab69 Polish 2018-06-04 15:02:06 -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
Brian Clozel
87af880446 Reactor BOM is now declaring reactor-netty 0.8 
See gh-13321
 2018-06-04 22:03:51 +02:00
Madhura Bhave
360d392eb1 Merge branch '2.0.x' 2018-06-04 12:51:07 -07:00
Madhura Bhave
60a4d67b13 Handle special characters in TraceableHttpServletRequest 
Fixes gh-13273
 2018-06-04 12:50:11 -07:00
Phillip Webb
ef5301d079 Add saaj and jax-ws dependencies for Java 9 build 
Add test dependencies for saaj-impl and jax-ws since Java 9+ no longer
includes them.

See gh-1270
 2018-06-04 12:16:30 -07:00
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
5218e15b79 Merge pull request #13351 from izeye:patch-49 
* pr/13351:
  Add "Managed dependency upgrade" section
 2018-06-04 17:57:22 +02:00
Johnny Lim
8be2fe79cb Add "Managed dependency upgrade" section 
Closes gh-13351
 2018-06-04 17:57:01 +02: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
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
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