Commit Graph

27490 Commits

Author SHA1 Message Date
Dave Syer
de6c582c9e Merge remote-tracking branch 'origin/1.3.x' 2016-05-04 21:16:32 +01:00
Dave Syer
905451f92e That BaseConfiguration thing didn't work out after all
It seems like a base class that defines `@Beans` just doesn't
define any beans. Oh well, time to copy-paste.
2016-05-04 21:01:40 +01:00
Andy Wilkinson
79b81a95c8 Use SpringBootContextLoader for tests annotated with @WebMvcTest
Previously, tests annotated with @WebMvcTest would use Spring
Framework’s WebDelegatingSmartContextLoader. This meant that
SpringApplication was not used to create the application context. One
effect of this was that Spring Boot’s logging system was not initialized
and large quantities of debug log output was produced due to Logback’s
default behaviour.

This commit updates WebMvcTestContextBootstrapper so that it uses
SpringBootContextLoader. This aligns the behaviour of @WebMvcTest
with the behaviour of @SpringBootTest and @DataJpaTest.

Closes gh-5847
2016-05-04 17:15:16 +01:00
Dave Syer
e58bef5f2b Merge remote-tracking branch 'origin/1.3.x' 2016-05-04 14:23:14 +01:00
Dave Syer
1babdd5c2e Remove log config for non boot things 2016-05-04 14:22:41 +01:00
Dave Syer
a86796f126 Merge remote-tracking branch 'origin/1.3.x'
Conflicts:
	spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
2016-05-04 14:14:19 +01:00
Dave Syer
e98264debf Move base configuration class to a separate file
to stop it from being included in the enclosing @Configuration.

That way, if the app is not a web app, then there really is a
client_credentials OAuth2 resource (as claimed in the user guide).

Fixes gh-5735
2016-05-04 14:02:00 +01:00
Stephane Nicoll
04c53eab2f Merge pull request #5852 from izeye/ssl
* pr/5852:
  Polish "Fix customization of Jetty's SSL trust store"
  Fix customization of Jetty's SSL trust store
2016-05-04 09:59:07 +02:00
Stephane Nicoll
fb9a61cd85 Polish "Fix customization of Jetty's SSL trust store"
Closes gh-5852
2016-05-04 09:58:52 +02:00
Johnny Lim
727dd12852 Fix customization of Jetty's SSL trust store
See gh-5852
2016-05-04 09:32:58 +02:00
Andy Wilkinson
e8e728106e Don’t expect a charset attribute on a text/css Content-Type
Following the encoding change made in 428a10a, the character encoding
of a response is no longer forced.

See gh-5459
2016-05-03 22:07:22 +01:00
Stephane Nicoll
e71cea55ba Remove useless import 2016-05-03 17:27:14 +02:00
Stephane Nicoll
428a10a7d7 Only force request encoding
A recent Spring Framework change in `CharacterEncodingFilter` allows to
configure the force flag separately for requests and responses. This
commit enables the flag only for requests which should provide a better
default with binary content.

Closes gh-5459
2016-05-03 17:24:57 +02:00
Andy Wilkinson
f8a4459aa1 Ensure that logfile endpoint documentation has some log entries to use
Closes gh-5848
2016-05-03 15:13:34 +01:00
Stephane Nicoll
6f4ec4e741 Inject ApplicationEventPublisher
Previously, the auto-configured
`OAuth2ClientAuthenticationProcessingFilter` instance had no
`ApplicationEventPublisher`. As a result, no event was fired. This commit
makes sure to associate the event publisher instance.

Closes gh-5853
2016-05-03 15:44:05 +02:00
Andy Wilkinson
5a730a916c Remove dependency management for jackson-datatype-jdk7
jackson-datatype-jdk7 has been dropped in Jackson 2.7 as the
functionality is now part of the databind module.

Closes gh-494
2016-05-03 11:33:11 +01:00
Stephane Nicoll
502d14cfce Merge pull request #5843 from izeye/polish-20160503
* pr/5843:
  Polish
2016-05-03 09:33:47 +02:00
Johnny Lim
7763c2ae4c Polish
Closes gh-5843
2016-05-03 09:33:32 +02:00
Phillip Webb
a75858ea01 Merge pull request #5832 from htynkn/duplicate-entries-in-appendix-e
* pr/5832:
  Fix duplicate entries in Appendix E
2016-05-02 17:54:18 -07:00
Yunkun Huang
30505d8a5e Fix duplicate entries in Appendix E
Fixes gh-5827
Closes gh-5832
2016-05-02 17:53:08 -07:00
Phillip Webb
30e295b5c4 Fix spring-boot-sample-test dependencies 2016-05-02 17:34:00 -07:00
Phillip Webb
cc27a0f22b Merge pull request #5828 from izeye/optional
* pr/5828:
  Make json-path and selenium-api optional
2016-05-02 17:18:20 -07:00
Johnny Lim
06143195d0 Make json-path and selenium-api optional
Make json-path and selenium-api optional in spring-boot-test and
spring-boot-test-autoconfigure.

Fixes gh-5828
2016-05-02 17:17:29 -07:00
Phillip Webb
14d7188521 Merge pull request #5830 from vpavic/audit-listener
* pr/5830:
  Allow customization of AuditListener
