Commit Graph

13261 Commits

Author SHA1 Message Date
Stephane Nicoll 82fd18cee3 Polish 2017-09-13 11:34:59 +02:00
Stephane Nicoll 4670cc7795 Relax use of spring.session.store-type
This commit makes the "spring.session.store-type" property optional,
adding an additional check when it is not present that validates only
one supported implementation is available on the classpath.

As Spring Session has been modularized, the chance that multiple
implementations are available on the classpath are lower. When only
one implementation is present, we attempt to auto-configure it. When
more than one implementation is present and no session store is
configured, a NonUniqueSessionRepositoryException is thrown.

Closes gh-9863
2017-09-13 11:20:34 +02:00
Stephane Nicoll de47827eb4 Merge pull request #10276 from izeye:java-8
* pr/10276:
  Use Java 8 Javadoc URL
2017-09-13 09:00:28 +02:00
Johnny Lim d12a86bcab Use Java 8 Javadoc URL
Closes gh-10276
2017-09-13 09:00:11 +02:00
Brian Clozel 4568333e39 Merge branch '1.5.x' 2017-09-12 14:29:36 +02:00
Brian Clozel 1669e4bad3 Fixup version numbers following release 2017-09-12 14:28:47 +02:00
Spring Buildmaster 30eb937a83 Next Development Version 2017-09-12 10:54:22 +00:00
Stephane Nicoll 40e6f004da Enable info and status endpoints by default
Closes gh-10161
2017-09-12 12:51:26 +02:00
Stephane Nicoll 222ed44bd4 Replace enabledByDefault to DefaultEnablement
This commit introduces a DefaultEnablement enum that replaces the
"enabledByDefault" boolean flag of Endpoint. This allows to better
control what indicates the default enablement of an endpoint.

With DefaultEnablement#ENABLED, the endpoint is enabled unless an
endpoint specific property says otherwise. With DefaultEnabled#DISABLED,
the endpoint is disabled unless an endpoint specific property says
otherwise. DefaultEnablement#NEUTRAL provides a dedicated option to
indicate that we should resort to the default settings in absence of
a specific property.

See gh-10161
2017-09-12 12:23:04 +02:00
Stephane Nicoll 6cd624ba39 Restore processing of Endpoint meta-data 2017-09-12 12:07:09 +02:00
Andy Wilkinson 6671a19cef Rework Lettuce configuration to use new client pooling config API
Closes gh-9538
2017-09-12 11:00:23 +01:00
Andy Wilkinson 02bc73b8e1 Polish 2017-09-12 10:23:39 +01:00
Andy Wilkinson 3882552b43 Polish 2017-09-12 10:22:35 +01:00
Andy Wilkinson 449515cecd Merge branch '1.5.x' 2017-09-12 10:09:10 +01:00
Andy Wilkinson 2a1cce9f13 Upgrade to Hikaricp Java7 2.4.13
Closes gh-10267
2017-09-12 10:07:25 +01:00
Andy Wilkinson b13beccc47 Upgrade to Appengine Sdk 1.9.56
Closes gh-10266
2017-09-12 10:07:24 +01:00
Andy Wilkinson d6535df2c7 Upgrade to Classmate 1.3.4
Closes gh-10265
2017-09-12 10:07:23 +01:00
Phillip Webb 46dfe38b60 Rework security request matchers
Update the security request matchers so that a bean is no longer needed
when the matcher is used. Matchers can now be build by starting from
the `EndpointRequest` or `StaticResourceRequest` classes. For example:

http.authorizeRequests()
  .requestMatchers(EndpointRequest.to("status", "info")).permitAll()
  .requestMatchers(EndpointRequest.toAnyEndpoint()).hasRole("ACTUATOR")
  .requestMatchers(StaticResourceRequest.toCommonLocations()).permitAll()

Closes gh-7958
2017-09-12 00:11:29 -07:00
Phillip Webb 2e51b48cd9 Refactor actuator package locations
Restructure actuator packages to improve structure. The following
changes have been made:

 - Separate actuator and actuator auto-configuration into different
   modules.
 - Move endpoint code into `spring-boot-actuator`.
 - Move `Endpoint` implementations from a single package into
   technology specific packages.
 - Move `HealthIndicator` implementations from a single package into
   technology specific packages.
 - As much as possible attempt to mirror the `spring-boot` package
   structure and class naming in `spring-boot-actuator` and
   `spring-boot-actuator-autoconfigure`.
 - Move `DataSourceBuilder` and DataSource meta-data support from
   `spring-boot-actuator` to `spring-boot`.

Fixes gh-10261
2017-09-12 00:11:20 -07:00
Phillip Webb 0f99b29b1a Temporarily remove security matchers
Temporarily back out `SpringBootSecurity` to enable easier
package refactoring.

See gh-10261
2017-09-12 00:02:34 -07:00
Phillip Webb ecb8461e8c Manually format security configuration
Update security configuration formatting to follow conventions
recommended in the Spring Security documentation.

