Commit Graph

8714 Commits

Author SHA1 Message Date
Andy Wilkinson 4963cfd67b Reset thread's interrupted flag when catching InterruptedException
Closes gh-6360
2016-07-11 16:46:05 +01:00
Andy Wilkinson eb995cc07a Add dependency management for jackson-datatype-jaxrs
Closes gh-6369
2016-07-11 12:40:22 +01:00
Stephane Nicoll fcf535901e Polish doc
Closes gh-6008
2016-07-11 13:31:27 +02:00
Stephane Nicoll 9a98113a2c Fix gradle samples replacement regex
Closes gh-6357
2016-07-11 12:45:28 +02:00
Andy Wilkinson 50d2d492ed Merge branch '1.3.x 2016-07-11 11:28:16 +01:00
Andy Wilkinson e53d3167ab Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
2016-07-11 11:27:41 +01:00
Andy Wilkinson c974de0119 Merge branch '1.3.x 2016-07-11 11:27:15 +01:00
Stephane Nicoll 277da462ce Document differences between @Value and @ConfigurationProperties
Closes gh-4892
2016-07-11 12:23:30 +02:00
Andy Wilkinson 5f751fe356 Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
2016-07-11 11:16:34 +01:00
Stephane Nicoll a72e494896 Merge branch '1.3.x' 2016-07-11 11:08:52 +02:00
Stephane Nicoll 78879f4bdb Fix documentation
Closes gh-6358
2016-07-11 11:08:36 +02:00
Stephane Nicoll ca14c06e18 Merge pull request #6365 from artembilan:SI_Java_DSL-1.1.3
* pr/6365:
  Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
2016-07-09 07:21:06 +02:00
Artem Bilan f152111685 Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
Closes gh-6365
2016-07-09 07:20:14 +02:00
Andy Wilkinson 25ba9a56e6 Merge branch '1.3.x 2016-07-08 11:18:58 +01:00
Andy Wilkinson 26a233a870 Upgrade to Hikari 2.4.7
Closes gh-6344
2016-07-08 11:18:14 +01:00
Stephane Nicoll 7f66335e6d Merge pull request #6350 from eddumelendez:spring_security_4.1.1
* pr/6350:
  Upgrade to Spring Security 4.1.1.RELEASE
2016-07-08 09:12:01 +02:00
Eddú Meléndez 8c273c35fa Upgrade to Spring Security 4.1.1.RELEASE
Closes gh-6350
2016-07-08 09:10:56 +02:00
Phillip Webb 629ce6a527 Clarify @EntityScan deprecated Javadoc
Closes gh-6340
2016-07-07 14:16:30 -07:00
Stephane Nicoll 17b71df2dd Merge branch '1.3.x' 2016-07-07 15:38:37 +02:00
Stephane Nicoll bbb29dd70f Remove `@Primary` from `IntegrationMBeanExporter`
Commit 3ea84f9e1 has wrongly introduced a `@Primary` marker on
`IntegrationMBeanExporter` so any use of both Spring's JMX support
and Spring Integration's JMX support leads to an exception. This commit
makes sure to remove the unnecessary `@Primary`

Closes gh-6328
2016-07-07 15:36:02 +02:00
Andy Wilkinson ccaa19d51f Document how to configure a RestTemplate to use a proxy
Closes gh-6331
2016-07-07 10:58:09 +01:00
Stephane Nicoll 0356be7b95 Refine AliasFor usage
This commit makes sure to use `getAliasedStringArray` rather than
`getStringArray` as the latter does not work with ASM. While this will
probably be fixed in the core framework, this commit also adds dedicated
tests with ASM to ensure that the code works as expected.

Closes gh-6337
2016-07-07 11:47:24 +02:00
Phillip Webb d4011687e4 Increase maven central timeout 2016-07-06 21:45:06 -07:00
Phillip Webb 1f4de8d286 Revert "Use Google Maven Central mirror"
This reverts commit 7bb39f8206.

Unfortunately the mirror seems incomplete
2016-07-06 21:23:54 -07:00
Phillip Webb 7bb39f8206 Use Google Maven Central mirror
Add mirror setting so that a full build uses the Google mirror of Maven
Central.
2016-07-06 19:55:20 -07:00
Phillip Webb bd65045285 Allow WebRequestTraceFilter header post processing
Update WebRequestTraceFilter so that additional post processing can be
applied to traced request headers. The postProcessRequestHeaders method
can be used to remove or change map entries before they are returned.

Fixes gh-6309
2016-07-06 17:45:35 -07:00
Phillip Webb f4df9d9767 Use lexical ordered DataSourceInitializer patterns
Align DataSourceInitializer to Spring Framework by lexically sorting
resolved resource patterns.

Fixes gh-6316
2016-07-06 17:11:30 -07:00
Phillip Webb d6bf9775d1 Upgrade to Jackson 2.8.0
Fixes gh-6343
2016-07-06 15:22:05 -07:00
Phillip Webb 190db3048d Merge pull request #6342 from persapiens/jsf-spring-boot-starter-1.6.1
* jsf-spring-boot-starter-1.6.1:
  Update starters readme with updated JSF support
