Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
453f4745d9 Merge branch '1.2.x' 2015-07-01 15:10:47 +01:00
Andy Wilkinson
f4c95eafc2 Upgrade to Undertow 1.1.7.Final
Closes gh-3382
2015-07-01 14:51:40 +01:00
Andy Wilkinson
e31a4dc028 Upgrade Java Mail to 1.5.4
Closes gh-3381
Closes gh-3383
2015-07-01 14:51:06 +01:00
Andy Wilkinson
159d3a3346 Upgrade to nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect 1.2.9
Closes gh-3380
2015-07-01 14:50:23 +01:00
Andy Wilkinson
bb8df95fbf Upgrade to HSQLDB 2.3.3
Closes gh-3379
2015-07-01 14:49:39 +01:00
Andy Wilkinson
2159190713 Merge branch '1.2.x' 2015-07-01 14:39:11 +01:00
Andy Wilkinson
b1ad2c30eb Ignore type-constrained converter when auto-configuring Jackson converter
Previously, JacksonHttpMessageConvertersConfiguration would configure a
general-purpose MappingJackson2HttpMessageConverter only if there was
no existing MappingJackson2HttpMessageConverter in the application
context. This was problematic when a
TypeConstrainedMappingJackson2HttpMessageConverter bean was present.
Such a bean is only capable of performing conversion for a specific
type, and therefore is no substitute for a general purpose converter,
yet its presence was causing the auto-configuration of a general
purpose converters to be turned off. This would leave Spring MVC’s
default converter being used for application/json requests which would
not honour the user’s Jackson configuration.

This commit enhances @ConditionalOnMissingBean so that the annotation
can be used to specify one or more types that should be ignored when
searching for beans. This allows the
TypeConstrainedMappingJackson2HttpMessageConverter beans that are
published by Spring Data REST to be ignored such that the
general-purpose MappingJackson2HttpMessageConverter is still
auto-configured.

Fixes gh-2914
2015-07-01 14:28:19 +01:00
Andy Wilkinson
8c3e2b9b3b Merge branch '1.2.x' 2015-07-01 14:28:03 +01:00
Andy Wilkinson
663967f61b Update to Spring Data Evans SR3
Closes gh-3369
2015-07-01 14:26:34 +01:00
Andy Wilkinson
b3b648f050 Upgrade dependency management plugin for compatibility with Gradle 2.5
Closes gh-3334
2015-07-01 13:40:55 +01:00
Stephane Nicoll
d7e0e754e2 Merge branch '1.2.x' 2015-07-01 05:35:34 -07:00
sopov.ivan
968b1d7425 Add Eclipse 4.5 new workspace folder to .gitignore
Closes gh-3375
2015-07-01 05:35:16 -07:00
Stephane Nicoll
d5b1810718 Merge pull request #3375 from isopov/eclipse45-gitignore
* pr/3375:
  Add Eclipse 4.5 new workspace folder to .gitignore
2015-07-01 05:34:24 -07:00
sopov.ivan
ab8d40026e Add Eclipse 4.5 new workspace folder to .gitignore
Closes gh-3375
2015-07-01 05:33:57 -07:00
Dave Syer
5541b3be43 Remove @OnManagementMvcCondition and use a private class
Fixes gh-3373
2015-07-01 09:06:54 +01:00
Dave Syer
8c3f80eb64 Use mock servlet container for welcome page tests
Fixes gh-3371
2015-07-01 09:00:40 +01:00
Phillip Webb
b5c435f8c4 Polish Actuator MVC customization support
See gh-3345
2015-06-30 22:09:38 -07:00
Phillip Webb
c84658af1b Remove unused .gitignore files 2015-06-30 22:09:00 -07:00
Phillip Webb
df3ced1a45 Merge branch '1.2.x' 2015-06-30 15:04:06 -07:00
Phillip Webb
8ec10c8425 Use buildView() to create MustacheView
Update MustacheViewResolver so that buildView() is called to create
the MustacheView. This sets fields such as `contentType` and allows us
to remove explicit setApplicationContext() and setServletContext()
calls.

Fixes gh-3265
2015-06-30 14:51:48 -07:00
Phillip Webb
1ecc9c8a8b Upgrade to Spring Framework 4.1.7.RELEASE
Fixes gh-3276
2015-06-30 13:51:19 -07:00
Phillip Webb
a89139c06b Allow case insensitive logging.level properties
Fixes gh-3356
2015-06-30 13:49:45 -07:00
Andy Wilkinson
3d27a34397 Merge branch '1.2.x' 2015-06-30 12:34:17 +01:00
Andy Wilkinson
5a1e66b3d6 Make GzipFilterAutoConfiguration conditional on HttpMethod
GzipFilterProperties uses HttpMethod so GzipFilterAutoConfiguration,
which uses GzipFilterProperties, needs to be conditional on HttpMethod
being on the classpath.

