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
Andy Wilkinson
3e30a06849 Merge branch '1.5.x' 2018-01-29 20:01:41 +00:00
Andy Wilkinson
f8b4018f44 Upgrade to Spring Integration 4.3.14.RELEASE 
Closes gh-11836
 2018-01-29 20:01:32 +00:00
Andy Wilkinson
06ca702161 Upgrade to Spring Integration 5.0.1.RELEASE 
Closes gh-11501
 2018-01-29 19:58:13 +00:00
Andy Wilkinson
244a287484 Merge branch '1.5.x' 2018-01-29 19:51:50 +00:00
Andy Wilkinson
7c269a6dc7 Merge pull request #11790 from Alex Panchenko 
* gh-11790:
  Polish "Configure ErrorReportValve not to report stack traces"
  Configure ErrorReportValve not to report stack traces
 2018-01-29 19:50:20 +00:00
Andy Wilkinson
5a74f63f7c Polish "Configure ErrorReportValve not to report stack traces" 
Closes gh-11790
 2018-01-29 19:50:07 +00:00
Phillip Webb
af50a18da9 Polish 2018-01-29 09:47:03 -08:00
Alex Panchenko
29736e340e Configure ErrorReportValve not to report stack traces 
See gh-11790
 2018-01-29 17:23:49 +00:00
Andy Wilkinson
488965bb06 Merge pull request #11834 from Gary Russell 
* gh-11834:
  Upgrade to Spring AMQP 2.0.2
 2018-01-29 17:12:42 +00:00
Gary Russell
d20585db6f Upgrade to Spring AMQP 2.0.2 
Closes gh-11834
 2018-01-29 17:12:35 +00:00
Andy Wilkinson
8e90ff66b2 Merge branch '1.5.x' 2018-01-29 17:10:23 +00:00
Andy Wilkinson
4c001e8d56 Merge pull request #11835 from Gary Russell 
* gh-11835:
  Upgrade to Spring AMQP 1.7.6
 2018-01-29 17:10:05 +00:00
Gary Russell
4ad5045aab Upgrade to Spring AMQP 1.7.6 
Closes gh-11835
 2018-01-29 17:09:40 +00:00
Andy Wilkinson
32a80f7091 Merge branch '1.5.x' 2018-01-29 16:07:06 +00:00
Andy Wilkinson
2ba2bddc76 Add note to docs about configuration of Log4j 2's JDK logging adapter 
Closes gh-11660
 2018-01-29 16:04:16 +00:00
Stephane Nicoll
eba476ba6e Disable LoggersEndpoint if the logging system is disabled 
Closes gh-11793
 2018-01-29 16:37:28 +01:00
Andy Wilkinson
4b47a874ec Merge branch '1.5.x' 2018-01-29 15:25:05 +00:00
Andy Wilkinson
9da6ddb253 Trace IDs of sessions created downstream of trace filter 
Closes gh-11717
 2018-01-29 15:24:24 +00:00
Andy Wilkinson
7a75ca4685 Upgrade to Postgresql 42.2.1 
Closes gh-11833
 2018-01-29 14:48:55 +00:00
Andy Wilkinson
11e6bcaf4f Upgrade to Jolokia 1.4.0 
Closes gh-11832
 2018-01-29 14:48:55 +00:00
Andy Wilkinson
2b01d5c70b Upgrade to Narayana 5.7.2.Final 
Closes gh-11831
 2018-01-29 14:48:54 +00:00
Andy Wilkinson
d908d0e876 Upgrade to Jackson 2.9.4 
Closes gh-11830
 2018-01-29 14:48:53 +00:00
Andy Wilkinson
5e2c6609d5 Merge branch '1.5.x' 2018-01-29 14:46:29 +00:00
Andy Wilkinson
7ae39eaebf Upgrade to Spring Security 4.2.4.RELEASE 
Closes gh-11829
 2018-01-29 14:46:18 +00:00
Andy Wilkinson
70dabdbf39 Add application/json and /xml to default compressible mime types 
Closes gh-11828
 2018-01-29 14:33:02 +00:00
Andy Wilkinson
844782b20b Remove default JUL handler to prevent duplicate console logging 
By default, JUL configures a single root handler. That handler is a
ConsoleHandler. Previously, we removed all root handlers from JUL but
this is problematic in environments where other handlers are
registered with JUL and those handlers need to be retained.
0679d436 attempted to fix the problem by leaving the root handlers in
place and only adding and removing the bridge handler. This resulted
in log output from Tomcat (and anything else that uses JUL) being
duplicated.

This commit makes another attempt at tackling the problem. It attempts
to detect JUL's default configuration (a single root handler that's a
ConsoleHandler) and only removes the handler if it appears to be from
the default configuration. For environments where default JUL
configuration is being used, this will prevent duplicate logging and
for environments where custom JUL configuration is being used, this
will prevent that configuration from being undone.

