85504e74a6
Merge branch '1.4.x' into 1.5.x
2016-12-27 15:05:15 -08:00
ab2290eecd
Improve Cassandra sample README documentation
...
Update the README file in `spring-boot-sample-data-cassandra` with
details of how to setup the keyspace and create the tables.
Closes gh-7737
2016-12-27 12:56:22 -08:00
61f65ea10e
Add test for devtools + serving from `/public`
...
Add a simple test to show that basic serving of `/public` resources
works with devtoos.
See gh-7752
2016-12-27 12:24:32 -08:00
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
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
c3edf9e341
Fixup version numbers following release
2016-12-22 19:03:09 -08:00
9057f9ae1f
Next development version
2016-12-23 00:15:23 +00:00
982f41b70c
Polish @IntegrationComponentScan auto-configuration
...
See gh-2037
See gh-7718
2016-12-21 22:22:50 -08:00
ac9eb8a9a9
Fix Maven warning in samples
...
Closes gh-7716
2016-12-21 11:40:14 +01:00
6121208cbb
Polish formatting
2016-12-19 12:47:03 -08:00
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
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
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
cee2f818d6
Fix m2e error caused by spring-boot-sample-custom-layout
2016-12-02 11:20:39 +00:00
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
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
140379fc5a
Fix Maven warnings
2016-11-29 10:03:49 +01:00
cb6a7b79fe
Fix build failure
2016-11-29 10:03:30 +01:00
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
88c84ce234
Merge branch '1.4.x' into 1.5.x
2016-11-22 14:53:30 -08:00
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
f5dd90815b
Polishing: fix some compiler warnings
2016-11-22 11:07:51 +00:00
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
8038882d46
Polish
...
Closes gh-7403
2016-11-16 13:36:51 -08:00
2b8801a6b5
Merge branch '1.4.x' into 1.5.x
2016-11-12 11:16:30 +01:00
6b681ddfab
Upgrade Thymeleaf 3 layout dialect in doc
...
Closes gh-7370
2016-11-12 11:15:00 +01:00
72e696bcbd
Fixup version numbers following release
2016-11-08 18:24:42 +01:00
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
01e66ecbd5
Merge branch '1.4.x' into 1.5.x
2016-11-05 11:15:27 +01:00
4311cf333f
Remove sample reference in build
2016-11-05 11:14:50 +01:00
4407194c00
Replace sample by integration test
...
Closes gh-3888
2016-11-05 11:09:36 +01:00
025bafd911
Polish new Actuator sample
2016-11-03 22:40:12 +00:00
81c5753f4d
Merge branch '1.4.x' into 1.5.x
2016-11-03 14:49:38 -07:00
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
7962818294
Merge branch '1.4.x' into 1.5.x
2016-10-19 10:44:20 +01:00
6ac041c43b
Update Thymeleaf 3 related versions in docs and sample
...
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00
57108a9faa
Try to make the tests for the Cassandra sample more robust
...
Cassandra sometimes takes a long time when dropping the test keyspace.
This results in the test failing due to an exception being thrown.
This commit attempts to make the tests more robust by catching and
logging any exceptions thrown during server cleanup.
2016-10-17 15:28:50 +01:00
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
fe10ea73b0
Merge branch '1.4.x' into 1.5.x
2016-10-05 14:58:42 +01:00
ad3e5c04bb
Add a second, portal-compatible ID to the Gradle plugin
...
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.
This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.
Closes gh-6997
2016-10-05 14:58:26 +01:00
8fe755d281
Fixup parent POM version
2016-10-03 22:52:43 -07:00
6d11931421
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:51:49 -07:00
bd341cbac8
Polish
2016-10-03 22:51:21 -07:00
a2315378d4
Formatting
2016-10-03 22:44:36 -07:00
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:38:22 -07:00
16fe332f51
Fix NoClassDefFoundError when Mockito is missing
...
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.
Fixes gh-7065
2016-10-03 22:27:20 -07:00
f59cc25e2b
Fix eclipse warnings
2016-10-03 21:51:16 -07:00
901aa2764b
Merge branch '1.4.x' into 1.5.x
2016-09-29 21:09:18 +01:00
cf4142dbc0
Prevent htmlunit from pulling in commons-logging
...
Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.
Closes gh-7067
2016-09-29 21:08:15 +01:00
733cfe9f70
Merge branch '1.4.x' into 1.5.x
2016-09-29 16:29:35 +01:00
Phillip Webb
Mesut Can Gurle
Spring Buildmaster
Stephane Nicoll
Madhura Bhave
Andy Wilkinson
Johnny Lim
Emanuel Rabina