root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity
11,900 Commits 23 Branches 348 Tags 286 MiB
Commit Graph

1126 Commits

Author SHA1 Message Date
Andy Wilkinson 5036fc50fc Merge branch '1.5.x' 2017-01-17 21:17:03 +00:00
Andy Wilkinson 29adf2d85e Ensure that test closes InputStream that reads contents of output files 2017-01-17 21:16:20 +00:00
Andy Wilkinson c2efae06f0 Merge branch '1.5.x' 2017-01-17 14:35:40 +00:00
Andy Wilkinson 2973d3ed4b Polishing 2017-01-17 14:35:30 +00:00
Andy Wilkinson 467350a65d Merge branch '1.5.x' 2017-01-17 14:27:02 +00:00
Andy Wilkinson ed18478054 Give FileWritingMessageHandler more time to sort itself out 
See 3927dca3
 2017-01-17 14:26:14 +00:00
Andy Wilkinson 3fd597481f Merge branch '1.5.x' 2017-01-17 13:19:31 +00:00
Andy Wilkinson 682d0f524f Test insecure, insensitive endpoint with property that's always available 
The user property is only available on Unix-like platforms (due to
the USER environment variable). This commit updates the test to
explicitly set a specific property and then check that it's accessible
via the env endpoint rather than using one that is OS-specific.

See gh-7868
See gh-7881
 2017-01-17 13:17:32 +00:00
Andy Wilkinson f87e8d1def Merge branch '1.5.x' 2017-01-17 12:25:12 +00:00
Andy Wilkinson 8666248d27 Polishing 2017-01-17 12:25:01 +00:00
Andy Wilkinson 1ad7a66f03 Merge branch '1.5.x' 2017-01-17 11:53:14 +00:00
Andy Wilkinson 3927dca3e0 Tolerate files being briefly left open by FileWritingMessageHandler 
When the context is closed, FileWritingMessageHandler is stopped and
it closes its output files. However, it appears to do so in a manner
which means that they may be closed after the call to close the
context is completed. This causes problems on Windows as files that
are still open cannot be deleted.

This commit adds a workaround to SampleIntegrationApplicationTests
so that it makes up to 10 attempts each 0.5s apart to clean up the
input and output directories.
 2017-01-17 11:48:57 +00:00
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Johnny Lim acc36c076d Polish 
See gh-8004
 2017-01-17 09:53:50 +01:00
Stephane Nicoll 752a91c75b Merge branch '1.5.x' 2017-01-14 04:36:47 -05:00
Stephane Nicoll 7e557662a5 Polish contribution 
Closes gh-7916
 2017-01-14 04:35:58 -05:00
Praveendra Singh 36de58f0fe Polish samples list in readme 
See gh-7916
 2017-01-14 04:34:10 -05:00
Andy Wilkinson ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson d2201d5284 Correct copyright dates and enforce that starting year is 2012 
Closes gh-7923
 2017-01-13 18:43:30 -05:00
Phillip Webb b99c2daf31 Fixup broken version number 2017-01-06 00:05:25 -08:00
Phillip Webb c35454e5f4 Merge branch '1.5.x' 2017-01-05 23:40:58 -08:00
Phillip Webb f96294b63b Add LDAP sample 
Add an LDAP sample application.

See gh-7733
 2017-01-05 23:36:29 -08:00
Madhura Bhave 4ea47220e9 Match nested paths for insensitive actuators 
Update `ManagementWebSecurityAutoConfiguration` to match nested path
for insensitive actuators.

Prior to this commit, when Spring Security was on the classpath
nested paths were considered sensitive (even if the actuator
endpoint was not sensitive). i.e. when setting
`endpoints.env.sensitive=false` `/env` could be accessed without
authentication but `/env/user` could not.

Fixes gh-7868
Closes gh-7881
 2017-01-05 18:45:30 -08:00
Phillip Webb 18aa9be4fb Merge branch '1.4.x' into 1.5.x 2017-01-05 18:16:42 -08:00
Phillip Webb 21bfe52694 Add test to check class resources aren't exposed 
Closes gh-7880
 2017-01-05 18:15:50 -08:00
Phillip Webb 77f9bb09ca Further Polish Mockito 2 support 
See gh-7770
 2017-01-05 14:29:29 -08:00
