Commit Graph

25786 Commits

Author SHA1 Message Date
Stephane Nicoll
47efbd9052 Merge pull request #24208 from xJoeWoo
* pr/24208:
  Polish "Reduce redis health indicator info command result size"
  Reduce redis health indicator info command result size

Closes gh-24208
2020-11-25 14:30:39 +01:00
Stephane Nicoll
d506f0c73e Polish "Reduce redis health indicator info command result size"
See gh-24208
2020-11-25 14:27:07 +01:00
xJoeWoo
99cc3f4bfc Reduce redis health indicator info command result size
See gh-24208
2020-11-25 14:23:57 +01:00
Andy Wilkinson
12f2529be5 Allow actuator endpoint to have responses with custom HTTP statuses
Fixes gh-24123
2020-11-20 11:38:31 +00:00
Andy Wilkinson
fbf4c8cd32 Merge pull request #24095 from artembilan
* gh-24095:
  Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
  Ensure that MeterRegistry bean is defined before SI looks for it

Closes gh-24095
2020-11-20 11:36:17 +00:00
Andy Wilkinson
08b9d1da57 Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
See gh-24095
2020-11-20 11:20:31 +00:00
Artem Bilan
7d712aaa2d Ensure that MeterRegistry bean is defined before SI looks for it
Previously, it was possible for Spring Integration, including its
built-in Micrometer support, to be auto-configured before the
Micrometer auto-configuration had defined the MeterRegistry bean. This
resulted in missing Spring Integration metrics.

Spring Integration is unusual in having its own built-in Micrometer
support that it configures itself. Rather than providing
auto-configuration for Integration's Micrometer support (Which isn't
needed), this commit introduces some auto-configuration that just
affects the ordering of the auto-configuration classes. This ordering
ensures that the MeterRegistry bean has been defined by Spring
Integration is auto-configured. This ensures that the MeterRegistry
bean is known to the BeanFactory when Spring Integration goes looking
for it.

See gh-24095
2020-11-20 11:18:09 +00:00
Andy Wilkinson
96e40e97d2 Switch to Concourse's registry-image resource
Closes gh-24197
2020-11-18 11:16:37 +00:00
Stephane Nicoll
f3afd8a0f4 Fix location of Spring LDAP and Spring Session properties
Closes gh-23558
2020-11-18 10:28:54 +01:00
Stephane Nicoll
d96ff16da9 Merge pull request #24147 from stokpop
* pr/24147:
  Polish "Avoid unnecessary pattern compilation in WebFluxTags"
  Avoid unnecessary pattern compilation in WebFluxTags

Closes gh-24147
2020-11-18 10:08:38 +01:00
Stephane Nicoll
d3440880c4 Polish "Avoid unnecessary pattern compilation in WebFluxTags"
See gh-24147
2020-11-18 09:58:03 +01:00
Peter Paul Bakker
b22bb7ea04 Avoid unnecessary pattern compilation in WebFluxTags
See gh-24147
2020-11-18 09:58:03 +01:00
Madhura Bhave
4961599f53 Pin github-pr-resource to v0.21.0
Closes gh-24145
2020-11-17 16:21:24 -08:00
Stephane Nicoll
749f039b4b Merge pull request #24173 from izeye
* pr/24173:
  Provide dependency management for elasticsearch-rest-client-sniffer

Closes gh-24173
2020-11-17 21:33:00 +01:00
izeye
b17895844d Provide dependency management for elasticsearch-rest-client-sniffer
See gh-24173
2020-11-17 21:32:37 +01:00
Andy Wilkinson
039666a688 Upgrade to Gradle Enterprise Conventions 0.0.7
Closes gh-24175
2020-11-17 14:27:48 +00:00
Andy Wilkinson
27bc7db1fa Upgrade to Gradle Enterprise Maven Extension 1.7.1
Closes gh-24176
2020-11-17 14:24:52 +00:00
Andy Wilkinson
0c938ffa73 Merge pull request #24119 from dreis2211
* gh-24119:
  Fix link to Flyway callback docs

Closes gh-24119
2020-11-11 20:14:36 +00:00
dreis2211
033c78b945 Fix link to Flyway callback docs
See gh-24119
2020-11-11 20:14:08 +00:00
Andy Wilkinson
31042bfc49 Test inclusion of system scope dependencies in repackaged war
Closes gh-22503
2020-11-10 17:35:04 +00:00
Stephane Nicoll
48bfdc1314 Revert "Upgrade to testcontainers 1.15.0"
This reverts commit b1c446d1b2.
2020-11-10 07:49:23 +01:00
Stephane Nicoll
b1c446d1b2 Upgrade to testcontainers 1.15.0
Closes gh-24103
2020-11-10 07:20:26 +01:00
Andy Wilkinson
9c5d1646bd Show how to configure a case-sensitive physical naming strategy
Closes gh-24045
2020-11-05 15:53:32 +00:00
Stephane Nicoll
59ea7c11f6 Use most specific getter when generating metadata
This commit makes sure to use the most specific getter if more than
one candidate exists.

