Commit Graph

4325 Commits

Author SHA1 Message Date
Andy Wilkinson
3a22443fbb Upgrade to H2 1.4.186
Closes gh-2730
2015-03-26 17:18:30 +00:00
Andy Wilkinson
17f03641de Upgrade to Dropwizard Metrics 3.1.1
Closes gh-2731
2015-03-26 17:18:05 +00:00
Andy Wilkinson
9285c9fd77 Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 17:10:04 +00:00
Andy Wilkinson
fe837c0cea Upgrade to Reactor 1.1.6.RELEASE
gh-2735
2015-03-26 17:07:19 +00:00
Andy Wilkinson
de28ed4aa1 Upgrade to Groovy 2.3.11
Closes gh-2733
2015-03-26 17:04:26 +00:00
Andy Wilkinson
adbd340c91 Upgrade to Logback 1.1.3
Closes gh-2729
2015-03-26 17:03:52 +00:00
Andy Wilkinson
887a7cce1e Upgrade to SLF4J 1.7.11
Closes gh-2734
2015-03-26 17:03:23 +00:00
Andy Wilkinson
d428afb45f Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 16:32:05 +00:00
Andy Wilkinson
936e1c2152 Update to Spring Security 3.2.7.RELEASE
Closes gh-2726
2015-03-26 16:31:13 +00:00
Andy Wilkinson
644237d170 Merge branch '1.1.x' into 1.2.x 2015-03-26 16:30:04 +00:00
Andy Wilkinson
1307a2401d Upgrade Spring WS in 1.1.x as well
See gh-2718
2015-03-26 16:29:04 +00:00
Greg Turnquist
599792097c Upgrade Spring WS to 2.2.1.RELEASE
Closes gh-2718
2015-03-26 16:25:23 +00:00
Andy Wilkinson
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
Andy Wilkinson
c3a040acb3 Polishing
Remove unwanted System.out.println call
2015-03-26 10:00:35 +00:00
Stephane Nicoll
c9997f7a4d Upgrade to Spring Framework 4.1.6
Closes gh-2702
2015-03-26 10:43:29 +01:00
Phillip Webb
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
Andy Wilkinson
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
Phillip Webb
60c1a150b3 Polish 2015-03-24 20:33:40 -07:00
Phillip Webb
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
Phillip Webb
90bff0b603 Fix outdated RandomAccessJarFile documentation
Fixes gh-2598
2015-03-24 18:24:27 -07:00
Phillip Webb
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
Phillip Webb
6a6ae64aac Merge branch '1.1.x' into 1.2.x 2015-03-24 13:38:42 -07:00
Phillip Webb
4d8cf71496 Polish VcapApplicationListenerTests 2015-03-24 13:38:16 -07:00
Phillip Webb
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
Ben Hale
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
Phillip Webb
6322ea142d Upgrade to Spring Framework 4.1.6.BUILD-SNAPSHOT
See gh-2702
2015-03-23 10:23:12 -07:00
Phillip Webb
7c9ab5ced2 Minor documentation polish 2015-03-23 09:31:08 -07:00
Stephane Nicoll
a615f8a44a Merge pull request #2698 from rtack/patch-1
* gh-2698:
  fix typo in javadoc
2015-03-23 11:09:08 +01:00
Raphael Ackermann
1235a35f2a fix typo in javadoc
{@code tomat-embedded.jar} --> {@code tomcat-embedded.jar}
2015-03-23 11:08:48 +01:00
Marcel Overdijk
c0c67f2593 Update doc
Add note about escaping Spring property placeholders when using Gradle
automatic expansion.

Closes gh-2695
2015-03-22 10:07:44 +01:00
Andy Wilkinson
c1eea4cf40 Ensure that a TTL of zero is honoured by HealthMvcEndpoint
See gh-2630
2015-03-19 17:16:08 +00:00
Andy Wilkinson
c849a0aba1 Cache /health response irrespective of sensitivity and security
Previously, the response from /health was not cached if the request
was secure, i.e. the user has authenticated, or the endpoint was
configured as not being sensitive. 

The commit updates HealthMvcEndpoint to apply the caching logic
all the time. Users that do not want caching can disable it by 
configuring the TTL with a value of zero.