Closes gh-3362
2015-06-30 12:32:29 +01:00
Dave Syer
1e464da248 Refactor the Actuator MVC configuration to allow more customization
There is a new spring.factories entry for
org.springframework.boot.actuate.autoconfigure.EndpointWebMvcConfiguration
which loads extra beans into the MVC config for the Actuator.
If the management context is a child context all the beans go in the
child (except the Spring Security filter still). A big bonus is that
you can add WebConfigurerAdapters to configure static resources etc.
A new component called ManagementContextResolver can be used to
locate the ApplicationContext for the MVC endpoints.

Fixes gh-3345
2015-06-30 09:42:58 +01:00
Phillip Webb
4187b5d8fb Merge branch '1.2.x' 2015-06-30 00:56:44 -07:00
Phillip Webb
76348e50e6 Merge pull request #3324 from mbenson/actuator-sample-ant
* pr/3324:
  Fixup sample Ant build
2015-06-30 00:55:06 -07:00
Matt Benson
183a2095f4 Fixup sample Ant build
Fixes gh-3324
2015-06-30 00:54:53 -07:00
Phillip Webb
8da4d153b7 Merge pull request #3357 from izeye/filewatch-20150630
* pr/3357:
  Fix typo
2015-06-30 00:43:30 -07:00
izeye
dccb0b7736 Fix typo
Fixes gh-3357
2015-06-30 00:43:00 -07:00
Phillip Webb
a234292f76 Merge pull request #3339 from mbenson/antlib
* pr/3339:
  Create Apache Ant sample
  Create spring-boot-antlib module
2015-06-30 00:33:11 -07:00
Phillip Webb
da82f08692 Create Apache Ant sample
See gh-3339
2015-06-30 00:30:33 -07:00
Matt Benson
ae4559eb4f Create spring-boot-antlib module
Create a new spring-boot-antlib module which allows Apache Ant users
to easily create executable jars.

Fixes gh-3339
2015-06-30 00:30:28 -07:00
Phillip Webb
8d948dfa6c Be more lenient about expected exceptions 2015-06-29 18:35:22 -07:00
Phillip Webb
ada92fe020 Merge pull request #3341 from lukashinsch/logging-test
* pr/3341:
  Cleanup logging so execution order is unimportant
2015-06-29 17:58:04 -07:00
Lukas Hinsch
59bf850da1 Cleanup logging so execution order is unimportant
Fixes gh-3341
2015-06-29 17:56:39 -07:00
Phillip Webb
8e78ba8ce7 Change LoggingSystemTests to use real temp folder
Update AbstractLoggingSystemTests to use a TemporaryFolder rule.

Fixes gh-3349
2015-06-29 17:54:16 -07:00
Phillip Webb
5c6fef903d Polish 2015-06-29 17:44:57 -07:00
Phillip Webb
268b7911dd Rename ResourceProperties.Chain.html5AppCache
Rename the `html5AppCache` property from `ResourceProperties.Chain` to
`html-application-cache`.

Fixes gh-3354
2015-06-29 17:14:44 -07:00
Phillip Webb
d213cc05d5 Polish 2015-06-29 16:48:59 -07:00
Andy Wilkinson
cc3aea2b69 Prevent Jetty’s singleton shutdown thread from breaking restarts
By default, Jetty uses a singleton shutdown thread, registered as a
shutdown hook, to stop its components. This single thread breaks the
restart logic in devtools as a second restart causes a second attempt to
start the singleton shutdown thread which fails with an
IllegalStateException. This processing is unnecessary in a Spring Boot
application as the application context’s lifecycle when ensure that
Jetty is shutdown.

This commit updates the embedded Jetty container to remove its
components from Jetty’s shutdown thread. This leaves the thread with
no components to manage at which point it removes its registration as a
shutdown hook.

Closes gh-3343
2015-06-29 16:52:05 +01:00
Ivan Sopov
a09a29be44 Add sample for Jetty 9.3
Closes gh-3325
2015-06-29 15:59:29 +01:00
Andy Wilkinson
7ecc271617 Merge branch 'gh-3296' 2015-06-29 15:59:11 +01:00
Andy Wilkinson
00d594dcda Replace GzipFilter and Tomcat compression with general purpose approach
Closes gh-3296
2015-06-29 15:58:57 +01:00
Ivan Sopov
dde194e2b9 Use native compression for all embedded containers, not just Tomcat
See gh-3296
2015-06-29 15:07:47 +01:00
Stephane Nicoll
31a6d53a95 Fix typo 2015-06-29 06:19:19 -07:00
Stephane Nicoll
269398f745 Merge pull request #3346 from izeye/filewatch
* pr/3346:
  Polish
2015-06-29 06:16:09 -07:00
izeye
df33830fb6 Polish
Closes gh-3346
2015-06-29 06:15:09 -07:00
Dave Syer
46fbca66a6 Fix typo 'a' -> 'an' 2015-06-29 06:43:25 +01:00
Dave Syer
c39b9f7635 Tweak docs on /health endpoint to reflect secure/sensitive
Fixes gh-2816
2015-06-28 22:13:17 +01:00