Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,490 Commits 23 Branches 0 Tags
38891f7594debeef320ebcfc7050e9234f407dcf
Commit Graph

27490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
41f29aeccc Merge pull request #7551 from oscr:redundant-array-test 
* pr/7551:
  Remove redundant array creation for calling varargs method
 2016-12-14 19:12:41 +01:00
Oscar Utbult
38713c473f Remove redundant array creation for calling varargs method 
Closes gh-7551
 2016-12-14 19:12:08 +01:00
Stephane Nicoll
5b636a00b7 Merge branch '1.5.x' 2016-12-14 19:09:33 +01:00
Stephane Nicoll
e002e03b3e Merge branch '1.4.x' into 1.5.x 2016-12-14 19:09:18 +01:00
Stephane Nicoll
cfad35ad21 Merge pull request #7596 from 166MMX:patch-1 
* pr/7596:
  Update production-ready-features.adoc
 2016-12-14 19:08:31 +01:00
Johannes Harth
9746c63209 Update production-ready-features.adoc 
Replace line break with missing line fold "\\\n" to continue the property
value.

Closes gh-7596
 2016-12-14 19:06:39 +01:00
Andy Wilkinson
0f83351d72 Merge branch '1.5.x' 2016-12-14 16:35:26 +00:00
Andy Wilkinson
78517a6571 Merge branch '1.4.x' into 1.5.x 2016-12-14 16:35:19 +00:00
Andy Wilkinson
4d5fb97127 Revert "Start building against Spring Framework 4.3.5 snapshots" 
This reverts commit 727d626292. Sigh,
although the SPR issue is complete the change hasn't been backported
yet.
 2016-12-14 16:33:55 +00:00
Andy Wilkinson
e32e0ea0c5 Start building against Spring Batch 4.0 snapshots 
See gh-7645
 2016-12-14 15:07:39 +00:00
Andy Wilkinson
8d6c6bae9f Merge branch '1.5.x' 2016-12-14 15:01:02 +00:00
Andy Wilkinson
99edb0cec0 Merge branch '1.4.x' into 1.5.x 2016-12-14 15:00:50 +00:00
Andy Wilkinson
727d626292 Start building against Spring Framework 4.3.5 snapshots 
See gh-7601
 2016-12-14 14:59:38 +00:00
Andy Wilkinson
5a4a7409c9 Merge branch '1.5.x' 2016-12-13 13:02:59 +00:00
Andy Wilkinson
595679bed4 Disable management security when testing Jolokia endpoint 2016-12-13 13:02:40 +00:00
Andy Wilkinson
cea00f22b1 Merge branch '1.5.x' 2016-12-13 12:41:48 +00:00
Andy Wilkinson
149f19cd58 Register any EventListener beans with auto-configured SessionFactory 
Closes gh-7531
 2016-12-13 12:41:29 +00:00
Andy Wilkinson
0db924c369 Upgrade to Neo4j OGM 2.1.0 
Closes gh-7633
 2016-12-13 12:23:15 +00:00
Andy Wilkinson
e75eaf996f Merge branch '1.5.x' 2016-12-13 10:02:56 +00:00
Andy Wilkinson
d9e2368512 Merge branch '1.4.x' into 1.5.x 2016-12-13 10:02:52 +00:00
Andy Wilkinson
14a90aa52e Update SpringApplicationBuilder javadoc to reflect API changes 
Closes gh-7609
 2016-12-13 10:02:00 +00:00
Andy Wilkinson
133284c1c4 Merge branch '1.5.x' 2016-12-13 09:46:25 +00:00
Andy Wilkinson
391a760c3c Merge branch '1.4.x' into 1.5.x 2016-12-13 09:44:16 +00:00
Andy Wilkinson
4ec95b8308 Ensure that JolokiaMvcEndpoint destroys underlying controller 
Closes gh-7606
 2016-12-13 09:42:14 +00:00