Closes gh-2630
2015-03-19 16:23:04 +00:00
Andy Wilkinson
0a38b9b3ab Enable the configuration of arbitrary Elasticsearch client properties
Previously, only a handful of properties could be set when
auto-configuring an Elasticsearch client. This commit introduces support
for configuring arbitrary properties using the
spring.data.elasticsearch.properties prefix. For example,
client.transport.sniff can be configured using
spring.data.elasticsearch.properties.client.transport.sniff.

Closes gh-1838
2015-03-18 14:06:11 +00:00
Andy Wilkinson
8b20403c41 Use a String when referencing a class with @ConditionalOnMissingClass
Using a Class reference can cause reflection problems at runtime (see
gh-1065).

Closes gh-2674
2015-03-18 11:16:58 +00:00
Dave Syer
c153c4e517 Make tomcat provided in a war sample 2015-03-17 16:28:22 +00:00
Andy Wilkinson
89b4cac8b0 Allow Elasticsearch client-transport-sniff to be configured via the env
Previously, a TransportClient sniff property could not be configured
while using Spring Boot’s Elasticsearch auto-configuration. This commit
adds a new property, spring.data.elasticsearch.client-transport-sniff,
that can be used to configure the TransportClient while continuing to
use the auto-configuration support.

Closes gh-1838
2015-03-17 11:48:55 +00:00
Andy Wilkinson
b82e220008 Polish spring-boot-features
Wrap at 90 chars more consistently
2015-03-17 11:26:44 +00:00
izeye
a4be4670c3 Polish the documentation
Closes gh-2570
2015-03-17 11:00:31 +00:00
Andy Wilkinson
40fd0dce3c Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-17 10:40:40 +00:00
Andy Wilkinson
1fba81e4ba Upgrade Spring Security 3.2.6.RELEASE
Closes gh-2582
2015-03-17 10:39:40 +00:00
Phillip Webb
a717813c83 Update required Spring Framework version in docs
The actual required Spring Framework version is 4.1.5.

See gh-2575
2015-03-16 23:20:41 -07:00
Phillip Webb
cac6ad21c1 Fix WebIntegrationTest JavaDoc
The example `@Value("server.local.port")` should read
`@Value("${local.server.port}")`.

Fixes gh-2628
2015-03-16 23:04:24 -07:00
Phillip Webb
16495d223a Polish 2015-03-16 14:11:43 -07:00
Phillip Webb
bdd61b8ec2 Merge branch '1.1.x' into 1.2.x 2015-03-16 13:51:57 -07:00
Phillip Webb
8b979fa2e6 Polish 2015-03-16 13:43:16 -07:00
Andy Wilkinson
1f40c8a9ba Tolerate breaking API changes in ActiveMQ 5.11.0
In ActiveMQ 5.11 the signature of
PooledConnectionFactory.setConnectionFactory has changed. It now takes
an Object rather than a ConnectionFactory. This change is not binary
backwards compatible so it causes a NoSuchMethodError as we compile
against 5.10.

This commit updates ActiveMQConnectionFactoryConfiguration to call
the setConnectionFactory method reflectively, looking for both the
ConnectionFactory and Object variants.

Closes gh-2640
2015-03-16 17:41:38 +00:00
Andy Wilkinson
78a00b1658 Polish EmbeddedServletContainer’s javadoc
Closes gh-2647
2015-03-16 17:14:10 +00:00
Andy Wilkinson
fc4376145c Process CompositePropertySources before EnumerablePropertySources
PropertySourcePropertyValues tries to process a PropertySource first
as an EnumerablePropertySource and then as a CompositePropertySource.
In Spring 4.1.2 CompositePropertySource was updated to extend
EnumerablePropertySource. This change meant that a
CompositePropertySource would always be processed as an
EnumerablePropertySource.

This commit updates PropertySourcePropertyValues to process a
PropertySource as a CompositePropertySource first and to then try it
is an EnumerablePropertySource.

Fixes gh-2608
2015-03-16 17:07:21 +00:00
Dave Syer
f1ecf53495 Delay instantiation of DataSource as late as possible
Unfortunately it still has to happen in a @PostConstruct (otherwise
JPA never sees the schema in time), but we can delay a bit by not
using @Autowired. Appears to fix the Spring Cloud problem
(https://github.com/spring-cloud/spring-cloud-config/issues/105).

Fixes gh-2658
2015-03-16 09:18:00 +00:00
Eric Dahl
018310e478 Fix broken link in docs 2015-03-10 08:21:21 +01:00