Commit Graph

17311 Commits

Author SHA1 Message Date
Andy Wilkinson
ca329d3d03 Update Jersey indicator class to one that requires the Servlet API
Previously, if WebFlux and Jersey were on the classpath, but there was
no Servlet API (and no embedded container) on the classpath, the web
application type would be prevented from being reactive. The absence
of the Servlet API would then prevent the web application type from
being servlet so it would be none.

By contrast, if Spring MVC was on the classpath in place of Jersey
the absence of the Servlet API would allow the web application type to
be reactive. This happened because the Spring MVC indicator class is
DispatcherServlet which requires the Servlet API.

This commit updates the Jersey indicator class to be ServletContainer.
This class is both an HttpServlet and a Filter so it too requires the
Servlet API and, therefore, further aligns the deduction behaviour for
Jersey and Spring MVC.

Closes gh-14701
2018-10-06 12:59:25 +01:00
Phillip Webb
6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Phillip Webb
456d1af443 Polish 2018-10-05 13:30:24 -07:00
Madhura Bhave
cdc6cfcaa8 Publish release notes after artifacts have been promoted
Closes gh-14604
2018-10-05 11:39:48 -07:00
Stephane Nicoll
febaf15b61 Guard WebApplicationType detection in case spring web is not present
Closes gh-14589
2018-10-05 16:41:22 +02:00
Andy Wilkinson
8573edc03e Provide complete dependency management for Micrometer
Closes gh-14700
2018-10-05 15:11:54 +01:00
Andy Wilkinson
ad647ba073 Make JSON-B auto-config back of if no JSON-P implementation is available
Closes gh-14675
2018-10-05 13:05:14 +01:00
Andy Wilkinson
8ee4c5e4a1 Use offical JSON API jar rather than Geronimo's in Artemis starter
Closes gh-14691
2018-10-05 12:44:53 +01:00
Andy Wilkinson
0ad0785bf7 Provide complete dependency management for Apache Johnzon
Closes gh-14692
2018-10-05 12:00:26 +01:00
Andy Wilkinson
7490d8b99d Make JSON-B auto-config back off when no implementation is available
Previously, the JSON-B auto-configuration would be enabled when the JSON-B API was
on the classpath. This led to a failure if there was no implementation available.

The JSON-B API loads an implementation using the service loader. This commit updates
the auto-configuration to be conditional on the presence of a
META-INF/services/javax.json.bind.spi.JsonbProvider file on the classpath.

Closes gh-14675
2018-10-05 11:03:49 +01:00
Stephane Nicoll
1da5d3462c Merge pull request #14620 from Hanope
* pr/14620:
  Simplify escaping of newline characters when publishing release notes
2018-10-05 10:38:05 +02:00
Hanope
31a5bfdcba Simplify escaping of newline characters when publishing release notes
Closes gh-14620
2018-10-05 10:37:26 +02:00
Andy Wilkinson
e7f100d5d7 Improve test coverage of PropertiesMeterFilter
Closes gh-14689
2018-10-05 08:37:19 +01:00
Stephane Nicoll
171f78a9ce Merge pull request #14688 from dreis2211
* pr/14688:
  Fix BeansEndpoint typo in readme
2018-10-05 09:11:24 +02:00
dreis2211
42a6c36716 Fix BeansEndpoint typo in readme
Closes gh-14688
2018-10-05 09:10:46 +02:00
Phillip Webb
2b6bdfe277 Fix Reactive...Context NPE
Fix possible NPE in `ReactiveWebServerApplicationContext`.

See gh-14666
2018-10-04 10:16:23 -07:00
Stephane Nicoll
1774a282b0 Merge pull request #14583 from ayudovin
* pr/14583:
  Polish "Make sure cache busting works with error pages"
  Make sure cache busting works with error pages
2018-10-04 17:54:08 +02:00
Stephane Nicoll
6cc272ecf5 Polish "Make sure cache busting works with error pages"
Closes gh-14583
2018-10-04 17:53:56 +02:00
artsiom
64f04fceea Make sure cache busting works with error pages
See gh-14583
2018-10-04 17:53:56 +02:00
Phillip Webb
8c896d9376 Improve Reactive...Context thread safety
Refactor `ReactiveWebServerApplicationContext` to improve thread safety
by using a single manager object rather than then trying to synchronize
the `WebServer` and `HttpHandler`.

Closes gh-14666
2018-10-04 07:59:39 -07:00
Andy Wilkinson
cf24d18139 Explicity set permissions on files in lib of Boot distribution
Previously, only the permissions for the scripts in bin/ were set. The
permissions for the files in lib/ were not explicity set, leaving them
with the same permissions as the source files in Gradle's cache. This
has proven to be a little brittle when building in certain
environments, leading to test failures. It also assumes that the
file permissions in Gradle's cache will be appropriate for entries in
a distribution archive. That may not always be a reasonable assumption
to make.

To avoid the above-described problems, this commit updates the copy
spec that's used to add files to lib/ in the archive so that each
file uses 0644 for its permissions.

Closes gh-14158
2018-10-04 15:55:48 +01:00
Stephane Nicoll
1b10d3fcbf Fix missing metadata for nested POJO
This commit fixes missing descriptions and default values when
applicable for `management.server.ssl`, `server.compression`,
`server.http2`, `server.servlet.jsp`, `server.servlet.session` and
`server.ssl`.