See gh-7958
2017-09-11 23:58:52 -07:00
Stephane Nicoll 8f79ca9e65 Merge branch '1.5.x' 2017-09-12 08:27:00 +02:00
Stephane Nicoll 1ddc3dce0c Upgrade to Spring Integration Java Dsl 1.2.3.RELEASE
Closes gh-10262
2017-09-12 08:26:09 +02:00
Stephane Nicoll cf3226f799 Upgrade to Spring Integration 4.3.12
Closes gh-10034
2017-09-12 08:25:22 +02:00
Stephane Nicoll a80d466130 Upgrade to Spring Kafka 2.0.0.RC1
Closes gh-10120
2017-09-11 21:45:07 +02:00
Stephane Nicoll c41cfab749 Merge pull request #10240 from eddumelendez:update_junit_jupiter_ga
* pr/10240:
  Polish "Provide dependency management for JUnit Jupiter"
  Provide dependency management for JUnit Jupiter
2017-09-11 20:22:09 +02:00
Stephane Nicoll 1dc08fdda2 Polish "Provide dependency management for JUnit Jupiter"
Closes gh-10240
2017-09-11 20:21:21 +02:00
Eddú Meléndez bb4a8cdc0e Provide dependency management for JUnit Jupiter
Spring Framework 5 provides support for JUnit 5. This commit adds
dependency management for JUnit 5 and an upgrade for
spring-boot-sample-junit-jupiter sample.

See gh-10240
2017-09-11 20:03:26 +02:00
Stephane Nicoll e6811de4ac Merge branch '1.5.x' 2017-09-11 18:21:39 +02:00
Stephane Nicoll 6c4ed5e18b Merge pull request #10256 from aconstantin:patch-1
* pr/10256:
  Use underline instead of dash in tomcat properties
2017-09-11 18:21:24 +02:00
Alexander Constantin 281a93a0c4 Use underline instead of dash in tomcat properties
Closes gh-10256
2017-09-11 18:20:55 +02:00
Andy Wilkinson 6ac65a7783 Upgrade to Spring AMQP 2.0.0.RC1
Closes gh-9289
2017-09-11 17:17:46 +01:00
Andy Wilkinson c46cb2647b Upgrade to Spring Data Kay RC3
Closes gh-10124
2017-09-11 17:17:46 +01:00
Stephane Nicoll 1cd3b0cabe Remove auto-configuration for MapSessionRepository
This commit removes auto-configuration for Spring Session's simple in
memory support.

Closes gh-10253
2017-09-11 18:16:40 +02:00
Andy Wilkinson 93245a8297 Merge branch '1.5.x' 2017-09-11 17:13:44 +01:00
Andy Wilkinson 32e24f3e0a Upgrade to Spring AMQP 1.7.4
Closes gh-10248
2017-09-11 17:13:12 +01:00
Stephane Nicoll 6de364f2df Configure SessionRepositoryFilter with a custom SessionRepository
This commit makes sure that customizations on the
SessionRepositoryFilter are also applied when the user provides its
own SessionRepository.

Closes gh-10254
2017-09-11 17:54:34 +02:00
Stephane Nicoll b8eff0a0f6 Migrate tests to ApplicationContextRunner 2017-09-11 16:08:54 +02:00
Andy Wilkinson 85493367b6 Rework health response structure to eliminate chance of key clashes
Previously, if a health's details contained a key named status (either
because an indicator bean was named statusHealthIndicator or an
indicator added an entry named status to its details) this would
clash with the health's own status as the details were serialized as
siblings of the status field.

This commit updates Health to remove @JsonAnyGetter from getDetails().
This means that all of a Health's details will now be nested within
a separate details field, thereby preventing a possible clash with
the status field.

Closes gh-10249
2017-09-11 14:37:13 +01:00
Stephane Nicoll bc9d8bb1cf Upgrade to Reactor Bismuth-M4
Closes gh-10121
2017-09-11 14:32:47 +02:00
Stephane Nicoll 023a4b645e Upgrade to Spring Framework 5.0.0.RC4
Closes gh-10123
2017-09-11 14:31:51 +02:00
Andy Wilkinson ab3bf507c0 Start building against Spring Data Kay snapshots for RC 3
See gh-10124
2017-09-11 12:58:50 +01:00
Andy Wilkinson 7e87cc401d Merge branch '1.5.x' 2017-09-11 12:42:08 +01:00
Andy Wilkinson 596c32cd6a Update to Spring Data Ingalls SR7
Closes gh-10165
2017-09-11 12:41:31 +01:00
Andy Wilkinson dad7357b89 Merge branch '1.5.x' 2017-09-11 12:12:37 +01:00
Andy Wilkinson 5b1a4a0430 Note that management.context-path is relative to server.context-path
Closes gh-10200
2017-09-11 12:10:42 +01:00
Andy Wilkinson d92bc902b6 Merge branch '1.5.x' 2017-09-11 11:53:58 +01:00
Andy Wilkinson 5938df52ea Stop auto-config of MethodValidationPP triggering early init
Previously, if a user's configuration class provided a custom
Validator bean, that configuration class would be initialized very
early so that the Validator could be used to create the
auto-configured MethodValidationPostProcessor. This early
initialization could problems as it may prevent any of the
configuration class's dependencies from being post-processed.

This commit updates the injection of the Validator bean to be lazy,
thereby preventing the creation of the auto-configured
MethodValidationPostProcessor from triggering early initialization.

Closes gh-9416
2017-09-11 11:52:38 +01:00
Andy Wilkinson 971c9d3c34 Provide dependency management for Reactive Streams
Closes gh-10246
2017-09-11 11:07:17 +01:00
Andy Wilkinson fe96d765f2 Upgrade to Rxjava 1.3.1
Closes gh-10244
2017-09-11 11:07:17 +01:00