Commit Graph

1854 Commits

Author SHA1 Message Date
Andy Wilkinson
eb4329fb39 Merge branch '1.5.x' 2017-01-20 15:54:04 +00:00
Andy Wilkinson
0ad4e0e70f Merge branch '1.4.x' into 1.5.x 2017-01-20 15:53:53 +00:00
Andy Wilkinson
9e2e824098 Upgrade to Tomcat 8.5.11
Closes gh-7360
2017-01-20 15:51:18 +00:00
Stephane Nicoll
2b71c22e0b Merge branch '1.5.x' 2017-01-20 10:54:54 +01:00
Stephane Nicoll
bed545df64 Merge branch '1.4.x' into 1.5.x 2017-01-20 10:54:32 +01:00
Rafael Rollo
6fba1381c1 Indenting SpringApplication javadoc code
Closes gh-8039
2017-01-20 10:53:34 +01:00
Phillip Webb
89f7ec054f Merge branch '1.5.x' 2017-01-19 12:45:26 -08:00
Phillip Webb
f3cd0ad22c Polish 2017-01-19 12:44:57 -08:00
Andy Wilkinson
e04ace89b9 Fix LinkageError with ExpectedException and FilteredClassPathRunner
Previously, when the ExpectedException JUnit rule was used with
FilteredClassPathRunner a LinkageError would occur if any of
ExpectedException's methods that take a Hamcrest Matcher were called.
This was due to the FilteredClassLoader delegating loading of
org.junit classes to its parent but not org.hamcrest classes. This
resulted in JUnit classes loading one version of the Hamcrest class
and the test class loading another.

This commit ensures that both the JUnit classes and the test class
use the same version of Hamcrest classes by also delegating the
loading of org.hamcrest classes to FilteredClassLoader's parent.
2017-01-19 15:27:18 +00:00
Stephane Nicoll
c54070d142 Merge branch '1.5.x' 2017-01-19 13:19:36 +01:00
Stephane Nicoll
c41ff17dd7 Provide relevant default values for Enums
This commits adds manual metadata for enums that have a default value
since the annotation processor is not able to detect that yet.

Closes gh-7890
2017-01-19 13:19:13 +01:00
Phillip Webb
5502fa2936 Merge branch '1.5.x' 2017-01-18 21:05:22 -08:00
Phillip Webb
10dbf3c571 Use @Validated as trigger for JSR-330 validation
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.

Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.

Closes gh-7579
2017-01-18 21:01:07 -08:00
Phillip Webb
0a6456a748 Always use prefix config annotation attribute
Update use of `@ConfigurationProperties` to prefer the more explicit
`prefix` attribute, rather than `value`.

See gh-7579
2017-01-18 20:49:53 -08:00
Andy Wilkinson
490871c774 Merge branch '1.5.x' 2017-01-18 14:16:36 +00:00
dreis
93f97719f0 Improve performance of RelaxedNames
Closes gh-8002
2017-01-18 14:07:19 +00:00
Andy Wilkinson
803f1444a9 Merge branch '1.5.x' 2017-01-17 15:44:34 +00:00
Andy Wilkinson
bb2058bf66 Merge branch '1.4.x' into 1.5.x 2017-01-17 15:44:28 +00:00
Andy Wilkinson
2a5586fbcf Ensure that JarResourceManager correctly handles path without leading /
Previously, JarResourceManager assumed that the path would begin with
a / but this isn't always the case. For example, it may be an empty
string. This could lead to a malformed jar:file: URL that used ! as
the separator rather than the required !/.

This commit updates JarResourceManager to prepend / to any path that
does not being with one before using it to construct the URL.

