Commit Graph

7277 Commits

Author SHA1 Message Date
Andy Wilkinson f1af8c5510 Merge branch '2.1.x'
Closes gh-18889
2019-11-05 15:50:51 +00:00
Andy Wilkinson 59bc3c5602 Prevent recursive config props from causing a stack overflow
Previously, when the configuration properties annotation processor
encountered a property that was the same as an outer type that had
already been processed, it would fail with a stack overflow error.

This commit introduces the use of a stack to track the types that
have been processed. Types that have been seen before are skipped,
thereby preventing a failure from occurring. We do not fail upon
encountering a recursive type to allow metadata generation to
complete. At runtime, the recursive property will not cause a problem
if it is not bound.

Fixes gh-18365
2019-11-05 15:35:11 +00:00
Andy Wilkinson d8545bdead Merge branch '2.1.x'
Closes gh-18887
2019-11-05 14:23:11 +00:00
Andy Wilkinson 8b62f448ba Improve documentation on using Jersey alongside Spring MVC
Previously, the documentation did not provide any guidance on using
Jersey alongside Spring MVC or any other web framework.

This improves the documentation in two ways:

1. It notes that, in the presence of both Jersey and Spring MVC, the
   Actuator will prefer Spring MVC for exposing HTTP endpoints.
2. It adds a how-to describing how to configure Jersey to forward
   requests for which it has no handler on to the rest of the filter
   chain. When Spring MVC is the other framework, this allows them to
   be handled by its dispatcher servlet.

Closes gh-17523
2019-11-05 14:21:34 +00:00
Andy Wilkinson 571e4640de Merge branch '2.1.x'
Closes gh-18877
2019-11-05 13:26:45 +00:00
Andy Wilkinson bd06a91ac0 Recommend more overrides when using starter parent
This commit is a continuation of the work done in 987a5f81. In
addition to developers and licenses that are covered in the earlier
commit, a number of other settings are still inherited from the
starter parent. This commit updates the documentation to show them
being overridden as well.

Closes gh-18532
2019-11-05 13:25:53 +00:00
Stephane Nicoll d331f28222 Merge branch '2.1.x'
Closes gh-18885
2019-11-05 14:17:35 +01:00
dreis2211 1b2112ea8c Reduce method visibility in EndpointDiscovererTests
See gh-18884
2019-11-05 14:14:24 +01:00
Stephane Nicoll 4d1373c94d Polish "Support amqps:// URIs in spring.rabbitmq.addresses"
See gh-18808
2019-11-05 14:07:24 +01:00
Mark Pollack 0fedb24c6f Support amqps:// URIs in spring.rabbitmq.addresses
See gh-18808

Co-Authored-By: Bryan Kelly <xyloman@gmail.com>
2019-11-05 14:07:24 +01:00
Andy Wilkinson 49566edf6c Reduce visibility of test methods 2019-11-05 12:29:38 +00:00
Andy Wilkinson ce01f7f150 Merge branch '2.1.x'
Closes gh-18882
2019-11-05 11:05:51 +00:00
Andy Wilkinson ed50bf2494 Honour EndpointFilter configured on an endpoint's superclass
Previously, @EndpointFilter would only have an effect when used as
an annotation or meta-annotation on the endpoint class itself. It
would have no effect when used on a super-class of the endpoint
bean's class.

This commit updates EndpointDiscoverer so that an @EndpointFilter
annotation or meta-annotation on a super-class will be found and
applied to the discovery process. This is achieved by using find…
rather than get… when retrieving the attributes for the EndpointFilter
annotation.

