Commit Graph

10971 Commits

Author SHA1 Message Date
Andy Wilkinson
f7ee84a4d4 Upgrade to Postgresql 9.4.1211.jre7
Closes gh-6934
2016-09-19 20:26:20 +01:00
Andy Wilkinson
0bc713bb52 Upgrade to Jolokia 1.3.4
Closes gh-6933
2016-09-19 20:26:20 +01:00
Andy Wilkinson
1a9f2461db Upgrade to Jaybird 2.2.11
Closes gh-6932
2016-09-19 20:26:20 +01:00
Andy Wilkinson
15793b1abc Upgrade to Jetty 9.2.19.v20160908
Closes gh-6931
2016-09-19 20:26:19 +01:00
Andy Wilkinson
b6e3eb0db3 Upgrade to Tomcat 8.0.37
Closes gh-6930
2016-09-19 20:26:19 +01:00
Andy Wilkinson
4d84c4a489 Upgrade to JavaMail 1.5.6
Closes gh-6929
2016-09-19 20:12:30 +01:00
Andy Wilkinson
7665a0924f Upgrade to Spring Framework 4.3.3.RELEASE
Closes gh-6561
2016-09-19 19:40:54 +01:00
Andy Wilkinson
f8d32c555d Merge branch '1.3.x' 2016-09-19 19:39:39 +01:00
Andy Wilkinson
918ef04efa Upgrade to Spring Framework 4.2.8.RELEASE
Closes gh-6910
2016-09-19 19:38:46 +01:00
Andy Wilkinson
5806a18eee Upgrade to dependency management plugin 0.6.1.RELEASE
Closes gh-6810
2016-09-19 19:37:43 +01:00
Stephane Nicoll
111743275f Polish 2016-09-19 15:17:27 +02:00
Andy Wilkinson
6565ff616a Clarify documentation on using a Spring Boot app as a dependency
Closes gh-6812
2016-09-19 14:00:15 +01:00
Andy Wilkinson
155cfb1805 Fix boot curies href when server has custom servlet path
Previously, the servlet path was being applied twice. Once by the
code that sets up the DefaultCurieProvider and once by the provider
itself which uses ServletUriComponentBuilder's
fromCurrentServletMapping() to build the application URI.

This commit removes the duplicate logic when creating the
DefaultCurieProvider.

Closes gh-6585
2016-09-19 12:40:38 +01:00
Andy Wilkinson
5afd610855 Merge branch '1.3.x 2016-09-19 09:28:23 +01:00
Andy Wilkinson
93ab01263c Change the ownership of the pid folder when using a sub-folder
This is an alternative to the fix made in 3b52909 which removed the
chown call entirely.

Prior to 3b52909, the ownership of $PID_FOLDER was always changed even
when its value was /var/run. This was problematic as it could prevent
other services from creating their pid folder or file.

When a sub-folder is used, changing its ownership so that it’s owned by
the user that will run the app is desirable as it limits access to the
folder. Rather than removing the chown call entirely, this commit
ensures that it only happens when a sub-folder is being used to hold the
pid file.

Closes gh-6532
2016-09-19 09:27:38 +01:00
Stephane Nicoll
5371722c35 Upgrade to Caffeine 2.3.3
Closes gh-6923
2016-09-19 10:20:51 +02:00
Stephane Nicoll
f4da334f1c Upgrade to Ehcache 3.1.2
Closes gh-6922
2016-09-19 10:19:37 +02:00
Phillip Webb
b269ab0e4a Make DefaultApplicationArguments public
Fixes gh-6521
2016-09-18 23:41:03 -07:00
Phillip Webb
feee401f87 Merge pull request #6921 from izeye/polish-20160919
* pr/6921:
  Polish
2016-09-18 23:38:48 -07:00
Johnny Lim
a994b11a73 Polish 2016-09-18 23:38:21 -07:00
Phillip Webb
e239e64cb1 Only print MVC interactions when tests fail
Update `@AutoConfigureMockMvc` with a `printOnlyOnFailure` option which
allows errors to be printed only when tests fail. Defaults to `true`
meaning the logs are no longer cluttered with MVC results for passing
tests.

Fixes gh-6653
2016-09-18 23:37:46 -07:00
Phillip Webb
7ec14774a8 Polish 2016-09-18 23:37:46 -07:00
Andy Wilkinson
f266e8c69d Merge branch '1.3.x' 2016-09-18 22:10:37 +01:00
Andy Wilkinson
5a539ce381 Update launch script integration tests to work with Docker 1.12
Closes gh-6914 (I hope)
2016-09-18 22:10:26 +01:00
Stephane Nicoll
b69fd9229d Merge branch '1.3.x' 2016-09-18 17:12:39 +02:00
Stephane Nicoll
04b261984e Polish 2016-09-18 17:12:21 +02:00
Andy Wilkinson
472117299e Add some integration tests for the CLI’s quiet mode
See gh-6918
2016-09-18 10:56:18 +01:00
Andy Wilkinson
0a9bcd9893 Polish 2016-09-18 10:29:14 +01:00
Phillip Webb
ac2609b585 Fix WebDriver lifecycle issues
Update WebDriver support to ensure that the `.quit()` method is called
after each test method runs and that a new WebDriver instance is
injected each time.

