Commit Graph

27490 Commits

Author SHA1 Message Date
Phillip Webb
68983400fb Propogate startup failures to management context
Update EndpointWebMvcAutoConfiguration so that ApplicationFailedEvents
cause the management context to close.

Prior to this commit if an application failed to start (for example
because `server.port` was already in use) the management context would
remain open and the application would not exit.

Fixes gh-5388
2016-05-16 17:26:03 -07:00
Phillip Webb
f0b6d346d7 Filter scoped target proxy beans from Mockito
Update MockitoPostProcessor to filter bean names that match
`ScopedProxyUtils.isScopedTarget` from the candidates list.

Fixes gh-5724
2016-05-16 13:56:13 -07:00
Phillip Webb
682f20ebf7 Merge pull request #5972 from izeye/test-20160514
* pr/5972:
  Fix Mockito tests to align with name and comments
2016-05-16 13:22:31 -07:00
Johnny Lim
5759f685e5 Fix Mockito tests to align with name and comments
Fixup Mockto tests where the test implementation didn't align with the
name of the test or the test Javadoc.

Closes gh-5972
2016-05-16 13:20:01 -07:00
Phillip Webb
2fc86b2d5a Only attempt mock reset on instantiated singletons
Update ResetMocksTestExecutionListener to only attempt a mock reset when
a singleton has actually been created.

Fixes gh-5870
2016-05-16 13:03:04 -07:00
Phillip Webb
bcfa2e6676 Make TestRestTemplate not extend RestTemplate
Update TestRestTemplate so that it no longer directly extends
RestTemplate. Prior to this commit it was possible that TestRestTemplate
could interfere with user defined RestTemplate beans.

TestRestTemplate offers the same methods as RestTemplate so should be
a drop-in replacement. If access is needed to the actual underlying
template the `getRestTemplate()` method should be used.

Fixes gh-5915
2016-05-16 12:35:31 -07:00
Andy Wilkinson
1947b92481 Avoid exception from dropping non-existent constraint in Data REST sample
Hibernate 5.1 logs an ugly but benign exception when using an in-memory
HSQL database when it tries to drop a non-existent constraint.

This commit changes the Spring Data REST sample to use H2 rather than
HSQL. This prevents the unwanted exception from occurring as Hibernate's
H2 dialect returns false from dropConstraints.
2016-05-16 20:27:35 +01:00
Phillip Webb
00fbb5c3d9 Polish 2016-05-16 12:00:03 -07:00
Dave Syer
46134b58b8 Fix stupid checkstyle violations 2016-05-16 14:52:11 +01:00
Dave Syer
684c8c81a3 Extract user info rest template into a factory
Instead of using a @Bean, it is better to use an opaque factory
for an internal dependency that users are not going to want in
the context. OAuth2RestTemplate is a common enough bean type that
creating on in autoconfig makes it hard for users to add their own
for business use.

See gh-5967
2016-05-16 14:06:54 +01:00
Stephane Nicoll
3734b666df Merge pull request #5975 from caseyscarborough:remove-unchecked-casts
* pr/5975:
  Remove unchecked casts
2016-05-16 13:53:41 +02:00
Casey Scarborough
84d3b6a41a Remove unchecked casts
Closes gh-5975
2016-05-16 13:53:18 +02:00
Phillip Webb
4023637b07 Remove accidentally comitted SampleTest 2016-05-14 11:28:42 -07:00
Phillip Webb
cd365bcae1 Improve @PropertyMapping error message
Improve the message thrown when a @PropertyMapping is used in
combination with a @Component to include the actual annotations that
are causing the problem.

Fixes gh-5897
2016-05-13 20:09:03 -07:00
Phillip Webb
66b69f4346 Deprecate setProperties on ConfigurationFactory
Deprecate `PropertiesConfigurationFactory.setProperties()` since it was
only being used in tests.

Fixes gh-5930
2016-05-13 20:09:03 -07:00
Phillip Webb
c15c146021 Cache resolved error template view names
Fixes gh-5933
2016-05-13 20:09:02 -07:00
Johnny Lim
29898c73d3 Remove superflous if in MockitoPostProcessor
The `if` in registerSpies() is not required as it's covered by the
Assert check.

Closes gh-5889
2016-05-13 20:09:02 -07:00
Phillip Webb
6cdbdf9ad3 Polish 2016-05-13 20:09:02 -07:00
Vedran Pavic
a1ac934bee Ignore special variable related JVM output in CommandLineInvoker
Closes gh-5883
2016-05-13 16:31:49 +01:00
Andy Wilkinson
9e4eb037f6 Improve diagnostics for start failures in TomcatStarter
Closes gh-5934
2016-05-13 16:27:23 +01:00
Stephane Nicoll
00f9adafd7 Stop creating a primary Oauth2RestTemplate
This commit removes the creation of a `@Primary` `OAuth2RestTemplate`
and updates the documentation accordingly.

Once #5507 is implemented we could revisit this area to provide a way for
users to easily create such a bean.

