Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,425 Commits 23 Branches 0 Tags
f3c2f55cbe21a0a2017d97b04834e56e65185080
Commit Graph

9425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
f3c2f55cbe Merge branch '1.5.x' 2016-11-08 13:50:54 +00:00
Andy Wilkinson
2e76687d17 Merge branch '1.4.x' into 1.5.x 2016-11-08 13:50:41 +00:00
Andy Wilkinson
5f44598d8b Remove use of static import that Checkstyle prohibits 2016-11-08 13:50:15 +00:00
Andy Wilkinson
65d6cd0631 Merge pull request #7306 from Johnny Lim 
* gh-7306:
  Fix implementation of PoolingConnectionFactoryBean.createXAContext()
 2016-11-08 13:34:27 +00:00
Johnny Lim
5d8e0369e7 Fix implementation of PoolingConnectionFactoryBean.createXAContext() 
Closes gh-7306
 2016-11-08 13:30:44 +00:00
Andy Wilkinson
04a869bbe7 Merge branch '1.5.x' 2016-11-08 13:23:12 +00:00
Andy Wilkinson
218d28f74c Merge branch '1.4.x' into 1.5.x 2016-11-08 13:22:58 +00:00
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
 2016-11-08 13:18:05 +00:00
Andy Wilkinson
46621dadc2 Merge branch '1.5.x' 2016-11-08 10:40:26 +00:00
Andy Wilkinson
3a2d9e31ff Merge branch '1.4.x' into 1.5.x 2016-11-08 10:36:56 +00:00
Andy Wilkinson
808185ab4e Make LaunchedURLClassLoader Java 6 compatible again 
Closes gh-7334
 2016-11-08 10:35:18 +00:00
Andy Wilkinson
78fcb311c9 Merge branch '1.5.x' 2016-11-08 10:04:09 +00:00
Andy Wilkinson
e576225959 Merge branch '1.4.x' into 1.5.x 2016-11-08 10:03:58 +00:00
Andy Wilkinson
aafb308eaf Merge pull request #7334 from Christoph Dreis 
* gh-7334:
  Reinstate LaunchedURLClassLoader's registration  as parallel capable
 2016-11-08 10:02:55 +00:00
Stephane Nicoll
0e92271a19 Merge branch '1.5.x' 2016-11-08 10:58:17 +01:00
dreis
7a797909ae Reinstate LaunchedURLClassLoader's registration as parallel capable 
Closes gh-7334
 2016-11-08 09:58:14 +00:00
Stephane Nicoll
5878e5eec5 Merge branch '1.4.x' into 1.5.x 2016-11-08 10:57:58 +01:00
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
 2016-11-08 10:56:54 +01:00
Andy Wilkinson
70c5b8304a Merge branch '1.5.x' 2016-11-08 08:20:33 +00:00
Andy Wilkinson
08a9dcd4a7 Upgrade to Apache Artemis 1.4.0 
Closes gh-7343
 2016-11-08 08:19:37 +00:00
Stephane Nicoll
443bc7c472 Merge branch '1.5.x' 2016-11-08 07:52:24 +01:00
Stephane Nicoll
774ddc3602 Merge branch '1.4.x' into 1.5.x 2016-11-08 07:50:28 +01:00
Stephane Nicoll
18c2a2f4fe Upgrade to Spring Framework 4.3.4.RELEASE 
Closes gh-7213
 2016-11-08 07:48:53 +01:00
Andy Wilkinson
4fd192ccc4 Merge branch '1.5.x' 2016-11-08 06:47:17 +00:00
Andy Wilkinson
bb6330e9df Merge branch '1.4.x' into 1.5.x 2016-11-08 06:46:29 +00:00
Andy Wilkinson
adfc5d22ca Upgrade to Spring Integration Java DSL 1.1.4.RELEASE 
Closes gh-7342
 2016-11-08 06:44:47 +00:00
Andy Wilkinson
bc2a412408 Upgrade to Spring Integration 4.3.5.RELEASE 
Closes gh-7341
 2016-11-08 06:44:15 +00:00
Andy Wilkinson
e136ef6f7d Upgrade to Spring AMQP 1.6.4.RELEASE 
Closes gh-7340
 2016-11-08 06:43:42 +00:00
Andy Wilkinson
42581debfe Upgrade to Spring Security OAuth 2.0.12.RELEASE 
Closes gh-7339
 2016-11-08 06:38:48 +00:00
Madhura Bhave
372cfb3dff Merge branch '1.5.x' 2016-11-07 15:39:00 -08:00
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
 2016-11-07 15:37:09 -08:00
Stephane Nicoll
af82cbbfa9 Relaxed test assertion 2016-11-07 22:55:25 +01:00
Stephane Nicoll
0a4a84d357 Merge branch '1.5.x' 2016-11-06 11:44:27 +01:00
Stephane Nicoll
3018e95261 Merge branch '1.4.x' into 1.5.x 2016-11-06 11:44:12 +01:00
Stephane Nicoll
d405265e83 Merge pull request #7326 from sebastiankirsch:master 
* pr/7326:
  Polish contribution
  Add @Inherited to all AutoConfigure* classes
 2016-11-06 11:43:58 +01:00
Stephane Nicoll
ebfd86ea26 Polish contribution 
Closes gh-7326
 2016-11-06 11:42:45 +01:00
sebastiankirsch
e8b0a64872 Add @Inherited to all AutoConfigure* classes 
See gh-7326
 2016-11-06 11:39:12 +01:00
Stephane Nicoll
7e643395f3 Merge branch '1.5.x' 2016-11-06 11:36:31 +01:00
Stephane Nicoll
101528f41a Merge branch '1.4.x' into 1.5.x 2016-11-06 11:36:16 +01:00
Stephane Nicoll
f80dbd1a21 Upgrade to joda-time 2.9.5 
Closes gh-7308
 2016-11-06 11:34:13 +01:00
Stephane Nicoll
ea35da0305 Merge branch '1.5.x' 2016-11-06 11:26:58 +01:00
Stephane Nicoll
b51f92d9a4 Merge branch '1.4.x' into 1.5.x 2016-11-06 11:25:44 +01:00
Stephane Nicoll
32950bfec1 Merge pull request #7299 from vpavic:resource-server-config 
* pr/7299:
  Fix JWT token URI derivation
 2016-11-06 11:25:15 +01:00
Vedran Pavic
5783cd5593 Fix JWT token URI derivation 
Closes gh-7299
 2016-11-06 11:24:50 +01:00
Stephane Nicoll
d32da0d692 Merge branch '1.5.x' 2016-11-05 11:16:09 +01:00
Stephane Nicoll
01e66ecbd5 Merge branch '1.4.x' into 1.5.x 2016-11-05 11:15:27 +01:00
Stephane Nicoll
4311cf333f Remove sample reference in build 2016-11-05 11:14:50 +01:00
Stephane Nicoll
2c71cb8efd Polish 2016-11-05 11:10:17 +01:00
Stephane Nicoll
4407194c00 Replace sample by integration test 
Closes gh-3888
 2016-11-05 11:09:36 +01:00
Stephane Nicoll
71bbd9faaf Polish 
See gh-7322
 2016-11-05 07:45:32 +01:00