Commit Graph

2879 Commits

Author SHA1 Message Date
Andy Wilkinson
02e925cb4e Merge branch 'gh-1989' into 1.1.x 2014-11-25 13:53:57 +00:00
Andy Wilkinson
2b4eee5e53 Add a note explaining that double backslashes are unnecessary in YAML
Closes gh-1989
2014-11-25 13:52:26 +00:00
Sjoerd Mulder
cc557833a4 Escape backslashes in .properties examples of setting internal-proxies
In a properties file, a backslash is used as an escape character for
the line terminator sequence to allow values to be split across
multiple lines. When a backslash is used elsewhere they're stripped
out of the property's value.

This commit updates .properties-based examples for configuring
server.tomcat.internal-proxies to escape the backslahes so that they
are retained in the property's value at runtime.

See gh-1989
2014-11-25 13:39:25 +00:00
Andrea Vacondio
9ef8335881 Fix broken link to the MVC section of the Spring reference docs
Closes gh-1998
2014-11-25 12:31:57 +00:00
Andy Wilkinson
feddb2e8a1 Note that @IntegrationTest and @WebAppConfiguration can be used with Spock
Closes gh-1908
2014-11-25 10:51:27 +00:00
Andy Wilkinson
ccbc606dad Use relative paths so index is unaffected by its context path
Previously, index.html used absolute paths to load its CSS and
JavaScript. This meant that it had to be deployed to /. This commit
updates the HTML to use relative paths for its CSS and JavaScript,
thereby ensuring that they can be loaded irrespective of the context
path to which the application is deployed.

Closes gh-1988
2014-11-24 10:55:37 +00:00
Michael Freedman
3bad634915 Fix copy in README
(cherry picked from commit d4bf221f)
2014-11-20 10:02:38 -08:00
Brian Clozel
404153a758 Minor fixes in howto documentation re:SSL config
Fixes a couple of typos in the documentation:
* `x-forwarded-protocol` is not the standard name for this header
* `require_https` is not an existing property, but rather `require_ssl`
2014-11-20 13:27:27 +01:00
Dave Syer
23e7028abb Ensure java.io.tmpdir is available before using it
Some environments do not have a tmpdir so it can be null.
2014-11-20 12:01:24 +00:00
Andy Wilkinson
59ebc3b320 When Logback is the logging system, ensure that JBoss logging uses it
Previously, if Logback was being used as Boot's logging system, but
Log4J was also on the classpath before SLF4J and Logback, JBoss
Logging would use Log4J for its logging. This lead to warning messages
being produced as Log4J was not configured:

log4j:WARN No appenders could be found for logger (org.jboss.logging).
log4j:WARN Please initialize the log4j system properly.

This commit updates LogbackLoggingSystem to set the
org.jboss.logging.provider to "slf4j". This ensure that JBoss Logging
will use SLF4J and Logback as intended even when Log4J is also on the
classpath.

Closes gh-1928
2014-11-20 10:41:43 +00:00
Phillip Webb
9059c7574b Update license details
Add LICENSE.txt file and make it clear in the README file that we
are Apache 2.0

Fixes gh-1952
2014-11-18 16:28:39 -08:00
Andy Wilkinson
863c099161 Add missing copyright headers 2014-11-18 21:29:54 +00:00
Phillip Webb
0408eb413f Add profile to ConfigFileApplicationListener log
Fixes gh-1948
2014-11-18 12:04:46 -08:00
Andy Wilkinson
25c561313e Merge branch 'gh-1919' into 1.1.x 2014-11-18 11:48:57 +00:00
Andy Wilkinson
9eae29938c Test that http.mappers props are applied by JacksonAutoConfiguration
Closes gh-1919
2014-11-18 11:47:29 +00:00
Nicolás J. García
f51b304c2a Update JackonAutoConfiguration to apply all http.mappers properties
Previously, only the http.mappers.json-sort-keys property was applied
by JacksonAutoConfiguration. This commit updates it to also apply the
http.mappers.json-pretty-print property as well.

See #1919
2014-11-18 11:40:29 +00:00
Andy Wilkinson
33dfab08de Upgrade to Tomcat 7.0.57
Closes gh-1936
2014-11-18 10:45:11 +00:00
Andy Wilkinson
5bc48bee5a Upgrade to Spring AMQP 1.3.7.RELEASE
Closes gh-1906
2014-11-18 10:44:52 +00:00
Andy Wilkinson
1182495810 Upgrade to Spring Integration 4.0.5.RELEASE
Closes gh-1905
2014-11-18 10:44:32 +00:00
Andy Wilkinson
6ab47db19d Omit null pathInfo from ErrorPageFilter's error message
Fixes gh-1944
2014-11-18 10:41:27 +00:00
Andy Wilkinson
41cb567894 Don't flush in ErrorPageFilter for < 400 response that's committed
Previously, for a non-async response with a successful status (< 400),
ErrorPageFilter would always call flushBuffer. This triggers an
exception in Tomcat if the client has closed the connection before the
response has been fully sent. In this case, Tomcat treats the response
as successful and commits it before control returns to the filter.

This commit updates ErrorPageFilter to only perform the flush if the
response has not already been committed, leaving any further flushing
that may be necessary to be handled by the servlet container.

Fixes gh-1938
2014-11-18 10:23:55 +00:00
Phillip Webb
f224c7ac9e Find @ConfigurationProperties annotation on proxy
Update ConfigurationPropertiesReportEndpoint to find
@ConfigurationProperties using `context.findAnnotationOnBean` rather
than `AnnotationUtils.findAnnotation`. This will correctly find the
annotation even if the bean is an interface based proxy.

