Commit Graph

974 Commits

Author SHA1 Message Date
Phillip Webb 291752a317 Merge branch '1.5.x' 2016-12-24 11:26:50 -08:00
Phillip Webb a116579cfc Work around Jetty websocket client bug
Add workaround for Jetty JsrSession NullPointerException bug
(https://github.com/eclipse/jetty.project/issues/1202) in
`spring-boot-sample-websocket-jetty`.

See gh-7599
2016-12-24 11:22:58 -08:00
Phillip Webb a23591e047 Support Jetty 9.4 and upgrade to 9.4.0.v20161208
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.

Fixes gh-7599
2016-12-24 11:22:38 -08:00
Phillip Webb 6e02fe59f7 Merge branch '1.5.x' 2016-12-21 22:32:43 -08:00
Phillip Webb 982f41b70c Polish @IntegrationComponentScan auto-configuration
See gh-2037
See gh-7718
2016-12-21 22:22:50 -08:00
Phillip Webb 1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -08:00
Phillip Webb 6121208cbb Polish formatting 2016-12-19 12:47:03 -08:00
Andy Wilkinson 943262bb97 Raise the minimum supported version of Hibernate to 5.2.x
Closes gh-7586
2016-12-15 21:31:53 +00: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
Madhura Bhave d09aafacda Add a security interceptor for actuator endpoints
Update `AbstractEndpointHandlerMapping` to support a security
interceptor that can be used to enforce endpoint security.

Fixes gh-6889
2016-12-05 17:57:00 -08:00
Andy Wilkinson 2adb002275 Merge branch '1.5.x' 2016-12-02 11:21:10 +00:00
Andy Wilkinson cee2f818d6 Fix m2e error caused by spring-boot-sample-custom-layout 2016-12-02 11:20:39 +00:00
Andy Wilkinson 8a95d5d798 Remove Spring Data GemFire Starter and Sample
Closes gh-7465
2016-11-30 10:49:07 +00:00
Stephane Nicoll 655bffb8eb Merge branch '1.5.x' 2016-11-30 11:37:58 +01:00
Stephane Nicoll 740d28578b Promote plugin dependency management
This commit promotes the plugin dependency management for the
`maven-enforcer-plugin` and `maven-invoker-plugin` to the root. That way
these can be used in samples as well rather than having a separate copy.

Closes gh-7517
2016-11-30 11:37:48 +01:00
Stephane Nicoll 2577d79ff1 Merge branch '1.5.x' 2016-11-29 14:54:38 +01:00
Stephane Nicoll b618c70e52 Add test slice for pure jdbc tests
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.

Closes gh-6563
2016-11-29 14:54:15 +01:00
Stephane Nicoll e8d476dbca Fix use of `forceCreation` flag in `maven-jar-plugin` 2016-11-29 11:28:14 +01:00
Stephane Nicoll fcb405ebde Merge branch '1.5.x' 2016-11-29 10:04:49 +01:00
Stephane Nicoll 140379fc5a Fix Maven warnings 2016-11-29 10:03:49 +01:00
Stephane Nicoll cb6a7b79fe Fix build failure 2016-11-29 10:03:30 +01:00
Phillip Webb a055ef8614 Fix parent POM version following 1.5.x merge 2016-11-28 23:12:49 -08:00
Phillip Webb 450ab28163 Merge branch '1.5.x' 2016-11-28 17:27:05 -08:00
Phillip Webb 8432c52369 Add custom LayoutFactory sample
Add a sample that shows how a custom LayoutFactory can be used with
both Maven and Gradle.

Closes gh-7263
2016-11-28 16:31:53 -08:00
Phillip Webb e0dfff2b23 Merge branch '1.5.x' 2016-11-22 14:54:17 -08:00
Phillip Webb 88c84ce234 Merge branch '1.4.x' into 1.5.x 2016-11-22 14:53:30 -08:00
Phillip Webb ce58e16860 Add additional Tomcat timeout test
Update the Tomcat sample to also test that the connection timeout is
set.

See gh-7425
2016-11-22 14:30:36 -08: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 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
Stephane Nicoll 6aa57e8ffe Merge branch '1.5.x' 2016-11-12 11:16:43 +01:00
Stephane Nicoll 2b8801a6b5 Merge branch '1.4.x' into 1.5.x 2016-11-12 11:16:30 +01:00
Emanuel Rabina 6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc
Closes gh-7370
2016-11-12 11:15:00 +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 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 4407194c00 Replace sample by integration test
Closes gh-3888
2016-11-05 11:09:36 +01:00
Andy Wilkinson a350b66150 Merge branch '1.5.x' 2016-11-03 22:41:14 +00:00
Andy Wilkinson 025bafd911 Polish new Actuator sample 2016-11-03 22:40:12 +00:00
Phillip Webb 0cdde3b83c Merge branch '1.5.x' 2016-11-03 14:50:26 -07:00
Phillip Webb 81c5753f4d Merge branch '1.4.x' into 1.5.x 2016-11-03 14:49:38 -07:00
Phillip Webb 6a2ac080ac Create our own SessionCreationPolicy enum
Update `ManagementServerProperties` so that `security.sessions` no
longer uses `SessionCreationPolicy` from Spring Security. We now
use our own enun which allows `management.security.*` properties to
be set without the risk of a `ClassNotFoundException`.

Fixes gh-3888
2016-11-03 14:36:49 -07:00
Andy Wilkinson 4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots
Closes gh-7301
See gh-7029
2016-11-03 20:49:02 +00:00
Andy Wilkinson 57450042bb Merge branch '1.5.x' 2016-10-19 10:44:27 +01:00