Commit Graph

14093 Commits

Author SHA1 Message Date
Andy Wilkinson f4570710c1 Make Tomcat auto-config back off when UpgradeProtocol is absent
Closes gh-10960
2017-11-09 14:42:14 +00:00
Stephane Nicoll ad94181914 Merge pull request #10959 from dreis2211:use-compare-for-sorting-of-primitives
* pr/10959:
  Use Integer::compare in AutoConfigurationSorter
2017-11-09 09:51:03 +01:00
dreis2211 93b1ebb7fa Use Integer::compare in AutoConfigurationSorter
Closes gh-10959
2017-11-09 09:50:38 +01:00
Madhura Bhave 3be521e825 Add DefaultHandlerExceptionResolver to child context
Fixes gh-10560
2017-11-08 17:52:24 -08:00
Madhura Bhave 7c3e555ff9 Update Security features documentation
Closes gh-10844
2017-11-08 13:27:28 -08:00
Stephane Nicoll 8230cc5028 Upgrade to Thymeleaf 3.0.9.RELEASE
Closes gh-10954
2017-11-08 16:10:17 +01:00
Madhura Bhave 8db77a6a61 Properly configure tldSkipPatterns for Tomcat
Fixes gh-10391
2017-11-07 14:54:32 -08:00
Stephane Nicoll 424793d806 Merge branch '1.5.x' 2017-11-07 08:46:29 +01:00
Stephane Nicoll f975e8d363 Merge pull request #10941 from izeye:null-check
* pr/10941:
  Add missing null check in FileSystemWatcher.stopAfter()
2017-11-07 08:45:45 +01:00
Johnny Lim b965171b41 Add missing null check in FileSystemWatcher.stopAfter()
Closes gh-10941
2017-11-07 08:45:25 +01:00
Stephane Nicoll 373f7db3b5 Add missing supported source version
Closes gh-10929
2017-11-07 08:44:40 +01:00
Phillip Webb dd3dde3531 Make concourse pipeline public
Migrate concourse pipeline to use credhub and expose a limited number
of jobs as "public".

Closes gh-10693
2017-11-06 15:26:46 -08:00
Phillip Webb 06b1b453a6 Limit when SystemEnvironment mapping is used
Update `SpringConfigurationPropertySource` so that the
`SystemEnvironmentPropertyMapper` is only used for the "actual" system
environment property source. This allows SystemEnvironmentProperySource
class to be used for other purposes (for example, Spring Cloud uses it
to as an override source providing decryption).

Only property sources named `systemEnvironment` or ending with
`-systemEnvironment` now have the `SystemEnvironmentPropertyMapper`
applied. The `TestPropertyValues` has been retrofitted to name the
source it adds appropriately.

Fixes gh-10840
2017-11-06 13:12:25 -08:00
Phillip Webb e9f31f9c34 Improve configuration properties back-compatibility
Refine `SystemEnvironmentPropertyMapper` to support environment
variables that would have worked in Spring Boot 1.5. Specifically,
camelCase property bindings now support an additional underscore. The
recommended way to map `fooBar` is still `PREFIX_FOOBAR`, however,
`PREFIX_FOO_BAR` will now also work.

Fixes gh-10873
2017-11-06 11:21:16 -08:00
Phillip Webb 1e7d85a632 Polish 2017-11-06 10:11:50 -08:00
Andy Wilkinson 723222aa95 Allow configuredLevel to be null when configuring a logger
Null value is used to indicate that the configured level should be
cleared.

Closes gh-10934
2017-11-06 12:27:39 +00:00
Stephane Nicoll 4a9186b1b5 Merge pull request #10544 from tinexw:9299
* pr/10544:
  Polish "Log context path at startup"
  Log context path at startup
2017-11-06 12:49:48 +01:00
Stephane Nicoll dbea25fa8b Polish "Log context path at startup"
Closes gh-10544
2017-11-06 12:49:43 +01:00
tinexw f76479fb99 Log context path at startup
See gh-10544
2017-11-06 12:49:43 +01:00
Andy Wilkinson 60afbdc868 Polish 2017-11-06 11:44:53 +00:00
Stephane Nicoll 871d65d8f1 Merge pull request #10921 from izeye:polish-20171104
* pr/10921:
  Polish
2017-11-06 12:29:26 +01:00
Johnny Lim c05a299520 Polish
Closes gh-10921
2017-11-06 12:28:43 +01:00
Andy Wilkinson c9e18e2130 Merge branch '1.5.x' 2017-11-06 10:16:36 +00:00
Andy Wilkinson 963cfea3bb Start building against Spring Framework 4.3.13 snapshots
See gh-10680
2017-11-06 10:15:14 +00:00
Phillip Webb 0fbb4989da Allow recursive list binding when iterable source
Further refine recursive binding rules so that Lists are supported when
the underlying source is iterable.

Close gh-10702
2017-11-05 09:39:17 -08:00
Phillip Webb 5fb9162875 Merge branch 'gh-10702' 2017-11-04 23:14:44 -07:00
Phillip Webb 588dcf76c6 Only allow binder recursion with Maps
Refine the binder recursion rules introduced in commit f337323819 so
they only apply to Maps. Recursive List and Array binding is now no
longer allowed. Prior to this commit, binding a List that contained a
reference to itself would fail with a `StackOverflowException` if the
underlying property source was not iterable.