Fixes gh-1927
2014-11-17 21:29:21 -08:00
Phillip Webb
285563a509 Use embedded docbook XSLT files
Switch from external docbook XSLT to those shipped as part of the
Maven plugin.

Fixes gh-1942
2014-11-17 19:04:26 -08:00
Phillip Webb
608b1e65a1 Relax servlet check
Relax the servlet version check in Maven integration tests.

See gh-1797
2014-11-13 19:14:56 -08:00
Phillip Webb
3a9d6242ea Sync up versions used in Maven integration tests
Fixes gh-1797
2014-11-13 18:45:35 -08:00
Phillip Webb
345ced1675 Fixup version numbers following release 2014-11-11 18:05:23 -08:00
Spring Buildmaster
46b7738334 Next development version 2014-11-11 17:12:24 -08:00
Phillip Webb
52967017a0 Polish 2014-11-11 09:47:10 -08:00
Andy Wilkinson
142c183b11 Fix the ordering of versions and dependencies in the dependencies pom 2014-11-11 17:41:48 +00:00
Phillip Webb
a832944c05 Rename HtppClientOption to HttpClientOption
Fixes gh-1874
2014-11-11 09:33:29 -08:00
Andy Wilkinson
eecdb92728 Upgrade to Spring 4.0.8.RELEASE
Closes gh-1785
2014-11-11 12:31:07 +00:00
Andy Wilkinson
21adc5066e Upgrade to Spring Mobile 1.1.3.RELEASE
Closes gh-1893
2014-11-11 10:32:17 +00:00
Andy Wilkinson
f07c090876 Upgrade to Mongo Java Driver 2.12.4
The exception message for a connection timeout has been updated to
include the timeout period. The tests for the sample have been updated
accordingly.

Closes gh-1884
2014-11-11 10:10:16 +00:00
Andy Wilkinson
7e95dba52e Upgrade to Jolokia 1.2.3
Closes gh-1883
2014-11-11 10:08:58 +00:00
Andy Wilkinson
a09e8f7538 Upgrade to HornetQ 2.4.5
Closes gh-1882
2014-11-11 10:08:37 +00:00
Andy Wilkinson
4e9da8c86e Upgrade to Hibernate 4.3.7
Closes gh-1881
2014-11-11 10:08:09 +00:00
Andy Wilkinson
55f976dd6b Upgrade to Freemarker 2.3.21
Closes gh-1880
2014-11-11 10:07:49 +00:00
Andy Wilkinson
effbfb6d14 Upgrade to Groovy 2.3.7
Closes gh-1879
2014-11-11 10:07:21 +00:00
Andy Wilkinson
3647e1b0ca Upgrade to AspectJ 1.8.4
Closes gh-1878
2014-11-11 10:06:57 +00:00
Andy Wilkinson
a250e60a3e Upgrade to Apache HTTPClient 4.3.6
Closes gh-1877
2014-11-11 10:06:32 +00:00
Andy Wilkinson
38e8942696 Upgrade to Thymeleaf Layout Dialect 1.2.7
Closes gh-1876
2014-11-11 10:04:10 +00:00
Andy Wilkinson
9b6ff220a1 Upgrade to MySQL Connector 5.1.34
Closes gh-1875
2014-11-11 10:03:29 +00:00
Phillip Webb
4f67a20214 Ensure JpaUserDetailsTests closes embedded DB
Fixes gh-1712
2014-11-10 18:43:46 -08:00
Phillip Webb
b79934a7a4 Detect existing MultipartResolver beans
Update MultipartAutoConfiguration to detect any MultipartResolver beans
rather than just StandardServletMultipartResolvers.

Fixes gh-1857
2014-11-10 17:21:21 -08:00
Michael Cramer
322bdd62ef Update maven-javadoc-plugin to version 2.10.1
Closes gh-1863
2014-11-10 15:41:18 +00:00
Michael Cramer
f62664534d Update maven-dependency-plugin to version 2.9
Closes gh-1862
2014-11-10 15:40:42 +00:00
Andy Wilkinson
a9681ea032 Add note to explain that bootRun ignores output from processResources
Closes gh-1739
2014-11-10 13:29:57 +00:00
Andy Wilkinson
c3d2fb5e5c Document details of configuring Gradle to produce valid poms
If a Gradle build is using the Spring Boot Gradle plugin's support for
declaring dependencies without versions then they will be unable to
publish Maven artifacts from the build as the Gradle-generated pom
will fail to validate. This is because Gradle doesn't apply the
Boot-provided dependency versions to the dependencies in the generated
pom.

This can be addressed by configuring Gradle to generate a pom that
either imports spring-boot-dependencies into its dependency management
or that uses spring-boot-starter-parent as its parent. This commit
updates the documentation to document the need for this configuration
and to provide examples of how to do so.

Closes gh-1806
2014-11-10 12:33:25 +00:00
Andy Wilkinson
a9b88d6955 Document need for ServerEndpointExporter and show its use in a sample
Traditionally, a @ServerEndpoint-annotated bean is found by a servlet
container initialiser, however Boot does not run servlet container
initialisers when an embedded container is being used. To be able to use
@ServerEndpoint in a Boot app that uses embedded Tomcat a
ServerEndpointExporter bean must be declared.

This commit updates the documentation to describe this requirement and
also updates the WebSockets sample to illustrate the use of
ServerEndpointExporter. The version of Spring Framework has been updated
to 4.0.8.BUILD-SNAPSHOT. This picks up the fix for SPR-12340.

Closes gh-1722
2014-11-10 11:27:56 +00:00
Andy Wilkinson
595f387fb2 Correct the references to WebSecurityConfigurerAdapter in the docs
Closes gh-1861
2014-11-10 09:41:18 +00:00