2016-05-02 17:16:15 -07:00
Vedran Pavic
0b70710bbc Allow customization of AuditListener
Introduce `AbstractAuditListener` so that users can extended it to
replace the auto-configured default.

Fixes gh-5830
2016-05-02 17:15:23 -07:00
Phillip Webb
6c21ba11da Merge pull request #5831 from gavvvr/patch-1
* pr/5831:
  Update getting-started.adoc
2016-05-02 17:11:29 -07:00
Kirill Gavrilov
f889cb4d58 Update getting-started.adoc
Fixed path for bash completions

Closes gh-5831
2016-05-02 17:11:04 -07:00
Phillip Webb
50de70e2eb Merge pull request #5836 from izeye/polish-20160502
* pr/5836:
  Polish
2016-05-02 17:08:57 -07:00
Johnny Lim
e5715df7e3 Polish
Closes gh-5836
2016-05-02 17:08:34 -07:00
Phillip Webb
02bd3dc62d Add @AutoConfigureCache annotation
Add @AutoConfigureCache annotation to configure the specific cache
manager to use with a test. By default the NoOpCacheManager is used.

The @JsonTest, @DataJpaTest and @WebMvcTests have also been updated to
use the annotation.

Fixes gh-5765
2016-05-02 17:02:18 -07:00
Phillip Webb
f51d9d3b99 Ignore dump.rdb files 2016-05-02 16:43:11 -07:00
Phillip Webb
2d243f0668 Don't apply multiple session configurations
Add additional @ConditionalOnMissingBean guards to session
configurations to ensure that the first wins. Also reorder imports
to prefer Redis over JDBC.

See gh-5158
2016-05-02 16:42:40 -07:00
Phillip Webb
6466c0afa5 Polish 2016-05-02 14:44:15 -07:00
Stephane Nicoll
322b1b2f65 Merge pull request #5158 from shakuzen/session-autoconfig-enhance
* gh-5158:
  Polish spring session auto-configuration
  Polish session auto-configuration
  Spring Session auto-configuration expansion
2016-05-02 15:03:21 +02:00
Stephane Nicoll
bf89c8ee46 Polish spring session auto-configuration
This commit improves the initial submission by adding more tests and
more configuration options.

Closes gh-5158
2016-05-02 15:02:53 +02:00
Eddú Meléndez
0be00e2a6d Polish session auto-configuration
See gh-5158
2016-05-02 14:33:24 +02:00
Tommy Ludwig
de007840a8 Spring Session auto-configuration expansion
This implementation was inspired in large part by the cache
auto-configuration. In addition to the originally supported Redis, now
Hazelcast, an in-memory map, as well as a no-op option are supported. It
should be easy to extend this to include additional data stores in the
future.

Closes gh-3811
2016-05-02 14:33:24 +02:00
Stephane Nicoll
c3e8cc2150 Merge branch '1.3.x' 2016-05-02 14:18:59 +02:00
Stephane Nicoll
42af5ebc2c Fix class name
Closes gh-5823
2016-05-02 14:17:48 +02:00
Stephane Nicoll
248bad34dc Fix RedisProperties link in the doc
Closes gh-5811
2016-05-02 14:15:55 +02:00
Stephane Nicoll
9059184a6a Clarify commons-pool2 requirement for redis
`JedisConnectionFactory` needs `commons-pool2` for quite some time now
and our auto-configuration had a special case to handle redis if
`commons-pool2` isn't available.

This commit removes that code as using it would lead to a failure anyway.

Closes gh-5718
2016-05-02 14:12:18 +02:00
Stephane Nicoll
6fe9177f0d Merge branch '1.3.x' 2016-05-02 10:40:27 +02:00
Stephane Nicoll
4ccc7dc554 Ignore invalid accessors
Previously, if a void method with a single argument was named "set", the
annotation processor wrongly considered it was a setter candidate. This
commit updates the condition to ignore it.

Closes gh-5826
2016-05-02 10:38:19 +02:00
Stephane Nicoll
cfbe28fc8f Merge pull request #5815 from izeye/polish-20160428
* pr/5815:
  Polish
2016-04-30 10:24:48 +02:00
Johnny Lim
0efa0038c3 Polish
Closes gh-5815
2016-04-30 10:24:33 +02:00
Stephane Nicoll
373cf83f99 Merge branch '1.3.x' 2016-04-30 10:21:50 +02:00
Cristian Greco
5d55d57f78 Fix doc about running native commands
Closes gh-5829
2016-04-30 10:21:41 +02:00
Stephane Nicoll
ebb4b067a2 Use error attributes in custom error page 2016-04-30 10:04:35 +02:00
Phillip Webb
6d069de79f Add convention based status error pages
Update `spring-boot-sample-web-mustache` to show how convention based
status error pages can be used.

See gh-2691
2016-04-29 14:03:27 -07:00
Phillip Webb
0bf025af7b Add out-of-the-box support for status error pages
Allow convention based status error pages. Static HTML or templates
can be used by placing the appropriately named file under a `/error`
folder. For example:

	/src/main/resource/templates/error/404.ftl
or	/src/main/resource/public/error/404.html

Pages can also be named after the status series (5xx or 4xx).

Fixes gh-2691
2016-04-29 14:02:59 -07:00