c8c2eea03e
Upgrade to Spring Integration 4.1.3.RELEASE
...
Closes gh-2782
2015-04-07 11:04:22 +01:00
23da4ab95d
Update to Spring AMQP 1.4.4.RELEASE
...
Closes gh-2781
2015-04-07 11:03:46 +01:00
ddeebf2262
Update to Tomcat 8.0.21
...
Closes gh-2775
2015-04-07 11:01:19 +01:00
adaf175273
Clarified the naming scheme for starters
...
Initial update to the documentation to mention how a 3rd party starter
should be named. The current doc sends a completely inconsistent message
to what we actually intend.
See gh-2537
2015-04-03 10:24:11 +02:00
fa0a2f39c5
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/build.gradle
spring-boot-samples/spring-boot-sample-actuator/build.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hateoas/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/build.gradle
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/build.gradle
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-velocity/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/build.gradle
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
2015-03-30 23:25:53 -07:00
42e69359a8
Fixup version numbers following release
2015-03-30 23:25:03 -07:00
4b7c62008f
Fixup version numbers following release
2015-03-30 23:24:19 -07:00
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
cddf54e576
Revert "Upgrade to H2 1.4.186"
...
This reverts commit 3a22443fbb
2015-03-30 22:01:01 -07:00
b8d2a55b30
Next development version
2015-03-30 18:23:16 -07:00
495a79c324
Document logging properties with @PropertySource
...
Add a note to the logging documentation to point out a potential gotcha.
Fixes gh-2709
2015-03-30 16:59:33 -07:00
18afe8bd0c
Fixup incorrect property name
...
The property in XADataSourceAutoConfigurationTests should be
`data-source-class-name`. Previously the `-name` was missing.
2015-03-30 16:45:02 -07:00
b3d8e32ccf
Fix overlapping property name binding to Maps
...
Update RelaxedDataBinder so that multiple overlapping nested property
names can be bound to a Map.
Prior to this commit, properties of the following form could not be
bound to Maps:
foo: baz
foo.bar: spam
This was due to BeanWrapperImpl throwing an InvalidPropertyException
when binding `map[foo][bar]` because `foo` is already bound to `baz`.
The updated code now detects such cases and instead uses the binding
property `map[foo.bar]`.
Fixes gh-2610
2015-03-30 16:44:00 -07:00
e3f203a8a5
Polish
2015-03-30 10:22:54 -07:00
441beee2fa
Merge branch '1.1.x' into 1.2.x
2015-03-30 10:07:26 -07:00
cbf82c4793
Fix typo in gradle plugin documentation
...
(cherry-picked from commit 99f1c7b
2015-03-30 10:06:39 -07:00
0b61457d40
Merge branch '1.1.x' into 1.2.x
2015-03-30 13:31:51 +01:00
617b859842
Reinstate chapter titles in the PDF version of the reference guide
...
Closes gh-2723
2015-03-30 13:31:09 +01:00
c3571d416a
Improve YAML-based configuration of Tomcat compression
...
Tomcat uses the strings “on” and “off” to enable and disable
compression. YAML interprets on as true and off as false, leaving
ServerProperties.Tomcat.compression configured with “true” and “false”
respectively. One solution is to use “on” rather than on and “off”
rather than off in the YAML file but users may not realise that they
need to do so.
This commit updates the connector customiser that configures compression
to map “true” to “on” and “false” to “off”.
Closes gh-2737
2015-03-30 10:56:07 +01:00
527850ae55
Align default context path expectation with Undertow 1.1.3's behaviour
...
When configured with a context path of "", Undertow 1.1.3 changes the
context path to be "/". The change [1] was made to fix UNDERTOW-350
[2].
[1] 3db7707b8bhttps://issues.jboss.org/browse/UNDERTOW-350
See gh-2732
2015-03-26 18:53:28 +00:00
0da24f82e3
Polishing: move tests for mustache.web into the correct package
2015-03-26 18:02:43 +00:00
dd748eda19
Use the configured charset, if any, in MustacheViewResolver
...
Closes gh-2670
2015-03-26 18:02:37 +00:00
2cf23e08a0
Upgrade to Undertow 1.1.3.Final
...
Closes gh-2732
2015-03-26 17:18:51 +00:00
3a22443fbb
Upgrade to H2 1.4.186
...
Closes gh-2730
2015-03-26 17:18:30 +00:00
17f03641de
Upgrade to Dropwizard Metrics 3.1.1
...
Closes gh-2731
2015-03-26 17:18:05 +00:00
9285c9fd77
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
spring-boot-dependencies/pom.xml
2015-03-26 17:10:04 +00:00
fe837c0cea
Upgrade to Reactor 1.1.6.RELEASE
...
gh-2735
2015-03-26 17:07:19 +00:00
de28ed4aa1
Upgrade to Groovy 2.3.11
...
Closes gh-2733
2015-03-26 17:04:26 +00:00
adbd340c91
Upgrade to Logback 1.1.3
...
Closes gh-2729
2015-03-26 17:03:52 +00:00
887a7cce1e
Upgrade to SLF4J 1.7.11
...
Closes gh-2734
2015-03-26 17:03:23 +00:00
d428afb45f
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
spring-boot-dependencies/pom.xml
2015-03-26 16:32:05 +00:00
936e1c2152
Update to Spring Security 3.2.7.RELEASE
...
Closes gh-2726
2015-03-26 16:31:13 +00:00
644237d170
Merge branch '1.1.x' into 1.2.x
2015-03-26 16:30:04 +00:00
1307a2401d
Upgrade Spring WS in 1.1.x as well
...
See gh-2718
2015-03-26 16:29:04 +00:00
599792097c
Upgrade Spring WS to 2.2.1.RELEASE
...
Closes gh-2718
2015-03-26 16:25:23 +00:00
6d2bb68aba
Ensure that ErrorPageFilter handles errors during async dispatch
...
Previously, the ErrorPageFilter was not invoked for async dispatches.
This meant that an error that was set during an async dispatch would
go undetected and a 200 response with an empty body would be returned.
This commit updates ErrorPageFilter to configure its
OncePerRequestFilter so that async dispatches are filtered and the
correct error handling is performed.
Closes gh-2711
2015-03-26 11:30:22 +00:00
c3a040acb3
Polishing
...
Remove unwanted System.out.println call
2015-03-26 10:00:35 +00:00
c9997f7a4d
Upgrade to Spring Framework 4.1.6
...
Closes gh-2702
2015-03-26 10:43:29 +01:00
35bfa16315
Use file based loader with MockServletContext
...
Update SpringApplicationContextLoader so that the MockServletContext
uses FileSystemResourceLoader. This allows `/src/main/webapp` folder
to be found.
See gh-2654
2015-03-25 11:06:41 -07:00
219317e8c7
Make web security config require spring-security-web on classpath
...
Previously, SpringBootWebSecurityConfiguration required a web
application and @EnableWebSecurity to be on the classpath.
@EnableWebSecurity is in spring-security-config so this could lead
to the configuration being active when spring-security-web isn't
on the classpath but the rest of Spring Security is.
This commit updates SpringBootWebSecurityConfiguration to also make it
conditional on a class in spring-security-web.
Fixes gh-2717
2015-03-25 17:22:30 +00:00
60c1a150b3
Polish
2015-03-24 20:33:40 -07:00
bd2735ad66
Add alwaysMapUrl flag to ServletRegistrationBean
...
Add an additional constructor to ServletRegistrationBean that indicates
if a URL mapping is always required. If set to false, the registration
will not longer use the default '/*' mapping.
Fixes gh-2596
2015-03-24 20:14:35 -07:00
90bff0b603
Fix outdated RandomAccessJarFile documentation
...
Fixes gh-2598
2015-03-24 18:24:27 -07:00
4c50c9eaa8
Allow basic SystemPublicMetrics on GAE
...
Update SystemPublicMetrics to silently ignore ManagementFactory
NoClassDefFoundErrors which can occur when deploying to Google App
Engine.
Fixes gh-2701
2015-03-24 13:56:12 -07:00
6a6ae64aac
Merge branch '1.1.x' into 1.2.x
2015-03-24 13:38:42 -07:00
4d8cf71496
Polish VcapApplicationListenerTests
2015-03-24 13:38:16 -07:00
6d880cf7f8
Merge pull request #2707 from nebhale/vcap-service-numbers
...
* vcap-service-numbers:
Support VcapApplicationListener Number Credentials
2015-03-24 13:32:02 -07:00
147755f396
Support VcapApplicationListener Number Credentials
...
Update VcapApplicationListener to support Number based credentials.
Previously, any service credential value that wasn't a String would
be discarded. This was particularly a problem for services that exposed
a port as a JSON Number. This change takes numbers in the credential
payload into account, converting them to Strings so that they will pass
through the properties system properly. There's no real downside to this
as Spring will coerce them back into Numbers if needed by an application.
Fixes gh-2707
2015-03-24 13:30:46 -07:00
6322ea142d
Upgrade to Spring Framework 4.1.6.BUILD-SNAPSHOT
...
See gh-2702
2015-03-23 10:23:12 -07:00
7c9ab5ced2
Minor documentation polish
2015-03-23 09:31:08 -07:00
Andy Wilkinson
Stephane Nicoll
Phillip Webb
Spring Buildmaster
Dave Syer
Marcin Zajączkowski
Greg Turnquist
Ben Hale