Support is provided by introducing a new `Scope` which is applied by
a ContextCustomizerFactory and reset by a TestExecutionListener.

Fixes gh-6641
2016-09-18 00:18:29 -07:00
Phillip Webb
0ef845b96e Polish 2016-09-17 20:05:21 -07:00
Phillip Webb
82ae6e4049 Improve @AutoConfigureTestDatabase failure message
Fixes gh-6916
2016-09-17 19:56:25 -07:00
Phillip Webb
985ee58ad7 Merge pull request #6909 from mikegehard/patch-1
* pr/6909:
  Link to Spring Security OAuth2 reference docs
2016-09-17 19:46:20 -07:00
Mike Gehard
3d8b51d2e4 Link to Spring Security OAuth2 reference docs
Update documentation to include a link to Spring Security OAuth2's
reference documentation.

Closes gh-6909
2016-09-17 19:46:19 -07:00
Phillip Webb
6fc87764d5 Merge pull request #6919 from eddumelendez/gh-6904
* pr/6919:
  Add contextPath LocalHostUriTemplateHandler URIs
2016-09-17 19:35:01 -07:00
Eddú Meléndez
bc55b6e0d4 Add contextPath LocalHostUriTemplateHandler URIs
Update `LocalHostUriTemplateHandler` so that the `server.context-path`
property is also considered when building the URL.

Fixes gh-6904
Closes gh-6919
2016-09-17 19:33:06 -07:00
Phillip Webb
7299976d12 Fix banner property used in "quiet" mode
Fixes gh-6918
2016-09-17 19:23:42 -07:00
Phillip Webb
aad40093ff Make Mock/Spy qualifiers part of context cache key
Refine @MockBean/@SpyBean qualifier support so that qualifiers form part
of the context cache key. Prior to this commit is was possible that two
different tests could accidentally share the same context if they
defined the same @Mock but with different @Qualifiers.

See gh-6753
2016-09-17 18:43:43 -07:00
Phillip Webb
04448d6bd9 Polish 2016-09-17 18:43:43 -07:00
Stephane Nicoll
6ec1ac0aa0 Fix doc syntax
See gh-6593
2016-09-17 08:04:00 +02:00
Phillip Webb
0eab3e0c5a Drop printed link to reference documentation
Tweak the fix from 50c68a49 to no longer print a link the reference
documentation.

See gh-6593
2016-09-16 17:52:25 -07:00
Phillip Webb
2c621f4094 Fix @AutoConfigureTestDatabase imports
Update `@AutoConfigureTestDatabase` so that it always imports
`DataSourceAutoConfiguration`. Prior to this commit the annotation
could only be applied if something else also imported DataSource
auto-configuration.

Fixes gh-6897
2016-09-16 16:49:36 -07:00
Phillip Webb
825dd0a26c Merge branch '1.3.x' 2016-09-16 15:07:18 -07:00
Phillip Webb
3b52909fc2 Don't change ownership of PID_FOLDER
Update the launch script so that it no longer changes ownership of the
PID_FOLDER.

Commit b24e736cfe had changed the chown
line from:
	chown "$run_user" "$PID_FOLDER/${identity}"
to:
	chown "$run_user" "$PID_FOLDER"

This meant that it was possible for the launch script to change
ownership of `/var/run` and prevent later processes from writing to
the folder.

Since PID_FOLDER is created before the chown statement, and that
the `checkPermissions` function runs to ensure that the PID file can
be written, it appears that the chown is not even required.

Fixes gh-6532
2016-09-16 14:35:21 -07:00
Phillip Webb
b97e0bd471 Allow HttpPutFormContentFilter to be disabled
Add `spring.mvc.formcontent.putfilter.enabled` property to allow the
HttpPutFormContentFilter to be disabled.

Fixes gh-6519
2016-09-16 14:14:21 -07:00
Phillip Webb
a2e4127d4f Fix multi-annotation nested condition logic
Update `AbstractNestedCondition` to correctly group nested conditions
on members.

Fixes gh-6672
2016-09-16 13:31:55 -07:00
Phillip Webb
3172d434a7 Polish
Closes gh-6835
2016-09-16 13:31:54 -07:00
Andy Wilkinson
49f28b7941 Merge branch '1.3.x 2016-09-16 19:29:06 +01:00
Andy Wilkinson
faab9047d6 Start building against Spring Framework 4.2.8 snapshots
See gh-6910
2016-09-16 19:25:51 +01:00
Stephane Nicoll
b77eddb8bb Merge branch '1.3.x' 2016-09-16 16:58:53 +02:00
Stephane Nicoll
c2cdc1424b Polish documentation
Add an explicit note that states that "spring.datasource.url" (or more
specifically "spring.datasource.class-name" that is inferred from the
former) is necessary to connect to a database. If the class-name isn't
specified, Spring Boot will attempt to auto-configure an embedded
database.

Closes gh-6907
2016-09-16 16:58:39 +02:00