Commit Graph

9672 Commits (9c374e77554f311285fd0a2b9ee42d60bb44bd6c)
 

Author SHA1 Message Date
Andy Wilkinson 65d6cd0631 Merge pull request #7306 from Johnny Lim
* gh-7306:
  Fix implementation of PoolingConnectionFactoryBean.createXAContext()
8 years ago
Johnny Lim 5d8e0369e7 Fix implementation of PoolingConnectionFactoryBean.createXAContext()
Closes gh-7306
8 years ago
Andy Wilkinson 04a869bbe7 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 218d28f74c Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 33dcd853fd Ensure that health endpoint remains insecure without Spring Security
The changes made in 6a2ac080 mean that getSecurity() on
ManagementServerProperties will no longer return null when Spring
Security is on the classpath. This had the unwanted side-effect of
causing the health endpoint to hide its details when Spring Security
was not on the classpath.

This commit reinstates the previous behaviour by only considering
the health endpoint to be secure if Spring Security is on the
classpath and management.security.enabled is true.

Closes gh-7345
8 years ago
Andy Wilkinson 46621dadc2 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 3a2d9e31ff Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 808185ab4e Make LaunchedURLClassLoader Java 6 compatible again
Closes gh-7334
8 years ago
Andy Wilkinson 78fcb311c9 Merge branch '1.5.x' 8 years ago
Andy Wilkinson e576225959 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson aafb308eaf Merge pull request #7334 from Christoph Dreis
* gh-7334:
  Reinstate LaunchedURLClassLoader's registration  as parallel capable
8 years ago
Stephane Nicoll 0e92271a19 Merge branch '1.5.x' 8 years ago
dreis 7a797909ae Reinstate LaunchedURLClassLoader's registration as parallel capable
Closes gh-7334
8 years ago
Stephane Nicoll 5878e5eec5 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 318701daa7 Apply DispatcherServlet customizations to MockMvc
This commits makes sure that customizations on `DispatcherServlet` are
also applied to the `TestDispatcherServlet` that `MockMvc` is using
internally.

Closes gh-5891
8 years ago
Andy Wilkinson 70c5b8304a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 08a9dcd4a7 Upgrade to Apache Artemis 1.4.0
Closes gh-7343
8 years ago
Stephane Nicoll 443bc7c472 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 774ddc3602 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 18c2a2f4fe Upgrade to Spring Framework 4.3.4.RELEASE
Closes gh-7213
8 years ago
Andy Wilkinson 4fd192ccc4 Merge branch '1.5.x' 8 years ago
Andy Wilkinson bb6330e9df Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson adfc5d22ca Upgrade to Spring Integration Java DSL 1.1.4.RELEASE
Closes gh-7342
8 years ago
Andy Wilkinson bc2a412408 Upgrade to Spring Integration 4.3.5.RELEASE
Closes gh-7341
8 years ago
Andy Wilkinson e136ef6f7d Upgrade to Spring AMQP 1.6.4.RELEASE
Closes gh-7340
8 years ago
Andy Wilkinson 42581debfe Upgrade to Spring Security OAuth 2.0.12.RELEASE
Closes gh-7339
8 years ago
Madhura Bhave 372cfb3dff Merge branch '1.5.x' 8 years ago
Madhura Bhave 82f89b4ac1 Add custom headers to allowed CORS headers for CF actuators
Update CORS configuration to support Authorization and X-Cf-App-Instance.

See gh-7108
8 years ago
Stephane Nicoll af82cbbfa9 Relaxed test assertion 8 years ago
Stephane Nicoll 0a4a84d357 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3018e95261 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll d405265e83 Merge pull request #7326 from sebastiankirsch:master
* pr/7326:
  Polish contribution
  Add @Inherited to all AutoConfigure* classes
8 years ago
Stephane Nicoll ebfd86ea26 Polish contribution
Closes gh-7326
8 years ago
sebastiankirsch e8b0a64872 Add @Inherited to all AutoConfigure* classes
See gh-7326
8 years ago
Stephane Nicoll 7e643395f3 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 101528f41a Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll f80dbd1a21 Upgrade to joda-time 2.9.5
Closes gh-7308
8 years ago
Stephane Nicoll ea35da0305 Merge branch '1.5.x' 8 years ago
Stephane Nicoll b51f92d9a4 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 32950bfec1 Merge pull request #7299 from vpavic:resource-server-config
* pr/7299:
  Fix JWT token URI derivation
8 years ago
Vedran Pavic 5783cd5593 Fix JWT token URI derivation
Closes gh-7299
8 years ago
Stephane Nicoll d32da0d692 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 01e66ecbd5 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4311cf333f Remove sample reference in build 8 years ago
Stephane Nicoll 2c71cb8efd Polish 8 years ago
Stephane Nicoll 4407194c00 Replace sample by integration test
Closes gh-3888
8 years ago
Stephane Nicoll 71bbd9faaf Polish
See gh-7322
8 years ago
Stephane Nicoll e4be5c6102 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 389acb094b Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 44a32d0a5b Merge pull request #7322 from izeye:polish-20161105
* pr/7322:
  Polish
8 years ago