Closes gh-8933
 2018-01-29 14:22:28 +00:00
Stephane Nicoll
c2a2999799 Use proper classloader for value serialization 
Closes gh-11822
 2018-01-29 13:55:05 +01:00
Andy Wilkinson
9edcd25c25 Simply test for async dispatch metrics filter registration 
Previously, the test in MetricsAutoConfigurationIntegrationTests was
testing the functionality of WebMvcMetricsFilter to verify that the
auto-configuration had registered the filter for async dispatches.
This test was complex and covered the same code as a test in
WebMvcMetricsFilterTests.

This commit reworks the test to examine the dispatcher types on the
filter registration directly instead.

Closes gh-11826
 2018-01-29 11:23:58 +00:00
Andy Wilkinson
199088b0c9 Set kotlin.version when Kotlin's Gradle plugin is applied 
Closes gh-11711
 2018-01-29 10:13:54 +00:00
Stephane Nicoll
bdd532cc20 Clarify when a property was not renamed due to an incompatible type 
Closes gh-11794
 2018-01-29 10:30:59 +01:00
Stephane Nicoll
43e5e83d9c Transparently handle migration from number to java.util.Duration 
See gh-11794
 2018-01-29 09:59:38 +01:00
Stephane Nicoll
d7c20be3e7 Merge pull request #11815 from vpavic:session-bom 
* pr/11815:
  Use Spring Session BOM in dependency management
 2018-01-29 08:26:01 +01:00
Vedran Pavic
df28ee7122 Use Spring Session BOM in dependency management 
Closes gh-11815
 2018-01-29 08:24:38 +01:00
Stephane Nicoll
3c1f7abbbe Merge pull request #11811 from izeye:polish-20180127-2nd 
* pr/11811:
  Polish contribution
  Polish
 2018-01-29 08:12:53 +01:00
Stephane Nicoll
a515c5b7d1 Polish contribution 
Closes gh-11811
 2018-01-29 08:12:35 +01:00
Johnny Lim
914bdb393f Polish 
See gh-11811
 2018-01-29 08:11:09 +01:00
Stephane Nicoll
5332bcbe28 Merge pull request #11818 from dreis2211:mockito-get-single-argument 
* pr/11818:
  Use InvocationOnMock.getArgument() where possible
 2018-01-29 08:06:33 +01:00
dreis2211
c1675c2d5f Use InvocationOnMock.getArgument() where possible 
Closes gh-11818
 2018-01-29 08:06:00 +01:00
Stephane Nicoll
fac8970366 Merge pull request #11817 from dreis2211:replace-any-with-casts 
* pr/11817:
  Replace casted Mockito.any() calls
 2018-01-29 08:05:04 +01:00
dreis2211
a7663c88d3 Replace casted Mockito.any() calls 
Closes gh-11817
 2018-01-29 07:50:29 +01:00
Stephane Nicoll
ab02e48c44 Fix security section indents 
Closes gh-11813
 2018-01-28 09:40:40 +01:00
Phillip Webb
5767350380 Polish 2018-01-26 22:12:07 -08:00
Phillip Webb
53b0f0db60 Fix NPE when normalizing client tag URIs 
See gh-11798
 2018-01-26 22:12:07 -08:00
Stephane Nicoll
3266c68a78 Polish 2018-01-27 06:18:14 +01:00
Stephane Nicoll
5e26d04c05 Only generate time-to-live property for matching endpoints 
This commit makes sure that a "cache.time-to-live" property is not
generated for endpoints that do not have a main read operation (i.e. a
read operation with no parameter or only nullable parameters).

This matches the endpoint feature that provides caching for only such
operation.

Closes gh-11703
 2018-01-27 06:11:01 +01:00
Stephane Nicoll
90545fb0c6 Update LocalDevToolsAutoConfiguration to use constructor injection 
Closes gh-11769
 2018-01-27 05:55:56 +01:00
Stephane Nicoll
c533cb28bc Merge pull request #11809 from izeye:parameter-name 
* pr/11809:
  Polish contribution
  Fix to assert parameter names in EndpointServlet.withInitParameters()
 2018-01-27 05:35:11 +01:00
Stephane Nicoll
6569ed8739 Polish contribution 
Closes gh-11809
 2018-01-27 05:33:49 +01:00
Johnny Lim
a0fb138771 Fix to assert parameter names in EndpointServlet.withInitParameters() 
See gh-11809
 2018-01-27 05:31:56 +01:00
Stephane Nicoll
6830ad7892 Merge pull request #11805 from izeye:polish-20180127 
* pr/11805:
  Polish
 2018-01-27 05:22:11 +01:00