Fixes gh-10702
2017-11-04 23:14:03 -07:00
Madhura Bhave 99ad79dbe6 Add tests to trigger binder stack overflow error
Update `CollectionBinderTests` with additional tests that cause a
`StackOverflowException` due to recursive list binding.

See gh-10702
2017-11-04 23:06:38 -07:00
Phillip Webb 861469fb72 Remove accidental System.out 2017-11-04 21:57:59 -07:00
Phillip Webb fabf14ff35 Allow ApplicationPid to write to a new file
Update `ApplicationPid` so that "canWrite" is only called for files
that already exist.

See gh-9922
Fixes gh-10784
2017-11-03 23:54:31 -07:00
Phillip Webb 144625022c Merge pull request #10906 from jkschneider/micrometer-rc3
* gh-10906:
  Polish Micrometer 1.0.0-rc.3 upgrade
  Upgrade to Micrometer 1.0.0-rc.3
2017-11-03 23:48:48 -07:00
Phillip Webb cf17e5708b Polish Micrometer 1.0.0-rc.3 upgrade
Polish Micrometer 1.0.0-rc.3 upgrade changes.

Closes gh-10906
2017-11-03 23:47:51 -07:00
Jon Schneider 65e6876025 Upgrade to Micrometer 1.0.0-rc.3
Upgrade to Micrometer 1.0.0-rc.3 and refactor existing
auto-configuration to align with updated APIs.

Note that Spring MVC instrumentation has now changed from an interceptor
to a Filter.

See gh-10906
2017-11-03 23:37:25 -07:00
Phillip Webb fa191d8c73 Align ReactiveWebApplicationContext with framework
Refactor `ReactiveWebApplicationContext` implementations to align closer
with the `WebApplicationContext` implementations defined in
Spring Framework.

The following classes are now provided:

  - `AnnotationConfigReactiveWebApplicationContext` -- A refreshable
    reactive web context with support for `@Configuration` classes.

  - `GenericReactiveWebApplicationContext` -- A non-refreshable reactive
    GenericApplicationContext.

  - `ReactiveWebServerApplicationContext` --  A non-refreshable reactive
    GenericApplicationContext with support for server discovery.

  - `AnnotationConfigReactiveWebServerApplicationContext` -- A
    non-refreshable reactive `GenericApplicationContext` with support
    for `@Configuration` classes and server discovery.

These classes roughly align to the following Servlet equivalents:

  - `AnnotationConfigWebApplicationContext` (Spring Framework)
  - `GenericWebApplicationContext` (Spring Framework)
  - `ServletWebServerApplicationContext` (Spring Boot)
  - `AnnotationConfigServletWebServerApplicationContext` (Spring Boot)

An additional `ConfigurableReactiveWebEnvironment` interface as also
been introduced, primarily for `@ConditionalOnWebApplication` to use.

Fixes gh-10852
2017-11-03 19:07:23 -07:00
Phillip Webb b6166dc12a Move `Assume` to spring-boot-test-support
Fixes gh-10866
2017-11-03 19:07:23 -07:00
Phillip Webb 427d262297 Polish 2017-11-03 19:07:23 -07:00
Andy Wilkinson a0580da8fb Upgrade to Spring Ws 3.0.0.RELEASE
Closes gh-10920
2017-11-03 20:02:09 +00:00
Andy Wilkinson c801101b14 Upgrade to Selenium 3.7.0
Closes gh-10919
2017-11-03 20:02:09 +00:00
Andy Wilkinson d79deb3eb7 Upgrade to Infinispan 9.1.2.Final
Closes gh-10918
2017-11-03 20:02:08 +00:00
Andy Wilkinson ffc2351484 Upgrade to Javax Json 1.1.2
Closes gh-10917
2017-11-03 20:02:08 +00:00
Andy Wilkinson 18348dd205 Upgrade to Sendgrid 4.1.2
Closes gh-10916
2017-11-03 20:02:07 +00:00
Andy Wilkinson 90f9f969d3 Upgrade to Caffeine 2.6.0
Closes gh-10915
2017-11-03 20:02:06 +00:00
Andy Wilkinson 7b757dc69a Merge branch '1.5.x' 2017-11-03 20:00:36 +00:00
Andy Wilkinson 33796e7015 Upgrade to Spring Ws 2.4.2.RELEASE
Closes gh-10914
2017-11-03 19:18:25 +00:00
Andy Wilkinson d0272e452c Upgrade to Spring Cloud Connectors 1.2.5.RELEASE
Closes gh-10913
2017-11-03 19:18:25 +00:00
Andy Wilkinson 6756a7de7d Upgrade to Freemarker 2.3.27-incubating
Closes gh-10912
2017-11-03 19:18:24 +00:00
Andy Wilkinson 61bceaf933 Upgrade to Solr 5.5.5
Closes gh-10911
2017-11-03 19:18:23 +00:00
Andy Wilkinson 0f451b3079 Upgrade to Commons Pool2 2.4.3
Closes gh-10910
2017-11-03 19:18:23 +00:00
Andy Wilkinson 0d01d7bb5b Upgrade to Undertow 1.4.21.Final
Closes gh-10909
2017-11-03 19:18:22 +00:00
Andy Wilkinson bd6a86c85f Upgrade to Appengine Sdk 1.9.59
Closes gh-10908
2017-11-03 19:18:22 +00:00