Commit Graph

8523 Commits (334baaeffd02976da7da10ab7a08a5163d778249)
 

Author SHA1 Message Date
Andy Wilkinson 18d99245dd Merge branch '1.3.x 8 years ago
Andy Wilkinson c2db9fa385 Update admin MBean to only be ready when its own context is ready
Previously, if there was a hierarchy of SpringApplications, the admin
MBean would report that the application was ready as soon as any
application in the hierarchy was ready. This could lead to a client
trying to query a property in the environment before it's available.

This commit updates the MBean registrar to that the MBean only reports
that the application is ready when the context that contains the
registrar has refreshed and fired its ApplicationReadyEvent.

Closes gh-6362
8 years ago
Stephane Nicoll bf8a8167aa Merge pull request #6374 from izeye:polish-20160712
* pr/6374:
  Polish
8 years ago
Johnny Lim a9f6ae4422 Polish
Closes gh-6374
8 years ago
Phillip Webb 43afc149a1 Consider WebAppConfiguration in @SpringBootTest
Update SpringBootTestContextBootstrapper to consider the
`@WebAppConfiguration` annotation and use sensible resourceBasePath
defaults.

Fixes gh-6371
8 years ago
Phillip Webb df8dfb093b Fix package tangle in jOOQ sample
Use a custom GeneratorStrategy to fix the package tangles that jOOQ
creates by default.

Fixes gh-6372
8 years ago
Andy Wilkinson 8b987e29c1 Fix spring-boot-gradle-plugin package tangle
Relocate `SpringBootPlugin` to fix a package tangle.

Fixes gh-6355
8 years ago
Phillip Webb 3e62933096 Polish 8 years ago
Andy Wilkinson 8e669e2eef Merge branch '1.3.x 8 years ago
Andy Wilkinson 4963cfd67b Reset thread's interrupted flag when catching InterruptedException
Closes gh-6360
8 years ago
Andy Wilkinson eb995cc07a Add dependency management for jackson-datatype-jaxrs
Closes gh-6369
8 years ago
Stephane Nicoll fcf535901e Polish doc
Closes gh-6008
8 years ago
Stephane Nicoll 9a98113a2c Fix gradle samples replacement regex
Closes gh-6357
8 years ago
Andy Wilkinson 50d2d492ed Merge branch '1.3.x 8 years ago
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
8 years ago
Andy Wilkinson c974de0119 Merge branch '1.3.x 8 years ago
Stephane Nicoll 277da462ce Document differences between @Value and @ConfigurationProperties
Closes gh-4892
8 years ago
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
8 years ago
Stephane Nicoll a72e494896 Merge branch '1.3.x' 8 years ago
Stephane Nicoll 78879f4bdb Fix documentation
Closes gh-6358
8 years ago
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
8 years ago
Artem Bilan f152111685 Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
Closes gh-6365
8 years ago
Andy Wilkinson 25ba9a56e6 Merge branch '1.3.x 8 years ago
Andy Wilkinson 26a233a870 Upgrade to Hikari 2.4.7
Closes gh-6344
8 years ago
Stephane Nicoll 7f66335e6d Merge pull request #6350 from eddumelendez:spring_security_4.1.1
* pr/6350:
  Upgrade to Spring Security 4.1.1.RELEASE
8 years ago
Eddú Meléndez 8c273c35fa Upgrade to Spring Security 4.1.1.RELEASE
Closes gh-6350
8 years ago
Phillip Webb 629ce6a527 Clarify @EntityScan deprecated Javadoc
Closes gh-6340
8 years ago
Stephane Nicoll 17b71df2dd Merge branch '1.3.x' 8 years ago
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
8 years ago
Andy Wilkinson ccaa19d51f Document how to configure a RestTemplate to use a proxy
Closes gh-6331
8 years ago
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
8 years ago
Phillip Webb d4011687e4 Increase maven central timeout 8 years ago
Phillip Webb 1f4de8d286 Revert "Use Google Maven Central mirror"
This reverts commit 7bb39f8206.

Unfortunately the mirror seems incomplete
8 years ago
Phillip Webb 7bb39f8206 Use Google Maven Central mirror
Add mirror setting so that a full build uses the Google mirror of Maven
Central.
8 years ago
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
8 years ago
Phillip Webb f4df9d9767 Use lexical ordered DataSourceInitializer patterns
Align DataSourceInitializer to Spring Framework by lexically sorting
resolved resource patterns.

Fixes gh-6316
8 years ago
Phillip Webb d6bf9775d1 Upgrade to Jackson 2.8.0
Fixes gh-6343
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll 4fe28727ad Start building against Spring Framework 4.3.2 snapshots
See gh-6318
8 years ago
Stephane Nicoll 05dad45172 Add proxy configuration for Jest client
Closes gh-6332
8 years ago
Andy Wilkinson 5c44c77287 Document auto-configuration classes imported by each @…Test annotation
Closes gh-6044
8 years ago
Andy Wilkinson 5bfc6a50fd Remove accidental usage of Type.getTypeName() which is a Java 8 API
Closes gh-6325
8 years ago
Stephane Nicoll 4b91965dde Fix indent 8 years ago
Stephane Nicoll 78e580c8db Polish 8 years ago
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
8 years ago
Stephane Nicoll 0545231049 Polish 8 years ago