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

1298 Commits

Author SHA1 Message Date
Andy Wilkinson
e0d9352e80 Merge branch '1.5.x' 2016-11-24 20:59:43 +00:00
Andy Wilkinson
dce1487424 Merge branch '1.4.x' into 1.5.x 2016-11-24 20:57:34 +00:00
Andy Wilkinson
e19c6245ef Consider endpoints.sensitive when endpoints.health.sensitive is not set 
Closes gh-7476
 2016-11-24 20:57:29 +00:00
Andy Wilkinson
95a763d528 Merge branch '1.5.x' 2016-11-22 11:08:10 +00:00
Andy Wilkinson
f5dd90815b Polishing: fix some compiler warnings 2016-11-22 11:07:51 +00:00
Phillip Webb
20d7dd5747 Merge branch '1.5.x' 2016-11-18 17:30:03 -08:00
Phillip Webb
1657120286 Move ModifiedClassPathRunner to its own module 
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
 2016-11-18 17:27:54 -08:00
Phillip Webb
c2c5611f77 Polish 2016-11-18 15:58:56 -08:00
Madhura Bhave
3a3228fc70 Add CORS interceptor for Cloud Foundry actuators 
This interceptor processes the response with CORS headers
and apepars before the Cloud Foundry security interceptor.

See gh-7108
 2016-11-18 09:26:31 -08:00
Andy Wilkinson
9273b1789b Merge branch '1.5.x' 2016-11-18 16:41:22 +00:00
Andy Wilkinson
1cd781b242 Make spring-boot-test compatible with Mockito 2.1 and 2.2 
We use some internal Mockito classes and some  breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.

To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.

Closes gh-6520
 2016-11-18 16:39:44 +00:00
Andy Wilkinson
93612116c5 Merge branch '1.5.x' 2016-11-18 11:54:48 +00:00
Andy Wilkinson
5527e3fdad Fix SpringApplicationHierarchyTests following latest Neo4j changes 
See gh-7391
 2016-11-18 11:54:05 +00:00
Phillip Webb
cb7c0b5031 Merge branch '1.5.x' 2016-11-16 16:06:53 -08:00
Johnny Lim
8038882d46 Polish 
Closes gh-7403
 2016-11-16 13:36:51 -08:00
Andy Wilkinson
4edab86ba2 Merge branch '1.5.x' 2016-11-16 09:13:32 +00:00
Andy Wilkinson
387a406aad Merge branch '1.4.x' into 1.5.x 2016-11-16 09:13:17 +00:00
Phillip Webb
d8b7d6dfdc Merge branch '1.5.x' 2016-11-15 18:53:54 -08:00
Phillip Webb
449b42ffa0 Polish LinksEnhancer to use endpoint name 
See gh-7164
See gh-7132
 2016-11-15 18:07:50 -08:00
Madhura Bhave
ada02232b9 Change LinksEnhancer to use endpoint name 
Update `LinksEnhancer` to use NamedEndpoint names as rel names. If the
endpoint name is not available, fallback to endpoint path. Allow
multiple hrefs per rel if path is different.

Fixes gh-7132
Closes gh-7164
 2016-11-15 18:03:26 -08:00
Madhura Bhave
0e3a3df6f4 Return log levels in /loggers endpoint payload 
Update `LoggersEndpoint` to additionally return the log levels actually
supported by the system.

Fixes gh-7396
 2016-11-15 14:32:02 -08:00
Phillip Webb
764f13453a Merge branch '1.4.x' into 1.5.x 2016-11-15 13:58:54 -08:00
Phillip Webb
bacf0878af Polish 2016-11-15 10:40:21 -08:00
Andy Wilkinson
86c55dda16 Merge branch '1.5.x' 2016-11-15 13:29:43 +00:00
Andy Wilkinson
24cc5d5644 Give javac's type inferencing a helping hand 2016-11-15 13:29:19 +00:00
Andy Wilkinson
e26a3e3766 Merge branch '1.5.x' 2016-11-15 13:14:44 +00:00
Andy Wilkinson
22e456a177 Merge branch '1.4.x' into 1.5.x 2016-11-15 13:14:30 +00:00
Madhura Bhave
ed75ed3d93 Merge branch '1.5.x' 2016-11-11 12:39:01 -08:00
Madhura Bhave
2697bf2ba1 Add Content-Type to allowed headers for CloudFoundry actuators 
See gh-7108
 2016-11-11 12:09:16 -08: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
Spring Buildmaster
e712a9ba8c Next Development Version 2016-11-08 16:55:37 +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
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
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
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
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
Phillip Webb
3435fdf7fd Merge branch '1.5.x' 2016-11-04 17:29:59 -07:00
Phillip Webb
6c76353682 Default management.cloudfoundry.enabled to true 
Update `CloudFoundryActuatorAutoConfiguration` so that it is enabled
when `management.cloudfoundry.enabled` is missing.

See gh-7108
 2016-11-04 17:26:25 -07:00
Madhura Bhave
a77cfc3b0e Skip SSL validation when calling Cloud Foundry 
Update CloudFoundrySecurityService so that SSL validation is not
required. We're unlikely to have configured public keys for the
REST endpoints we need to call. Since the endpoints are provided via
environment variables we can implicitly trust them.

See gh-7108
 2016-11-04 17:26:25 -07:00
Madhura Bhave
862a06eb7a Add POST to allowed CORS methods for CF actuators 
Update CORS configuration to support POST.

See gh-7108
 2016-11-04 16:41:49 -07:00