Commit Graph

9258 Commits

Author SHA1 Message Date
Andy Wilkinson
06017f688a Only auto-configure SpringSocialDialect for Thymeleaf 2
Previously, SocialWebAutoConfiguration would create a
SpringSocialDialect bean when SpringTemplateEngine was on the
classpath. This class exists in both Thymeleaf 2 and Thymeleaf 3 but
SpringSocialDialect is only compatible with Thymeleaf 2.

This commit updates the auto-configuration to require
SpringResourceResourceResolver to be on the classpath. This class
exists in Thymeleaf 2 but does not exist in Thymeleaf 3.

Closes gh-4858
2017-02-07 16:20:33 +00:00
Stephane Nicoll
570b0593a6 Document SMTP timeout settings
Closes gh-8213
2017-02-07 16:22:03 +01:00
Stephane Nicoll
008aef6142 Document @LiquibaseDataSource feature
Closes gh-8214
2017-02-07 16:16:19 +01:00
Stephane Nicoll
21e866535c Merge pull request #8196 from zhanhb:patch-1
* pr/8196:
  Polish pid metadata
  Fix pid properties link in documentation
2017-02-05 09:25:25 +01:00
Stephane Nicoll
a30461c5c7 Polish pid metadata
This commit moves the `spring.pid.*` metadata to the relevant project. It
also updates the doc to refer to the new `ApplicationPidFileWriter`
rather than the one in its deprecatred form.

Closes gh-8196
2017-02-05 09:23:56 +01:00
zhanhb
22ba7b93b2 Fix pid properties link in documentation
See gh-8196
2017-02-05 09:14:01 +01:00
Andy Wilkinson
2f50d515a1 Apply root to URIs directly rather than relying on expansion
Previously, TestRestTemplate applied the root URI to URIs by
converting them to a String and then passing the String to the
RestTemplate delegate. Being a String, meant that the URI passed
through RestTemplate's standard URI template expansion processing
using the configured UriTemplateHandler. While this caused the root
URI to be applied, it also had the unwanted side-effect of
encoding the URI for a second time.

This commit updates TestRestTemplate so that, when configured with a
RootUriTemplateHandler, it applies the root URI directly and then
passes a modified URI to the RestTemplate delegate. Being a URI means
that no template expansion is performed and the possible double
encoding is avoided.

Closes gh-8163
2017-02-02 13:28:52 +00:00
Stephane Nicoll
7e44029224 Merge pull request #8157 from rajadilipkolli:patch-1
* pr/8157:
  Polish contribution
  Update copyright header
2017-02-01 08:56:43 +01:00
Stephane Nicoll
b9ede6b281 Polish contribution
Closes gh-8157
2017-02-01 08:56:22 +01:00
Raja Kolli
a1c601ca28 Update copyright header
See gh-8157
2017-02-01 08:55:36 +01:00
Andy Wilkinson
f3b9b14b8e Order ManagementContextConfiguration classes without loading them
Previously, ManagementContextConfiguration classes were loaded to
allow them to be ordered based on either @Order or implementing
Ordered. This had the unwanted side-effect of possibly logging
unwanted INFO messages if the reflection-based annotation
introspection failed. One cause of this was @ConditionalOnClass when
the referenced class was not on the classpath.

This commit uses the ASM-based annotation metadata reading to
determine the order of a management context configuration class based
on the @Order annotation. The classes are then sorted using a standard
OrderComparator. Note that Ordering via implemented Ordered is not
supported as it cannot be determine without loading the class.
2017-01-26 20:25:23 +00:00
Stephane Nicoll
bd0c1cb9c3 Fixup version numbers following release 2017-01-26 15:55:14 +01:00
Spring Buildmaster
ed1ce140c0 Next Development Version 2017-01-26 14:20:39 +00:00
Stephane Nicoll
a26ccb17f7 Upgrade to Spring Data Hopper.SR7
Closes gh-8112
2017-01-26 12:57:28 +01:00
Stephane Nicoll
8a3e82734e Start building against snapshots for Spring Data Hopper SR7
See gh-8112
2017-01-26 09:14:14 +01:00
Stephane Nicoll
ad29a6ec07 Upgrade to Spring Integration 4.3.7.RELEASE
Closes gh-8032
2017-01-26 09:12:57 +01:00
Phillip Webb
ae910f3169 Update CLI open_source_licenses.txt file
Closes gh-7703
2017-01-25 22:05:00 -08:00
Phillip Webb
0af53b361f Ensure embedded start can be called multiple times
Update all `EmbeddedServletContainer` implementations to ensure that
the `start()` method can be called multiple times, with the second call
being ignored.

Fixes gh-8036
2017-01-25 20:50:23 -08:00
Phillip Webb
ef69ae6a89 Ensure logging filters are removed on cleanup
Update `Log4J2LoggingSystem` and `LogbackLoggingSystem` to ensure
that filters are removed when the `cleanUp` method is called. Prior
to this commit application failures would not remove the filter and
no log messages would appear.

The `LoggingApplicationListener` has also been updated since it
previously failed to handle `ApplicationFailureEvents`.

Finally `EventPublishingRunListener` and `DelegatingApplicationListener`
have been updated to deal with `null` parameters and to cope with
listener errors.

