Commit Graph

10901 Commits

Author SHA1 Message Date
Stephane Nicoll
3c956441b5 Merge branch '1.5.x' 2017-02-17 10:33:08 +01:00
Stephane Nicoll
121ab0a71e Merge branch '1.4.x' into 1.5.x 2017-02-17 10:32:49 +01:00
Stephane Nicoll
461d5613ab Merge pull request #8319 from vpavic:fix-docs
* pr/8319:
  Fix audit events related documentation
2017-02-17 10:30:38 +01:00
Vedran Pavic
1c8f1c709c Fix audit events related documentation
Closes gh-8319
2017-02-17 10:30:07 +01:00
Andy Wilkinson
ff9788c625 Merge branch '1.5.x' 2017-02-16 09:46:26 +00:00
Andy Wilkinson
f67dd957b1 Ignore excludeDevtools on extension when it has been set on bootRepackage
Previously, bootRepackage's excludeDevtools property would be
overridden by the springBoot extension's excludeDevtools property.
This prevented devtools from being included by configuring it on the
repackaging task.

This commit corrects the logic so that the setting on the repackaging
task takes priority. It also adds some tests to verify the behaviour.

Closes gh-8308
2017-02-16 09:45:51 +00:00
Stephane Nicoll
4304cdb91a Merge branch '1.5.x' 2017-02-16 10:08:02 +01:00
Stephane Nicoll
f57ddff478 Remove dead code
Closes gh-8305
2017-02-16 10:04:57 +01:00
Madhura Bhave
b4134e239e Add autoconfiguration for JWKTokenStore
If `jwk.key-set-uri` is present.

Closes gh-4437
2017-02-15 12:05:29 -08:00
Andy Wilkinson
04a87ee4c1 Merge branch '1.5.x' 2017-02-15 17:25:18 +00:00
Andy Wilkinson
01729cc1d2 Merge branch '1.4.x' into 1.5.x 2017-02-15 17:25:07 +00:00
Andy Wilkinson
9e1238e286 Consider resource loader path when checking Groovy template availability
Closes gh-8304
2017-02-15 17:24:57 +00:00
Stephane Nicoll
4301265dba Merge branch '1.5.x' 2017-02-15 17:24:20 +01:00
Stephane Nicoll
d4d45a1009 Merge branch '1.4.x' into 1.5.x 2017-02-15 17:24:04 +01:00
Stephane Nicoll
abc9f7c1e1 Merge pull request #8300 from izeye:patch-22
* pr/8300:
  Fix a broken AsciiDoc attribute declaration
2017-02-15 17:23:51 +01:00
Johnny Lim
0f5fefd561 Fix a broken AsciiDoc attribute declaration
Closes gh-8300
2017-02-15 17:23:33 +01:00
Andy Wilkinson
e9c3568fa3 Upgrade to Hibernate 5.2.7.Final
This commit also removes the exclusion of cdi-api. It is no longer
required as https://hibernate.atlassian.net/browse/HHH-11370 has been
fixed in 5.2.7.

Closes gh-8111
2017-02-15 15:05:45 +00:00
Andy Wilkinson
6e6d9e4edd Move RandomValuePropertySource into org.springframework.boot.env
Closes gh-8249
2017-02-15 12:58:56 +00:00
Andy Wilkinson
57fe8b966e Use Spring Session's defaults for its filter's dispatcher types
Closes gh-8288
2017-02-15 12:24:01 +00:00
Andy Wilkinson
fe6320db42 Align Security filter dispatcher types with Spring Security's defaults
Closes gh-8289
2017-02-14 17:02:36 +00:00
Andy Wilkinson
f57dae639d Align default Filter dispatcher types with the Servlet spec
The Servlet spec states that the default is REQUEST. This commit
aligns Spring Boot with that default.

Closes gh-7467
2017-02-14 16:50:49 +00:00
Andy Wilkinson
d1a77b6489 Add dependency management for Lettuce
Closes gh-8287
2017-02-14 15:07:38 +00:00
Stephane Nicoll
7cb451b934 Merge branch '1.5.x' 2017-02-14 15:16:42 +01:00
Stephane Nicoll
7920543480 Add note regarding the detection of spring.jpa.database
Closes gh-8253
2017-02-14 15:16:17 +01:00
Brian Clozel
a5bdbd0dc2 Introduce EmbeddedWebServerInitializedEvent
This commit adds `EmbeddedWebServerInitializedEvent`, which holds the
`EmbeddedWebServer` information when the application context starts.
The `EmbeddedServletContainerInitializedEvent` now inherits from that
type and holds additional information, the
`EmbeddedWebApplicationContext`.

