Commit Graph

17226 Commits

Author SHA1 Message Date
Andy Wilkinson
5c3b4333f8 Merge branch '2.0.x' 2018-06-21 17:31:24 +01:00
Andy Wilkinson
30f0fd1fe4 Merge branch '1.5.x' into 2.0.x 2018-06-21 17:31:16 +01:00
Andy Wilkinson
f32c66d0e1 Merge pull request #12859 from ralenmdp
* gh-12859:
  Polish "Fix JSP availability check when not running as a packaged war"
  Fix JSP availability check when not running as a packaged war
2018-06-21 17:30:24 +01:00
Andy Wilkinson
b1d8cc55fc Polish "Fix JSP availability check when not running as a packaged war"
Closes gh-12859
2018-06-21 17:30:12 +01:00
Mandap
82465cf435 Fix JSP availability check when not running as a packaged war
See gh-12859
2018-06-21 17:21:00 +01:00
Andy Wilkinson
1ea119a4a5 Merge branch '2.0.x' 2018-06-21 16:21:44 +01:00
Andy Wilkinson
aafe754746 Merge branch '1.5.x' into 2.0.x 2018-06-21 16:21:34 +01:00
Andy Wilkinson
b35e1ad232 Avoid unbounded metrics creation for requests not handled by Spring MVC
Previously, if an HTTP request that used a templated URI was handled
by something other than Spring MVC, a potentially unbounded number of
metrics would be created. This happened because, in the absence of
Spring MVC's best matching pattern attribute, MetricsFilter would fall
back to using the request's path. If the handling route was templated,
MetricsFilter would be unaware and would record different metrics for
each different path, rather than a single metric for the matching
pattern.

This cimmit updates MetricsFilter so that it falls back to using
unmapped when Spring MVC's best matching pattern attribute is not
available. This ensures that an unbounded number of metrics will no
longer be created, at the cost of losing specific metrics for requests
that are not handled by Spring MVC and that do not use a templated
path.

Closes gh-5875
2018-06-21 15:10:47 +01:00
Andy Wilkinson
24dec4807f Merge branch '2.0.x' 2018-06-21 12:47:46 +01:00
Andy Wilkinson
fd125b4a4a Remove assumption that a file URI can be turned into a File
Closes gh-13493
2018-06-21 12:47:23 +01:00
Stephane Nicoll
4c172eb6cd Merge branch '2.0.x' 2018-06-21 13:32:31 +02:00
Stephane Nicoll
f2cc6e2ef2 Fix link of RESTEasy repository
Closes gh-13538
2018-06-21 13:32:07 +02:00
Stephane Nicoll
c594768640 Remove wro4j starter reference
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Stephane Nicoll
8858c88a4c Remove GraphQL starter reference
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Andy Wilkinson
a612ba1b11 Merge branch '2.0.x' 2018-06-21 12:18:40 +01:00
Andy Wilkinson
48c5e70ac8 Merge branch '1.5.x' into 2.0.x 2018-06-21 12:18:35 +01:00
Andy Wilkinson
29e87257b4 Provide Gradle example for using Log4j2
Closes gh-12729
2018-06-21 12:16:12 +01:00
Andy Wilkinson
eb6898314a Merge branch '2.0.x' 2018-06-21 11:41:15 +01:00
Andy Wilkinson
2624748911 Merge branch '1.5.x' into 2.0.x 2018-06-21 11:41:02 +01:00
Andy Wilkinson
8a0f0354df Disable Log4J2's shutdown hook by default
Log4J2 enables its shutdown hook by default. When the JVM is exiting,
this creates a race between logging that happens during the
application context being closed and Log4J2 being shut down such that
the logging is lost.

This commit updates SpringBootConfigurationFactory so that it
produces a custom sub-class of DefaultConfiguration that disables the
shutdown hook by default. In addition to solving the problem described
above, this also aligns the Log4J2 logging system with the
logging.register-shutdown-hook property which defaults to false.