Phillip Webb 7f99153daf Fixup parent POM version number 2017-01-05 13:57:30 -08:00
Phillip Webb 6776ec2704 Merge branch '1.5.x' 2017-01-05 11:04:37 -08:00
Phillip Webb 565f75438e Polish 2017-01-05 11:04:07 -08:00
Dave Syer 21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 2017-01-05 11:59:49 +00:00
Dave Syer fe344df9c5 Change default order of OAuth2 resource server filter chain 
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
 2017-01-05 11:58:36 +00:00
Phillip Webb 53f1df86a2 Merge branch '1.5.x' 2016-12-30 12:17:28 -08:00
Phillip Webb aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -08:00
Phillip Webb be3fe12cf0 Polish 2016-12-30 11:46:24 -08:00
Phillip Webb 273beaa3ce Polish 2016-12-30 11:10:44 -08:00
Stephane Nicoll 4604bb7e8a Merge branch '1.5.x' 2016-12-30 18:01:59 +01:00
Stephane Nicoll c903ff46a7 Polish samples 2016-12-30 17:57:14 +01:00
Stephane Nicoll a19a28062f Fix actuator security in samples 
Closes gh-7637
 2016-12-30 17:56:19 +01:00
Stephane Nicoll 9dfaf4de06 Merge branch '1.5.x' 2016-12-30 15:53:16 +01:00
Stephane Nicoll 3ed5a723bb Polish log4j2 sample 2016-12-30 15:50:45 +01:00
Phillip Webb 519f9c6c54 Merge branch '1.5.x' 2016-12-28 15:35:32 -08:00
Phillip Webb 97d7ffd8e8 Merge branch '1.4.x' into 1.5.x 2016-12-28 14:48:05 -08:00
Phillip Webb 61c931943f Fix Devtools PatternResolver Servlet support 
Update ClassLoaderFilesResourcePatternResolver to support servlet
resources when it's being used with a WebApplicationContext.

Prior to commit 918e122ddc a `ResourceLoader` was not added to the
`ApplicationContext`, meaning that servlet resources could be found by
virtue of the protected `getResourceByPath()` method. Following commit
918e122ddc, the context `ResourceLoader` is set, meaning that all calls
to `getResource` delegate to the `ResourceLoader` and the
`ApplicationContext` methods are not invoked. Since the devtools
`ResourceLoader` wasn't Servlet aware, servlet resources could not
be found.

Fixes gh-7752
 2016-12-28 14:25:11 -08:00
Phillip Webb 49fa702708 Merge branch '1.5.x' 2016-12-27 15:06:22 -08:00
Phillip Webb 85504e74a6 Merge branch '1.4.x' into 1.5.x 2016-12-27 15:05:15 -08:00
Mesut Can Gurle 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
Phillip Webb 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
Stephane Nicoll 80df396e3c Fix parent version 2016-12-27 12:43:15 +01:00
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 c3edf9e341 Fixup version numbers following release 2016-12-22 19:03:09 -08:00
Spring Buildmaster 9057f9ae1f Next development version 2016-12-23 00:15:23 +00: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
Stephane Nicoll ac9eb8a9a9 Fix Maven warning in samples 
Closes gh-7716
 2016-12-21 11:40:14 +01: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
Phillip Webb bd74c3d327 Polish formatting 2016-12-19 12:25:09 -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
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:44:20 +01:00
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample 
See gh-6991
Closes gh-7183
 2016-10-19 10:43:38 +01:00
Andy Wilkinson e49b5f241e Merge branch '1.5.x' 2016-10-17 15:30:02 +01:00
Andy Wilkinson 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
Phillip Webb 01900c8342 Merge branch '1.5.x' 2016-10-11 23:42:14 -07:00
Phillip Webb d818a09ed8 Polish 2016-10-11 23:38:14 -07:00
Stephane Nicoll c5cc626d48 Remove remote shell support 
See gh-7044
 2016-10-11 17:59:25 +02:00
