root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
9,448 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

9448 Commits

Author SHA1 Message Date
Andy Wilkinson d4a7db7b7c Merge branch '1.5.x' 2016-11-11 15:27:11 +00:00
Andy Wilkinson 2930bd4145 Merge pull request #7323 from Huang YunKun 
* gh-7323:
  Upgrade to Log4j 2.7
 2016-11-11 15:25:51 +00:00
Huang YunKun 71826708a4 Upgrade to Log4j 2.7 
Closes gh-7323
 2016-11-11 15:25:33 +00:00
Andy Wilkinson 7cb5981e7c Merge branch '1.5.x' 2016-11-11 15:19:59 +00:00
Andy Wilkinson c30b917ba1 Use Log4j 2's bom to provide dependency management for it 
Closes gh-7355
 2016-11-11 15:18:45 +00:00
Andy Wilkinson be4ab6165a Merge branch '1.5.x' 2016-11-11 11:48:06 +00:00
Andy Wilkinson 89d5e086e4 Merge branch '1.4.x' into 1.5.x 2016-11-11 11:47:55 +00:00
Andy Wilkinson a1dda12bcb Disable Server header by default when using SSL with Jetty 9 
Closes gh-7359
 2016-11-11 11:46:57 +00:00
Stephane Nicoll fe40a49e4c Merge branch '1.5.x' 2016-11-11 10:49:20 +01:00
Stephane Nicoll c0f6c93b3d Upgrade to Spring Security 4.2.0.RELEASE 
Closes gh-7366
 2016-11-11 10:49:08 +01:00
Madhura Bhave e1a216e34a Merge branch '1.5.x' 2016-11-09 11:22:46 -08:00
Madhura Bhave af61278213 Extend HealthMvcEndpoint for Cloud Foundry 
The CloudFoundryHealthMvcEndpoint does not perform additional
security checks since security is handled by the interceptor.

See gh-7108
 2016-11-09 11:04:51 -08:00
Madhura Bhave a3bcb2778f Add message to response body for Cloud Foundry security error 
See gh-7108
 2016-11-09 10:54:56 -08:00
Stephane Nicoll ed9f111e8a Merge branch '1.5.x' 2016-11-08 18:25:28 +01:00
Stephane Nicoll 8e160d7fda Merge branch '1.4.x' into 1.5.x 2016-11-08 18:24:58 +01:00
Stephane Nicoll 72e696bcbd Fixup version numbers following release 2016-11-08 18:24:42 +01:00
Spring Buildmaster e712a9ba8c Next Development Version 2016-11-08 16:55:37 +00:00
Stephane Nicoll 3b588aabbc Merge branch '1.5.x' 2016-11-08 17:04:18 +01:00
Stephane Nicoll 36c5c3519f Merge branch '1.4.x' into 1.5.x 2016-11-08 17:03:30 +01:00
Stephane Nicoll 2a8a906d30 Upgrade to Spring AMQP 1.6.5.RELEASE 
Closes gh-7347
 2016-11-08 17:03:07 +01:00
Andy Wilkinson 9a70a4e261 Merge branch '1.5.x' 2016-11-08 14:43:05 +00:00
Andy Wilkinson d7ef48a9b6 Merge branch '1.4.x' into 1.5.x 2016-11-08 14:43:00 +00:00
Andy Wilkinson 2c4f39045f Stop relying on Artemis's on-demand queue creation in CLI JMS test 
Artemis's on-demand queue cretaion appears to be rather flakey,
sometimes failing with a NullPointerException.

This commit ensures that the queue used by the sample is created
during start up rather than on demand. This will hopefully make the
test that runs the sample more robust.

Closes gh-7346
 2016-11-08 14:36:58 +00:00
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