Fixes gh-7758
2017-01-25 19:13:46 -08:00
Phillip Webb
2cf93f89f5 Polish 2017-01-25 16:45:59 -08:00
Andy Wilkinson
daf6be46f6 Revert "Upgrade to Groovy 2.4.8"
This reverts commit 70cd5c42ed.

See gh-8083
2017-01-25 15:24:33 +00:00
Stephane Nicoll
feb496fecd Upgrade to Spring Framework 4.3.6.RELEASE
Closes gh-7774
2017-01-25 15:51:29 +01:00
Andy Wilkinson
bfee21730c Detect path of exploded war correctly on Windows
Previously, AbstractEmbeddedServletContainerFactory detected an
exploded war by looking for `/WEB-INF/` in the path of its code
source's location. This failed on Windows due to the use of `\` rather
than `/` separators.

This commit updates AbstractEmbeddedServletContainerFactory to
uses the OS's separator rather than hardcoding `/`.

Closes gh-8100
2017-01-25 11:26:03 +00:00
Stephane Nicoll
265a712294 Fix keys format for embedded mongodb support
Closes gh-8102
2017-01-25 10:41:47 +01:00
Andy Wilkinson
bd58a6de66 Upgrade to Jaybird 2.2.12
Closes gh-8086
2017-01-24 16:33:06 +00:00
Andy Wilkinson
f8056f9888 Upgrade to Elasticsearch 2.4.4
Closes gh-8085
2017-01-24 16:33:06 +00:00
Andy Wilkinson
96f6f42b32 Upgrade to Jetty 9.3.16.v20170120
Closes gh-8084
2017-01-24 16:33:05 +00:00
Andy Wilkinson
70cd5c42ed Upgrade to Groovy 2.4.8
Closes gh-8083
2017-01-24 16:33:05 +00:00
Andy Wilkinson
fcd5477334 Upgrade to Httpcore 4.4.6
Closes gh-8082
2017-01-24 16:33:04 +00:00
Andy Wilkinson
a736102a4b Upgrade to Activemq 5.13.5
Closes gh-8081
2017-01-24 16:33:04 +00:00
Andy Wilkinson
ec70046e27 Upgrade to Joda Time 2.9.7
Closes gh-8080
2017-01-24 16:33:03 +00:00
Andy Wilkinson
b5cecd42d1 Upgrade to Undertow 1.3.26.Final
Closes gh-8079
2017-01-24 16:33:03 +00:00
Andy Wilkinson
b43a8c2069 Upgrade to Jackson 2.8.6
Closes gh-8078
2017-01-24 16:33:02 +00:00
Andy Wilkinson
fe17a0efa2 Upgrade to Logback 1.1.9
Closes gh-69
2017-01-24 16:22:55 +00:00
Andy Wilkinson
1607f682db Start building against Spring Framework 4.3.6 snapshots
See gh-7774
2017-01-24 12:28:24 +00:00
Stephane Nicoll
4efa4590f8 Review doc on advanced datasource customization
Closes gh-7652
2017-01-24 09:55:13 +01:00
Stephane Nicoll
4760a1a6e1 Merge pull request #8057 from izeye:fix-test-20170122
* pr/8057:
  Fix entry in broken-initialization.factories
2017-01-22 11:14:23 +01:00
Johnny Lim
752b8bd650 Fix entry in broken-initialization.factories
Closes gh-8057
2017-01-22 11:14:12 +01:00
Andy Wilkinson
9e2e824098 Upgrade to Tomcat 8.5.11
Closes gh-7360
2017-01-20 15:51:18 +00:00
Andy Wilkinson
0ce7c9516a Document how to configure test- and profile-specific Flyway migrations
Closes gh-2753
2017-01-20 15:44:42 +00:00
Stephane Nicoll
93bc34c1eb Merge pull request #8039 from rafael-rollo:master
* pr/8039:
  Indenting SpringApplication javadoc code
2017-01-20 10:54:10 +01:00
Rafael Rollo
6fba1381c1 Indenting SpringApplication javadoc code
Closes gh-8039
2017-01-20 10:53:34 +01:00
Stephane Nicoll
2c5c539bf1 Document automatic scheduling of metrics export
Closes gh-8040
2017-01-20 10:52:55 +01:00
Stephane Nicoll
d9a0a55245 Upgrade to Spring AMQP 1.6.7.RELEASE
Closes gh-8033
2017-01-20 10:15:19 +01:00
Phillip Webb
b05bdbfe4f Polish 2017-01-19 12:31:43 -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
9a9c4c75bf Merge pull request #8030 from michael-simons:fix-appendix-b
* pr/8030:
  Fix closing parentheses
2017-01-19 16:19:40 +01:00
Michael J. Simons
a852c49edd Fix closing parentheses
Closes gh-8030
2017-01-19 16:19:07 +01:00
Stephane Nicoll
ffa6d6d6e0 Improve error message used in TestDatabaseAutoConfiguration
By default, `@DataJpaTest` (and `@AutoConfigureTestDatabase`) attempt to
replace any existing `DataSource` by an embedded one. Previously, if
there is was no embedded database on the classpath, the exception message
did not provide that context in the error message.

This commit clarifies the error message to conduct
`TestDatabaseAutoConfiguration` (that is replacing the existing
`DataSource`).

Closes gh-7797
2017-01-19 16:13:49 +01:00
Andy Wilkinson
80a1e1ae64 Polishing 2017-01-19 11:03:18 +00:00