Closes gh-5202
2016-05-13 17:26:22 +02:00
Andy Wilkinson
c11b28c3c7 Align default for OPTIONS request dispatching with Spring Framework 4.3
Closes gh-5965
2016-05-13 16:19:10 +01:00
Stephane Nicoll
dcb4fe8304 Add JMX support to the Spring Integration starter
Closes gh-1440
2016-05-13 16:33:35 +02:00
Andy Wilkinson
c820d94f1a Upgrade to Webjars Locator 0.31
Closes gh-5964
2016-05-13 13:40:48 +01:00
Andy Wilkinson
0838a37fad Upgrade to Neo4J OGM 2.0.2
Closes gh-5963
2016-05-13 13:40:33 +01:00
Andy Wilkinson
1c9721102e Upgrade to MariaDB Java Client 1.4.4
Closes gh-5962
2016-05-13 13:40:33 +01:00
Andy Wilkinson
a4f3843fc1 Upgrade to Liquibase 3.5.1
Closes gh-5961
2016-05-13 13:40:33 +01:00
Andy Wilkinson
769c1206c8 Upgrade to JBoss Transaction SPI 7.3.1.Final
Closes gh-5960
2016-05-13 13:40:19 +01:00
Andy Wilkinson
78d65f793a Upgrade to Inifispan 8.2.1.Final
Closes gh-5959
2016-05-13 13:40:19 +01:00
Andy Wilkinson
7ee4aa4f14 Upgrade to SolrJ 5.5.1
Closes gh-5958
2016-05-13 13:40:18 +01:00
Andy Wilkinson
62eeeb8af7 Upgrade to ActiveMQ 5.13.3
Closes gh-5957
2016-05-13 13:40:18 +01:00
Andy Wilkinson
dfb422a7ce Upgrade to Thymeleaf Layout Dialect 1.4.0
Closes gh-5955
2016-05-13 13:40:18 +01:00
Andy Wilkinson
eab9b246cd Upgrade to Hazelcast 3.6.2
Closes gh-5953
2016-05-13 13:07:10 +01:00
Andy Wilkinson
3ab3fe8dc4 Upgrade to App Engine API 1.9.37
Closes gh-5952
2016-05-13 13:06:32 +01:00
Andy Wilkinson
3cb2f92810 Upgrade to Caffeine 2.3.0
Closes gh-5951
2016-05-13 13:06:01 +01:00
Andy Wilkinson
f39c402e09 Upgrade to Couchbase Java Client 2.2.7
Closes gh-5950
2016-05-13 13:05:32 +01:00
Andy Wilkinson
9cca866c11 Upgrade to jOOQ 3.8.0
Closes gh-5940
2016-05-13 13:05:07 +01:00
Andy Wilkinson
87a2f4cbb9 Merge branch '1.3.x' 2016-05-13 12:27:46 +01:00
Andy Wilkinson
ae89cb0355 Upgrade to Spring Integration 4.2.6.RELEASE
Closes gh-5949
2016-05-13 11:59:07 +01:00
Andy Wilkinson
b07fa75664 Upgrade to jOOQ 3.7.4
Closes gh-5947
2016-05-13 11:58:40 +01:00
Andy Wilkinson
1b8ffe8f74 Upgrade to MySQL Java Connector 5.1.39
Closes gh-5946
2016-05-13 11:58:03 +01:00
Andy Wilkinson
5484000651 Upgrade to HikariCP 2.4.6
Closes gh-5945
2016-05-13 11:57:35 +01:00
Andy Wilkinson
183613a5ca Merge branch '1.3.x' 2016-05-13 11:41:58 +01:00
Andy Wilkinson
4c65e5e704 Always handle quoted arguments correctly in the launch script
Previously, arguments passed to the script were handled in one way
if a service was being started using start-stop-daemon and in another
way if start-stop-daemon wasn’t available or the application is being
launched in run mode. This meant that quoted arguments were only 
handled correctly when the application was being started using
start-stop-daemon.

This commit updates the launch script so that argument handling is
the same across all three different way that the application can be
launched.

Closes gh-5942
2016-05-13 11:13:54 +01:00
Stephane Nicoll
2b006aacb3 Validate Spring Session has been configured
This commit validates that a `SessionRepository` has been configured if
Spring Boot is meant to auto-configure one.

Closes gh-5943
2016-05-13 12:07:40 +02:00
Stephane Nicoll
5deca28a9d Improve upgrade path for Spring Session
Commit b7e7bcf made `spring.session.store-type` explicit which means that
users of Spring Session in 1.3 have to set that property to restore the
auto-configuration support in 1.4.

This commit implicitly set the store type to redis if redis is present
and log a warning inviting the user to actually specify that in
configuration.

The entry in the auto-configuration report also mentions that such
arrangement is deprecated.

Closes gh-5838
2016-05-13 11:19:02 +02:00
Stephane Nicoll
72854745c5 Merge pull request #5938 from shakuzen:patch-11
* pr/5938:
  Polish Maven plugin doc
2016-05-13 09:50:25 +02:00
Tommy Ludwig
bae567992d Polish Maven plugin doc
Closes gh-5938
2016-05-13 09:49:57 +02:00
Stephane Nicoll
1e85577924 Add reference to JSF starter
Closes gh-5932
2016-05-13 09:46:39 +02:00
Stephane Nicoll
a258a1045c Merge pull request #5931 from Shredder121-me:assert-usage
* pr/5931:
  Fix incorrect usage of Assert.notNull()
2016-05-13 09:24:20 +02:00