Fixes gh-17866
2019-11-05 10:51:36 +00:00
Andy Wilkinson a65374b16b Merge branch '2.1.x'
Closes gh-18880
2019-11-05 10:29:43 +00:00
Andy Wilkinson cb76502a44 Document that JUL is not bridged into SLF4J when deployed to a container
Closes gh-16062
2019-11-05 10:28:39 +00:00
Andy Wilkinson 2c309c5d93 Merge branch '2.1.x'
Closes gh-18879
2019-11-05 10:09:26 +00:00
Andy Wilkinson 1c6f2af475 Clarify how to configure a Filter's order
Closes gh-18266
2019-11-05 10:06:17 +00:00
Andy Wilkinson 63dd159935 Merge branch '2.1.x'
Closes gh-18878
2019-11-05 09:58:04 +00:00
Andy Wilkinson 69a95ce5c1 Allow dependsOn relationships created by post-processor to be overridden
Previously, AbstractDependsOnBeanFactoryPostProcessor was unordered
which meant that it was impossible to guarantee that another bean
factory post-processor would run after it. This prevented overriding
of the dependsOn relationships that is creates.

This commit updates AbstractDependsOnBeanFactoryPostProcessor to give
it a default order of zero. This will allow additional bean factory
post-processors to be configured with a lower precedence order (values
greater than 0) so that they run after any
AbstractDependsOnBeanFactoryPostProcessor and can override the
dependencies that it has configured.

Fixes gh-18362
2019-11-05 09:53:36 +00:00
Andy Wilkinson abeafb325e Merge branch '2.1.x'
Closes gh-18877
2019-11-05 09:42:08 +00:00
Andy Wilkinson 987a5f8103 Recommend overriding licences and developers when using starter parent
Publishing to Maven Central requires spring-boot-starter-parent to
declare its license and developers. When a user then uses
spring-boot-starter-parent as their project's parent, these values
are inherited and this is almost certainly unwanted.

This commit updates the documentation to recommend and demonstrate
overriding the license and developers that are inherited from the
starter parent.

Closes gh-18532
2019-11-05 09:39:59 +00:00
Andy Wilkinson 36b1f65056 Merge branch '2.1.x'
Closes gh-18876
2019-11-05 09:24:18 +00:00
Andy Wilkinson 89e050d722 Document security risks of DevTools' remote support more clearly
Previously, the security risks and our recommendations on how to
mitigate them were not documented as clearly as they could have been.
This commit makes some changes to try to address this:

1. The security risk is now noted at the beginning of the section
2. The recommendation to use SSL is now documented more prominently
   and an alternative recommendation to only use remote support on
   a trusted network has been added.
3. The example secret has been removed to prevent copy and paste
4. A recommendation to use a secret that is unique and strong has been
   added