Closes gh-7717
2017-01-17 15:40:53 +00:00
Stephane Nicoll
f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Johnny Lim
acc36c076d Polish
See gh-8004
2017-01-17 09:53:50 +01:00
Andy Wilkinson
d477223d77 Merge branch '1.5.x' 2017-01-16 04:01:03 -05:00
Andy Wilkinson
89e3335ca1 Merge branch '1.4.x' into 1.5.x 2017-01-16 04:00:39 -05:00
Andy Wilkinson
5158f6e5fc Test that double registration of ServletContextInitializers does not happen
Closes gh-4902
2017-01-16 03:59:53 -05:00
Karsten Sperling
600e74b6c9 Avoid double-reg when a Servlet or Filter implements ServletContextInitializer
See gh-4902
2017-01-16 03:59:53 -05:00
Andy Wilkinson
db70252102 Merge branch '1.5.x' 2017-01-13 18:50:51 -05:00
Andy Wilkinson
9b184e3955 Polishing 2017-01-13 18:47:43 -05:00
Andy Wilkinson
ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5 Merge branch '1.5.x' 2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af Merge branch '1.4.x' into 1.5.x 2017-01-13 15:40:11 -05:00
Andy Wilkinson
f86a6098e1 Merge branch '1.5.x' 2017-01-13 15:32:10 -05:00
Andy Wilkinson
c04f79fd74 Merge branch '1.4.x' into 1.5.x 2017-01-13 15:32:05 -05:00
Andy Wilkinson
bf642ff9db Continue failure analysis when an analyzer throws an exception
Previously, if a failure analyzer threw an exception from its
analyze method, failure analysis would stop.

This commit updates FailureAnalyzers to catch and log any Throwable
thrown by an analyzer and continue to the next available analyzer.

Closes gh-7956
2017-01-13 15:30:09 -05:00
Andy Wilkinson
3570b06ebf Merge branch '1.5.x' 2017-01-13 15:18:40 -05:00
Andy Wilkinson
3342504d7a Merge branch '1.4.x' into 1.5.x 2017-01-13 15:18:34 -05:00
Andy Wilkinson
7298b2dc1b Set value of javax.servlet.error.exception_type to a Class not a String
Previously, ErrorPageFilter set the value of
javax.servlet.error.exception_type to be the name of the exception,
(a java.lang.String). This commit changes it to be a java.lang.Class
as required by the Servlet spec.

Closes gh-7925
2017-01-13 15:15:58 -05:00
Andy Wilkinson
78a06c3278 Merge branch '1.5.x' 2017-01-10 17:05:09 -05:00
Phillip Webb
9159c87bf9 Polish 2017-01-10 09:51:11 -05:00
Stephane Nicoll
a2d55428ef Merge branch '1.5.x' 2017-01-08 09:20:28 +01:00
Stephane Nicoll
fefc66625f Merge branch '1.4.x' into 1.5.x 2017-01-08 09:20:00 +01:00
Eddú Meléndez
f896ff9a10 Fix incomplete assertions
Closes gh-7907
2017-01-08 09:12:54 +01:00
Phillip Webb
77f9bb09ca Further Polish Mockito 2 support
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
0cc313f224 Polish 2017-01-05 11:30:33 -08:00
Stephane Nicoll
c28ff4314c Upgrade to Mockito 2
Closes gh-7770
2017-01-05 12:22:15 +01:00
Phillip Webb
125d9d6181 Merge branch '1.5.x' 2017-01-04 20:04:09 -08:00
Phillip Webb
eb22220961 Upgrade to hibernate-validator 5.3.4
Upgrade to `hibernate-validator` 5.3.4 and introduce a new
`MessageInterpolatorFactory` that creates a suitable
`MessageInterpolator` (taking into account missing EL dependencies).

Rework `ConfigurationPropertiesBindingPostProcessor` and
`ValidationAutoConfiguration` to make use of the new factory.

Fixes gh-7598
2017-01-04 18:28:32 -08:00
Stephane Nicoll
506f6497c0 Merge branch '1.5.x' 2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a Polish 2017-01-04 09:53:45 +01:00
Phillip Webb
b1cb8bb3d9 Merge branch '1.5.x' 2017-01-03 15:14:41 -08:00