Closes gh-11360
2018-06-21 11:35:20 +01:00
Stephane Nicoll
56a7aa552f Polish 2018-06-21 10:40:33 +02:00
Johnny Lim
bb60edaca6 Polish
Closes gh-13534
2018-06-21 09:24:36 +02:00
Stephane Nicoll
d4d169277d Merge branch '2.0.x' 2018-06-21 09:23:43 +02:00
Stephane Nicoll
7683d346e3 Merge pull request #13534 from izeye:polish-20180621
* pr/13534:
  Polish
2018-06-21 09:21:31 +02:00
Johnny Lim
b9ea0fd5a7 Polish
See gh-13534
2018-06-21 09:20:50 +02:00
Stephane Nicoll
9e9e746554 Merge branch '1.5.x' into 2.0.x 2018-06-21 09:17:05 +02:00
Stephane Nicoll
36605b3b49 Polish
See gh-13534
2018-06-21 09:16:44 +02:00
Andy Wilkinson
b18da6a11c Merge branch '2.0.x' 2018-06-20 18:56:28 +01:00
Andy Wilkinson
9b4680c3fd Merge branch '1.5.x' into 2.0.x 2018-06-20 18:56:22 +01:00
Andy Wilkinson
9f7106c778 Polish 2018-06-20 18:56:14 +01:00
Andy Wilkinson
52716b2dbe Merge branch '2.0.x' 2018-06-20 16:53:26 +01:00
Andy Wilkinson
e6222ce6d3 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:53:21 +01:00
Andy Wilkinson
6cc0968b8d Polish 2018-06-20 16:52:18 +01:00
Andy Wilkinson
3ea7c2e003 Merge branch '2.0.x' 2018-06-20 16:51:56 +01:00
Andy Wilkinson
4fc0a33094 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:49:53 +01:00
Phillip Webb
2bb7a430cf Clean up access logging threads when Undertow is stopped
Closes gh-12742
2018-06-20 14:15:21 +01:00
Andy Wilkinson
c90f589906 Merge branch '2.0.x' 2018-06-20 13:57:05 +01:00
Andy Wilkinson
e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
Andy Wilkinson
e7b03f7ca3 Don't auto-configure MultipartConfigElement when using Commons FileUpload
Previously, when a user had declared a custom MultipartResolver bean
that is a CommonsMultipartResolver, part resolution would fail. The
failure was occurring as the servlet container was consuming the parts
before CommonsMultipartResolver had a chance to read them. This was
happening because a MultipartConfigElement was being auto-configured.

This commit updates the multipart auto-configuration so that a
MultipartConfigElement is not auto-configured when there is a
CommonsMultipartResolver bean in the context.

Closes gh-7735
2018-06-20 12:05:23 +01:00
Andy Wilkinson
7571f10ae3 Merge branch '2.0.x' 2018-06-20 11:41:54 +01:00
Andy Wilkinson
e730382718 Merge branch '1.5.x' into 2.0.x 2018-06-20 11:12:51 +01:00
Andy Wilkinson
92f62043d4 Fix placeholder support in <springProfile>'s name attribute
Closes gh-13450
2018-06-20 10:48:55 +01:00
Andy Wilkinson
20546024d3 Merge branch '2.0.x' 2018-06-20 10:11:44 +01:00
Andy Wilkinson
e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available
Closes gh-13521
2018-06-20 10:10:35 +01:00
Stephane Nicoll
8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template
Closes gh-13529
2018-06-20 09:28:00 +02:00
Stephane Nicoll
65cc7c72f4 Harmonize JNDI lookups to enable resourceRef
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.

This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.

Closes gh-12803
2018-06-19 21:51:18 +02:00
Andy Wilkinson
c12f8298e6 Merge branch '2.0.x' 2018-06-19 20:06:58 +01:00
Andy Wilkinson
814e90805e Merge branch '1.5.x' into 2.0.x 2018-06-19 20:06:44 +01:00
Stephane Nicoll
3fdb2b3c85 Merge branch '2.0.x' 2018-06-19 20:59:43 +02:00
Stephane Nicoll
864a6b3e91 Merge branch '1.5.x' into 2.0.x 2018-06-19 20:59:27 +02:00