Those nested namespace are managed by a POJO that is declared outside
of the module of the target @ConfigurationProperties type using it. As
a result, the annotation processor has no access to the source model and
can't extract the description and the default value, if any.

This commit migrates the misleading field-level Javadoc to manual meta
data for the time being.

Closes gh-14669
2018-10-04 15:49:04 +02:00
Stephane Nicoll
a2203268f9 Merge pull request #14681 from rweisleder
* pr/14681:
  Clarify Javadoc of ConditionalOn annotations
2018-10-04 12:23:41 +02:00
Roland Weisleder
d2a063b26a Clarify Javadoc of ConditionalOn annotations
Closes gh-14681
2018-10-04 12:22:52 +02:00
Stephane Nicoll
b4c5aea152 Fix detection of WebApplicationType with context class
Closes gh-14589
2018-10-03 14:37:31 +02:00
Stephane Nicoll
73e6a39b44 Merge pull request #14670 from jvalkeal
* pr/14670:
  Polish docs
2018-10-03 13:40:16 +02:00
Janne Valkealahti
26345d3900 Polish docs
This commit replaces tabs to spaces in a yaml example for configuring
endpoint web exposure include.

Closes gh-14670
2018-10-03 13:39:20 +02:00
Stephane Nicoll
b248afc808 Clarify conversion system in Appendix
Closes gh-14645
2018-10-03 11:15:09 +02:00
Stephane Nicoll
135797c347 Remove useless prerequisites section
Closes gh-14668
2018-10-03 10:33:24 +02:00
Phillip Webb
bd9500290e Defer HttpHandler initialization
Update `ReactiveWebServerApplicationContext` so that the `HttpHandler`
bean is not longer created from `onRefresh`, but is instead created
only when the server starts.

Prior to this commit, the WebFlux hander would cause early
initialization of several beans, including Jackson Modules.

Closes gh-14666
2018-10-02 22:57:09 -07:00
Phillip Webb
7afde2ba43 Add another ConfigurationPropertyName.equals test
Include an additional test to ensure that `.equals` works for names
starting with the same value.

See gh-14665
2018-10-02 13:58:31 -07:00
Phillip Webb
923e47e978 Exclude ImportControl checkstyle rule from samples
See gh-14660
2018-10-02 12:13:44 -07:00
Phillip Webb
3ff20b2440 Restore import-control checkstyle
Restore checkstyle import control and fix a few violations in the
process.

Closes gh-14660
2018-10-02 10:30:14 -07:00
Phillip Webb
63b64b4efa Fix checkstyle import regex patterns
Update checkstyle rules to fix import regex patterns for both packages
and classes.
2018-10-02 09:15:24 -07:00
Stephane Nicoll
13491b5f94 Merge pull request #14514 from rodolphocouto
* pr/14514:
  Add reference to valiktor-spring-boot-starter
2018-10-02 10:48:03 +02:00
Rodolpho Couto
e30f693699 Add reference to valiktor-spring-boot-starter
Closes gh-14514
2018-10-02 10:47:26 +02:00
Stephane Nicoll
7163fe1f46 Merge pull request #14621 from izeye
* pr/14621:
  Polish
2018-10-01 10:50:42 -04:00
Johnny Lim
1eca492c5e Polish
See gh-14621
2018-10-01 10:46:27 -04:00
Andy Wilkinson
da1fde6a5f Merge branch '1.5.x' into 2.0.x 2018-10-01 15:38:53 +01:00
Andy Wilkinson
1471db220f Merge pull request #13714 from Welton Rodrigo Torres Nascimento
* gh-13714:
  Polish "Clarify that RestTemplateBuilder overwrites default converters"
  Clarify that RestTemplateBuilder overwrites default converters
2018-10-01 15:38:41 +01:00
Andy Wilkinson
5c1d22eed8 Polish "Clarify that RestTemplateBuilder overwrites default converters"
Closes gh-13714
2018-10-01 15:37:31 +01:00
Welton Rodrigo Torres Nascimento
3dbeff56e4 Clarify that RestTemplateBuilder overwrites default converters
See gh-13714
2018-10-01 15:37:12 +01:00
Andy Wilkinson
fd10226c54 Merge branch '1.5.x' into 2.0.x 2018-10-01 15:14:45 +01:00
Andy Wilkinson
17e9a2ee62 Polish 2018-10-01 15:14:18 +01:00
Andy Wilkinson
7d0dcf781c Merge branch '1.5.x' into 2.0.x 2018-10-01 14:48:15 +01:00
Andy Wilkinson
bc7bac8091 Only retrieve values from request if they will be traced
Closes gh-14550
2018-10-01 14:46:28 +01:00
Andy Wilkinson
62b481c7db Merge branch '1.5.x' into 2.0.x 2018-10-01 14:28:09 +01:00
Andy Wilkinson
3dc93641dd Clarify documentation on using Spock 1.0
Closes gh-14612
2018-10-01 14:26:47 +01:00
Andy Wilkinson
89f5cfc5a4 Merge branch '1.5.x' into 2.0.x 2018-10-01 13:51:55 +01:00
Andy Wilkinson
da1a17e8b2 Stop adding filters with disabled registrations to MockMvc
Closes gh-14636
2018-10-01 13:30:33 +01:00