Dave Syer
78b2931337 Merge branch '1.5.x' 2016-12-12 15:08:53 +00:00
Dave Syer
1baf3c63c4 Make the Spring Security part of CF autoconfig conditional 
Otherwise you get a class not found exception at runtime in
CF when Spring Securtity is not on the classpath.
 2016-12-12 15:05:48 +00:00
Dave Syer
cc8ecb6ff5 Clear VCAP_APPLICATION after tests 
So that other CF tests do not fail.
 2016-12-12 15:05:07 +00:00
Stephane Nicoll
3a30cbcd3d Merge branch '1.5.x' 2016-12-12 11:41:15 +01:00
Stephane Nicoll
95ee145281 Merge branch '1.4.x' into 1.5.x 2016-12-12 11:41:01 +01:00
Stephane Nicoll
b80ad2a212 Harmonize Caffeine CacheManager bean name 
Closes gh-6980
 2016-12-12 11:40:39 +01:00
Madhura Bhave
44cd625867 Merge branch '1.5.x' 2016-12-08 15:07:19 -08:00
Madhura Bhave
b29620f2ad Allow overriding case in SpringPhysicalNamingStrategy 
Fixes gh-7410
 2016-12-08 14:25:39 -08:00
Andy Wilkinson
2558f5c0e2 Merge branch '1.5.x' 2016-12-08 20:56:59 +00:00
Andy Wilkinson
5d7453a635 Merge branch '1.4.x' into 1.5.x 2016-12-08 20:56:34 +00:00
Andy Wilkinson
61f086591c Revert "Start building against Spring Framework 4.3.5 snapshots" 
This reverts commit 47f1aeb589.
 2016-12-08 20:55:57 +00:00
Andy Wilkinson
0d3daf4fd0 Merge branch '1.5.x' 2016-12-08 17:36:25 +00:00
Andy Wilkinson
671dea0d6b Merge branch '1.4.x' into 1.5.x 2016-12-08 17:36:21 +00:00
Andy Wilkinson
4a709ea86d Start building against snapshots for Spring Data Hopper SR6 
See gh-7602
 2016-12-08 17:35:53 +00:00
Andy Wilkinson
894b397d9e Merge branch '1.5.x' 2016-12-08 17:34:25 +00:00
Andy Wilkinson
a9f59d586d Merge branch '1.4.x' into 1.5.x 2016-12-08 17:33:57 +00:00
Andy Wilkinson
47f1aeb589 Start building against Spring Framework 4.3.5 snapshots 
See gh-7601
 2016-12-08 17:33:02 +00:00
Stephane Nicoll
fa492e3ac8 Merge branch '1.5.x' 2016-12-08 15:58:12 +01:00
Stephane Nicoll
8a50dae01a Add missing entry for server.tomcat.accesslog.buffered 
See gh-7456
 2016-12-08 15:57:44 +01:00
Andy Wilkinson
6eaa8d7c56 Merge branch '1.5.x' 2016-12-08 11:38:23 +00:00
Andy Wilkinson
53287eadf6 Merge branch '1.4.x' into 1.5.x 2016-12-08 11:38:13 +00:00
Andy Wilkinson
2d8344d46d Ensure that JarLauncher doesn't cause root jar to be on class path twice 
Closes gh-7595
 2016-12-08 11:34:22 +00:00
Madhura Bhave
6a1f3d2dab Merge branch '1.5.x' 2016-12-06 13:52:58 -08:00
Madhura Bhave
5d8e00cb56 Fix HealthMvcEndpointTests 
See gh-7569
 2016-12-06 13:18:10 -08:00
Madhura Bhave
1cd1054514 Merge branch '1.5.x' 2016-12-06 11:08:24 -08:00
Madhura Bhave
1be5812cf0 Require ACTUATOR role rather than ADMIN 
Update management security to require an `ACTUATOR` role rather than
`ADMIN` by default. This should reduce the risk of users accidentally
exposing actuator endpoints because they happen to use a role named
`ADMIN`.

Fixes gh-7569
 2016-12-05 17:58:16 -08:00