Andy Wilkinson fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
Andy Wilkinson 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
Andy Wilkinson f137ec6a3a Merge branch '1.5.x' 2016-10-05 14:58:02 +01:00
Andy Wilkinson 846f264da8 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:57:51 +01:00
Andy Wilkinson 77f1da871f 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:54:23 +01:00
Phillip Webb d0d01b92b9 Fixup parent POM version 2016-10-03 22:54:06 -07:00
Phillip Webb 17bb3b51df Merge branch '1.5.x' 2016-10-03 22:53:10 -07:00
Phillip Webb 8fe755d281 Fixup parent POM version 2016-10-03 22:52:43 -07:00
Phillip Webb 6d11931421 Merge branch '1.4.x' into 1.5.x 2016-10-03 22:51:49 -07:00
Phillip Webb bd341cbac8 Polish 2016-10-03 22:51:21 -07:00
Phillip Webb 53f50eda39 Merge branch '1.5.x' 2016-10-03 22:47:11 -07:00
Phillip Webb a2315378d4 Formatting 2016-10-03 22:44:36 -07:00
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 2016-10-03 22:38:22 -07:00
Madhura Bhave 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
Phillip Webb f59cc25e2b Fix eclipse warnings 2016-10-03 21:51:16 -07:00
Andy Wilkinson d3d58bb2d2 Merge branch '1.5.x' 2016-09-29 21:09:41 +01:00
Andy Wilkinson 901aa2764b Merge branch '1.4.x' into 1.5.x 2016-09-29 21:09:18 +01:00
Andy Wilkinson 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
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0 
Closes gh-7049
 2016-09-29 20:33:21 +01:00
Andy Wilkinson 4d64c9c93d Merge branch '1.5.x' 2016-09-29 16:29:42 +01:00
Andy Wilkinson 733cfe9f70 Merge branch '1.4.x' into 1.5.x 2016-09-29 16:29:35 +01:00
Andy Wilkinson 51eb1ac04d Declare embedded queue up front in samples that use Artemis 
Closes gh-7063
 2016-09-29 16:28:40 +01:00
Andy Wilkinson 241ab10160 Merge branch '1.5.x' 2016-09-29 15:49:04 +01:00
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4 
Closes gh-6971
 2016-09-29 15:44:36 +01:00
Andy Wilkinson 464915d2cc Remove support for HornetQ following its deprecation in 1.4 
See gh-6971
 2016-09-29 15:44:36 +01:00
Andy Wilkinson 3e058e038f Merge branch '1.5.x' 2016-09-29 13:12:24 +01:00
Andy Wilkinson cd45ce9104 Merge branch '1.4.x' into 1.5.x 2016-09-29 13:12:11 +01:00
Andy Wilkinson 1bb5dc205d Update samples to use Artemis in place of HornetQ 
Closes gh-7057
 2016-09-29 11:52:09 +01:00
Stephane Nicoll 8b6d7eedc0 Merge branch '1.5.x' 2016-09-29 10:38:42 +02:00
Vedran Pavic c4aa78679a Upgrade Hazelcast to 3.7.1 
In addition, dependency management for `hazelcast-hibernate5` module has
been added, and a separate dependency version was introduced for
`hazelcast-hibernate4` module.

Closes gh-7023
 2016-09-29 10:37:29 +02:00
Stephane Nicoll d117ec45b8 Merge branch '1.4.x' into 1.5.x 2016-09-22 07:53:27 +02:00
Stephane Nicoll 85fb273596 Fix spring-boot-antlib version 
See gh-6978
 2016-09-22 07:52:02 +02:00
Andy Wilkinson aaf435ff2a Suppress Neo4J-related deprecation warnings 
See gh-6976
 2016-09-21 20:57:05 +01:00
Andy Wilkinson 08842c1273 Suppress Neo4J-related deprecation warnings 
See gh-6976
 2016-09-21 19:52:18 +01:00
Andy Wilkinson 16a0f72df5 Merge branch '1.5.x' 2016-09-21 17:03:35 +01:00
Andy Wilkinson c108da9d53 Upgrade to Spring Data Ingalls M1 
Closes gh-6785
Closes gh-5835
 2016-09-21 17:01:47 +01:00
Stephane Nicoll 9bc77254a7 Start building against Spring Framework 5 snapshot 
This commit enables compatibility build against Spring Framework 5.

The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.

This commit also switches the required java version to 8.

Closes gh-6977
 2016-09-21 17:37:02 +02:00
Stephane Nicoll 6643ec3713 Next development version 2016-09-21 17:05:50 +02:00
Stephane Nicoll 5684924f60 Polish 2016-09-21 17:01:43 +02:00
Stephane Nicoll 6bd670edbc Initiate 1.4.x branch 2016-09-21 11:11:24 +02:00
Stephane Nicoll 97083300d7 Fixup version numbers following release 2016-09-21 10:35:52 +02:00