Closes gh-8208
2017-02-14 14:30:49 +01:00
Stephane Nicoll
924397ff94 Merge branch '1.5.x' 2017-02-14 13:32:50 +01:00
Stephane Nicoll
6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
2017-02-14 13:31:57 +01:00
Andy Wilkinson
54b95973bb Merge branch '1.5.x' 2017-02-14 11:23:36 +00:00
Andy Wilkinson
e2a12e77b7 Merge branch '1.4.x' into 1.5.x 2017-02-14 11:23:25 +00:00
Andy Wilkinson
6f3b4db7b3 Merge pull request #8263 from Johnny Lim
* gh-8263:
  Tests that lists of lists are sanitized correctly
  Ensure that entries in a list of lists are not lost during sanitization
2017-02-14 11:23:02 +00:00
Andy Wilkinson
bbe9394228 Tests that lists of lists are sanitized correctly
See gh-8263
2017-02-14 11:22:04 +00:00
Johnny Lim
88afc43d44 Ensure that entries in a list of lists are not lost during sanitization
Closes gh-8263
See gh-8197
2017-02-14 11:20:14 +00:00
Stephane Nicoll
ce6372c46f Add support of reactive repositories with @DataMongoTest
Closes gh-8280
2017-02-14 11:21:51 +01:00
Stephane Nicoll
50553137d3 Merge branch '1.5.x' 2017-02-14 10:32:48 +01:00
Stephane Nicoll
a0ef61a27d Enable proxy target class for MethodValidationPostProcessor
Closes gh-8277
2017-02-14 10:32:26 +01:00
Andy Wilkinson
c99ac2f13d Merge branch '1.5.x' 2017-02-13 15:03:09 +00:00
Andy Wilkinson
4aecf19c92 Merge branch '1.4.x' into 1.5.x 2017-02-13 15:02:57 +00:00
Andy Wilkinson
9499658bc3 Revert "Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT"
This reverts commit 661940033a.

See gh-8248
2017-02-13 15:01:25 +00:00
Andy Wilkinson
f9015be619 Merge branch '1.5.x' 2017-02-13 12:37:15 +00:00
Andy Wilkinson
e0b355d313 Avoid ClassNotFoundException caused by areturn verification
The verifier's type checker is required to check that a type returned
from a method (an areturn instruction) is assignable to the method's
declared return type. When the return type is an interface, the JLS
states that it should be treated as java.lang.Object. This means that
no analysis of the type being returned is required and verification
passes. When the return type is a class, the type being returned must
be analyzed to ensure that it is compatible. This analysis causes the
return type to be loaded during verification.

Prior to this commit, BasicBatchConfigurer's
createAppropriateTransactionManager method had a return type of
AbstractPlatformTransactionManager and a branch that could return
a JpaTransactionManager. This caused the verifier to attempt to load
JpaTransactionManager so that it could check that it was assignable
to AbstractPlatformTransactionManager. This would fail when
spring-orm is not on the classpath as JpaTransactionManager could not
be loaded.

This commit updates BasicBatchConfigurer to change the return type
of createAppropriateTransactionManager so that it returns a
PlatformTransactionManager which is an interface. As described above,
this relaxes the verification of any areturn instructions in the
method and, in this particular case stops the verifier from trying to
load JpaTransactionManager.

Closes gh-8181
2017-02-13 12:36:17 +00:00
Stephane Nicoll
fe552fc920 Merge branch '1.5.x' 2017-02-13 10:09:04 +01:00
Stephane Nicoll
bd6d1b74c0 Merge branch '1.4.x' into 1.5.x 2017-02-13 10:08:51 +01:00
Stephane Nicoll
bcbcb9c00b Clarify use of DataSource for batch apps
Closes gh-8271
2017-02-13 10:08:40 +01:00
Stephane Nicoll
093140ae44 Merge branch '1.5.x' 2017-02-13 09:54:39 +01:00
Stephane Nicoll
842170768d Polish cache sample readme
Closes gh-8272
2017-02-13 09:53:37 +01:00
Stephane Nicoll
53fcd5422e Merge branch '1.5.x' 2017-02-12 14:02:56 +01:00
Stephane Nicoll
ff4a4cf33a Merge branch '1.4.x' into 1.5.x 2017-02-12 14:02:37 +01:00
Stephane Nicoll
661940033a Start building against Spring Framework 4.3.7.BUILD-SNAPSHOT
See gh-8248
2017-02-12 14:01:18 +01:00
Stephane Nicoll
ca2f8778f4 Merge branch '1.5.x' 2017-02-12 13:59:37 +01:00
Stephane Nicoll
6c4013249b Merge branch '1.4.x' into 1.5.x 2017-02-12 13:59:19 +01:00