Closes gh-24002
2020-11-05 16:01:28 +01:00
Andy Wilkinson
006d4bc36d Do not set Tomcat's trust store password when null
See gh-24041
2020-11-05 12:18:32 +00:00
Andy Wilkinson
2425dcd200 Do not set Tomcat's key store and key pass when null
Fixes gh-24041
2020-11-05 11:30:04 +00:00
Andy Wilkinson
d3ea48b7a8 Configure DockerHub credentials on staging builds
See gh-24038
2020-11-04 20:48:14 +00:00
Andy Wilkinson
1172dbfec9 Log into DockerHub prior to running CI builds
Closes gh-24038
2020-11-04 20:31:49 +00:00
Andy Wilkinson
d5980be623 Clarify documentation for relaxed binding of environment variables
Closes gh-22974
2020-11-04 17:40:27 +00:00
Andy Wilkinson
a8b8f43180 Improve description of spring.datasource.initialization-mode
Closes gh-21121
2020-11-04 16:46:28 +00:00
Andy Wilkinson
c289ba0c2c Recommend disabling context root redirects with proxied Tomcat
Closes gh-22908
2020-11-04 10:13:55 +00:00
Andy Wilkinson
28ccf54b21 Ignore schema username when auto-configuring a test DB
Previously, when an embedded test database was being auto-configured
any schema username and password specified by the user would result
in a separate embedded test database being created to load the schema.
This then left the actual test database without the schema causing
test failures.

This commit updates the test database auto-configuration to set the
schema username to an empty string in a property source that's added
first to the environment's property sources. This causes any schema
username configured by the user to be ignored, preventing the creation
of a separate database for schema.sql processing.

Fixes gh-19321
2020-11-04 09:30:19 +00:00
Andy Wilkinson
c51c3432a6 Merge pull request #24020 from PascalSchumacher
* gh-24020:
  Fix typo in Spring Session documentation

Closes gh-24020
2020-11-03 20:32:04 +00:00
Pascal Schumacher
5472fcf433 Fix typo in Spring Session documentation
See gh-24020
2020-11-03 20:31:42 +00:00
Andy Wilkinson
2f280b01e1 Improve Spring Session back-off documentation
Closes gh-23151
2020-11-03 19:42:57 +00:00
Andy Wilkinson
35bff55097 Ensure that Quartz can be auto-configured with a Quartz-specific TM
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.

This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.

Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson
6548ca4c11 Implement equals and hashCode in TestTypeExcludeFilter
Fixes gh-23978
2020-11-03 14:50:00 +00:00
Andy Wilkinson
30a0ccab02 Remove use of @PostConstruct from main code
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.

To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.

Closes gh-23723
2020-11-03 13:59:38 +00:00
Andy Wilkinson
622606d85a Make it clearer that only the main DataSource bean may be replaced
Closes gh-23808
2020-11-03 10:24:44 +00:00
Andy Wilkinson
d32d65b02c Add tip about providing as much typo info as possible in @Bean methods
Closes gh-22925
2020-11-03 10:16:20 +00:00
Andy Wilkinson
e7eb7739dc Use overriding rather than overridden getter methods in config prop AP
Fixes gh-23966
2020-10-29 15:30:46 +00:00
Spring Buildmaster
79a833539b Next development version (v2.2.12.BUILD-SNAPSHOT) 2020-10-29 13:47:25 +00:00
Stephane Nicoll
cc3c898dfe Upgrade to github-changelog-generator 0.0.4
Closes gh-23965
2020-10-29 13:36:39 +01:00
Stephane Nicoll
3b899ee326 Merge branch '2.1.x' into 2.2.x 2020-10-29 13:35:50 +01:00
Spring Buildmaster
625a0c99cb Next development version (v2.1.19.BUILD-SNAPSHOT) 2020-10-29 11:15:37 +00:00
Stephane Nicoll
7de2711396 Merge branch '2.1.x' into 2.2.x 2020-10-29 11:21:16 +01:00
Stephane Nicoll
ec57251c55 Configure release script to use .RELEASE suffix 2020-10-29 11:01:32 +01:00
Stephane Nicoll
770b5f4528 Merge branch '2.1.x' into 2.2.x
See gh-23962
2020-10-29 09:33:37 +01:00
Stephane Nicoll
6c0fc7f195 Workaround broken function in concourse scripts
See spring-io/concourse-java-scripts#11
2020-10-29 09:32:50 +01:00
Stephane Nicoll
a8db6a8a83 Merge branch '2.1.x' into 2.2.x
See gh-23962
2020-10-29 08:28:25 +01:00