2016-07-06 14:41:55 -07:00
Marcelo Romulo Fernandes 8cd8ac812b Update starters readme with updated JSF support
Update readme since jsf-spring-boot-starter 1.6.1 added support for
BootsFaces and AngularFaces.

Closes gh-6342
2016-07-06 14:40:46 -07:00
Phillip Webb 4742486d3e Merge pull request #6323 from szpak/issues/6320-mockito-2.0.47-compatibility
* issues/6320-mockito-2.0.47-compatibility:
  Fix compatibility with Mockito 2.0
2016-07-06 14:34:24 -07:00
Marcin Zajaczkowski ed829d7981 Fix compatibility with Mockito 2.0
Update MockDefinition to only call `Answers.get()` if a direct cast
isn't possible. This provides compatibility with Mockito 2.0 (currently
2.0.47-beta) without breaking support for Mockto 1.x.

Closes gh-6323
2016-07-06 14:28:36 -07:00
Andy Wilkinson 3286760073 Make it easier to add auto-configuration to a test slice
Previously, an entry had to be added to spring.factories using the
name of one of the @AutoConfigure… meta-annotations on the @…Test
annotation as the key. This indirection was unnecessarily complicated.

This commit simplifies things by allowing the name of the @…Test
annotation itself to be used as the key.

Closes gh-6335
2016-07-06 16:44:26 +01:00
Stephane Nicoll 4fe28727ad Start building against Spring Framework 4.3.2 snapshots
See gh-6318
2016-07-06 15:22:34 +02:00
Stephane Nicoll 05dad45172 Add proxy configuration for Jest client
Closes gh-6332
2016-07-06 14:43:30 +02:00
Andy Wilkinson 5c44c77287 Document auto-configuration classes imported by each @…Test annotation
Closes gh-6044
2016-07-06 12:20:51 +01:00
Andy Wilkinson 5bfc6a50fd Remove accidental usage of Type.getTypeName() which is a Java 8 API
Closes gh-6325
2016-07-05 15:21:50 +01:00
Stephane Nicoll 4b91965dde Fix indent 2016-07-05 11:26:15 +02:00
Stephane Nicoll 78e580c8db Polish 2016-07-05 11:19:11 +02:00
Phillip Webb f10286caf1 Fix spring.profiles.default with profile enabled by configuration file
Previously, if the user configured a custom default profile and then
enabled another profile using a configuration file, the custom default
profile would be activated when it should not have been.

This commit updates ConfigFileApplicationListener so that when a
profile is activated via a configuration file, any profiles
that are queued purely because they are a default profile are removed
from the queue. This ensures that a default profile is not active
when another profile is activated via a configuration file.

Closes gh-5998
2016-07-05 09:41:11 +01:00
Stephane Nicoll 0545231049 Polish 2016-07-05 10:37:22 +02:00
Stephane Nicoll 92b0423788 Merge branch '1.3.x' 2016-07-04 16:45:26 +02:00
Stephane Nicoll eeb95693b3 Fixup version numbers following release 2016-07-04 16:45:17 +02:00
Spring Buildmaster 2216369348 Next Development Version 2016-07-04 14:15:02 +00:00
Andy Wilkinson 8cbe30ab5e Ensure that Jersey and Jackson honour JAXB annotations
By default Jersey configures Jackson to use both Jackson annotations
and JAXB annotations when introspective types for (de)serialization.
However, the changes made in 5776d6a8 mean that Jersey no longer uses
its default ObjectMapper configuration and uses the auto-configured
ObjectMapper instead. This had the unwanted side-effect of leaving
Jersey with an ObjectMapper that only uses Jackson annotations and
ignores JAXB annotations.

This commit updates JerseyAutoConfiguration so that it will add the
JaxbAnnotationIntrospector to the auto-configured ObjectMapper for
both serialization and deserialization. It uses
AnnotationIntrospectorPair to ensure retain any existing
introspectors.

Closes gh-6310
2016-07-04 14:44:31 +01:00
Stephane Nicoll ce3f4bd068 Upgrade to Spring Framework 4.3.1.RELEASE
Closes gh-6197
2016-07-04 13:27:28 +02:00
Stephane Nicoll 46acc8042f Merge branch '1.3.x' 2016-07-04 13:25:38 +02:00
Stephane Nicoll 566b4e9a16 Upgrade to Spring Framework 4.2.7.RELEASE
Closes gh-6249
2016-07-04 13:25:11 +02:00
Andy Wilkinson fd16865988 Merge branch '1.3.x' 2016-07-04 09:28:50 +01:00
Andy Wilkinson 46a1f0d00e Upgrade to Spring Cloud Connectors 1.2.3.RELEASE
Closes gh-6315
2016-07-04 09:27:57 +01:00