Closes gh-18825
2019-11-05 09:22:39 +00:00
dreis2211 689e02923f Remove non-existent FailureAnalyzer from spring.factories
See gh-18864
2019-11-05 09:28:21 +01:00
Stephane Nicoll da24a66ce6 Merge branch '2.1.x'
Closes gh-18875
2019-11-05 09:19:51 +01:00
Stephane Nicoll 5863a75c3c Polish "Document Settings as jooq supported auto-configuration type"
See gh-18870
2019-11-05 09:18:32 +01:00
Jens Teglhus Møller c34516cd9e Document Settings as jooq supported auto-configuration type
See gh-18870
2019-11-05 09:17:25 +01:00
Andy Wilkinson c2e11da5ba Upgrade to Spring Integration 5.2.1.RELEASE
Closes gh-18764
2019-11-05 08:07:34 +00:00
Andy Wilkinson de0e8b87d1 Upgrade to Spring Integration 5.1.9.RELEASE
Closes gh-18763
2019-11-05 08:06:03 +00:00
Andy Wilkinson 4b25339d57 Upgrade to Spring Security 5.1.7.RELEASE
Closes gh-18874
2019-11-05 08:05:48 +00:00
Andy Wilkinson c430035450 Upgrade to Spring Security 5.2.1
Closes gh-18869
2019-11-04 20:11:32 +00:00
Andy Wilkinson afbf256955 Upgrade to Micrometer 1.3.1
Closes gh-18867
2019-11-04 18:34:03 +00:00
Andy Wilkinson 377a8ee7cc Upgrade to Spring Kafka 2.3.2.RELEASE
Closes gh-18766
2019-11-04 16:45:41 +00:00
Andy Wilkinson b772d81f3a Upgrade to Spring AMQP 2.2.1.RELEASE
Closes gh-18762
2019-11-04 16:45:02 +00:00
Andy Wilkinson 8eb2146158 Upgrade to Spring Ws 3.0.8.RELEASE
Closes gh-18866
2019-11-04 16:44:38 +00:00
Andy Wilkinson c5eaf645d5 Upgrade to Spring Kafka 2.2.11.RELEASE
Closes gh-18765
2019-11-04 16:43:06 +00:00
Andy Wilkinson 4ffd44a235 Upgrade to Spring Ws 3.0.8.RELEASE
Closes gh-18865
2019-11-04 16:42:42 +00:00
Andy Wilkinson ea5fa2ccac Upgrade to Slf4j 1.7.29
Closes gh-18863
2019-11-04 15:51:56 +00:00
Andy Wilkinson 6731ad8197 Upgrade to Jooq 3.12.3
Closes gh-18862
2019-11-04 15:51:55 +00:00
Andy Wilkinson 949e3d930f Upgrade to Rxjava2 2.2.14
Closes gh-18861
2019-11-04 15:51:54 +00:00
Andy Wilkinson d75b855852 Upgrade to Spring AMQP 2.12.RELEASE
Closes gh-18761
2019-11-04 15:50:28 +00:00
Andy Wilkinson 1dc2768198 Upgrade to Slf4j 1.7.29
Closes gh-18860
2019-11-04 15:50:03 +00:00
Andy Wilkinson bf63d66131 Upgrade to Rxjava2 2.2.14
Closes gh-18859
2019-11-04 15:50:01 +00:00
Andy Wilkinson 8cdcafa43b Upgrade to Micrometer 1.1.8
Closes gh-18858
2019-11-04 15:49:59 +00:00
Andy Wilkinson 23130e1140 Upgrade to Spring Hateoas 1.0.1.RELEASE
Closes gh-18856
2019-11-04 15:36:46 +00:00
Andy Wilkinson 20ae19f0ba Upgrade to Spring Data Moore-SR1
Closes gh-18744
2019-11-04 15:35:33 +00:00
Andy Wilkinson ae5f2d7725 Do not require aspectjweaver to enable CGLib-based proxies
Previously, AopAutoConfiguration would only enable CGLib-based
proxies if aspectjweaver was on the classpath. The intention was for
CGLib-based proxies to always be used by default so this behaviour
was incorrect.

This commit updates AopAutoConfiguration to force the use of
CGLib-based proxies even in the absence of aspectjweaver.

Closes gh-18523
2019-11-04 15:19:06 +00:00
Andy Wilkinson 07ca7747fa Clarify what an endpoint needs to be auto-configured
Previously, the endpoint tables in the documentation include an
"Enabled by default" column that listed whether or not an endpoint
was enabled by default. This resulted in some confusion as an endpoint
could be listed as being enabled by default but not actually be
enabled as the requirements for it being auto-configured has not been
met.

This commit removes the "Enabled by default" column and replaces it,
where needed, with some extra information in the "Description"
column that describes what is needed for the endpoint to be
auto-configured.

Closes gh-18633
2019-11-04 14:39:45 +00:00
Andy Wilkinson e26d5d95a8 Do not enable @ConfigurationPropertiesScan be default
In 2.2.0, @ConfigurationPropertiesScan was enabled by default.
Unfortunately, this had the unexpected side-effect of breaking
conditional enablement of a @ConfigurationProperties class via
@EnableConfigurationProperties if the @ConfigurationProperties class
was in a package covered by scanning.

This commit remove @ConfigurationPropertiesScan from
@SpringBootApplication so that it is no longer enabled by default.
2.1.x users who rely upon such conditional enablement of
@ConfigurationProperties classes can now upgrade to 2.2.x without
having to make any changes. Users who do not have such a need and are
in a position to use configuration properties scanning can now opt-in
by adding @ConfigurationPropertiesScan to their main application class
alongside @SpringBootApplication.

Closes gh-18674
2019-11-04 14:09:33 +00:00
Andy Wilkinson 8aaba58cca Upgrade to Spring Data Lovelace-SR12
Closes gh-18743
2019-11-04 12:31:49 +00:00