Commit Graph

10761 Commits

Author SHA1 Message Date
Ralph Goers 684b65e80c Remove ResourceUtils.getURL logging config check
Remove `ResourceUtils.getURL` checking from `LoggingApplicationListener`
so that logging systems can implement custom location support.

Prior to this commit, we checked in the listener if the specified config
location could be opened as a URL. This unfortunately prevents Log4J
extensions such as `log4j-spring-cloud-config-client` from implementing
configurable SSL and credentials support.

See gh-22946
2020-08-28 15:07:06 -07:00
Scott Frederick b70d0dd5ac Merge branch '2.3.x'
Closes gh-23134
2020-08-28 17:04:57 -05:00
Scott Frederick bc1834bfdf Ensure layer digest hashes contain 64 characters
This commit ensures that encoded digest hashes for Docker image
layers are zero-padded to the required 64 characters length.

Fixes gh-23132
2020-08-28 17:04:34 -05:00
Scott Frederick ccabc1a4c9 Merge branch '2.3.x'
Closes gh-23133
2020-08-28 15:18:30 -05:00
Scott Frederick 4f1b4c98ae Fail on Docker image load with empty response
In some cases, a call to the Docker image load API will fail but
return a 200 OK response status code and an empty response. This
commit detects that the response from this call is empty and
treats this condition as an error instead of a silent failure.

Fixes gh-23130
2020-08-28 15:18:02 -05:00
Andy Wilkinson 9ee2487a6e Merge branch '2.3.x'
Closes gh-23128
2020-08-28 14:37:20 +01:00
dreis2211 51c9dee899 Use DynamicPropertySource in MongoDB tests
See gh-23127
2020-08-28 14:32:01 +01:00
Andy Wilkinson 627ede8bff Remove duplicate jackson-datatype-jsr310 dependency
Closes gh-23123
2020-08-28 12:38:42 +01:00
Andy Wilkinson 2c166d1a58 Merge branch '2.3.x'
Closes gh-23125
2020-08-28 12:29:29 +01:00
Andy Wilkinson 33ef1b6e5b Merge branch '2.2.x' into 2.3.x
Closes gh-23124
2020-08-28 12:29:07 +01:00
Andy Wilkinson 5cd910c7ce Replace Embedded Mongo with Testcontainers' MongoDB support
Closes gh-23090
2020-08-28 12:00:31 +01:00
Andy Wilkinson 84a12c8436 Upgrade to Testcontainers 1.14.3
Closes gh-23122
2020-08-28 11:57:32 +01:00
Andy Wilkinson 9dc5b88949 Polish "Mark bootArchives configuration as unresolvable"
See gh-22943
2020-08-28 10:05:45 +01:00
Martin Chalupa 796307a78c Mark bootArchives configuration as unresolvable
See gh-22943
2020-08-28 10:05:44 +01:00
Phillip Webb cf8776b83c Expose originParents on actuator endpoints
Update `ConfigurationPropertiesReportEndpoint` and `EnvironmentEndpoint`
so that they expose `originParents` when they are available.

Closes gh-23018
2020-08-27 22:15:51 -07:00
Phillip Webb 3c1e141aef Add parent origin support to config data
Allow `ConfigDataLocationResolvers` to access `Origin` information for
locations so that they can be used as a parent origin of loaded items.

The `ResourceConfigData...` classes have been reworked so that loaded
`PropertySources` include the parent origin.

See gh-23018
2020-08-27 22:15:51 -07:00
Phillip Webb 960651c15a Add parent origin support
Update the `Origin` interface to include a default `getParent()` method
which can be used to get the parent origin. The `TextResourceOrigin`
has been updated to implement the method against the source `Resource`.
A new `OriginTrackedResource` implementation allows any `Resource` to
be decorated and carry an optional `Origin`.

Ultimately this will allow us to include parent `Origin` information
on properties loaded via a `PropertySourceLoader` without needing any
changes to that interface.

See gh-23018
2020-08-27 22:05:04 -07:00
Phillip Webb bc5958c398 Polish test method names
Polish method names to remove "should".
2020-08-27 21:28:16 -07:00
Phillip Webb c613d119f7 Support binding with multiple constructors
Update `DefaultBindConstructorProvider` so that binding to objects with
multiple constructors is allowed, as long as there is only one
non-public candidate.

Closes gh-23117
2020-08-27 21:28:16 -07:00
Stephane Nicoll 674ad85cdb Polish "Add support for RabbitMQ's addressShuffleMode property"
See gh-23091
2020-08-27 14:37:11 +02:00
Jonghan Kim 4b77e2e205 Add support for RabbitMQ's addressShuffleMode property
See gh-23091
2020-08-27 14:26:46 +02:00
Phillip Webb a2530ad5f1 Fix global optional config data opt-out test
See gh-23097
2020-08-26 21:06:21 -07:00
Phillip Webb aa0f204732 Add global optional config data opt-out
Support a `spring.config.all-locations-optional` property which can be
set to `true` if all config data locations should be considered
optional.

Closes gh-23097
2020-08-26 20:11:40 -07:00
Phillip Webb c1be5cb5e0 Add limited support for spring.profiles.include
Restore support for the `spring.profiles.include` property but only
for non-profile specific documents.

Closes gh-22944
2020-08-26 15:43:28 -07:00
Andy Wilkinson 6cfd2e3a33 Merge branch '2.3.x'
Closes gh-23095
2020-08-26 14:49:37 +01:00
Andy Wilkinson c74e0be0d2 Merge branch '2.2.x' into 2.3.x
Closes gh-23094
2020-08-26 14:49:12 +01:00
Andy Wilkinson 04540887af Widen timeout and delay to accommodate Windows' imprecision under load
Closes gh-23093
2020-08-26 14:48:33 +01:00
Johnny Lim e48af31ced Polish
See gh-23081
2020-08-26 10:47:45 +02:00
Andy Wilkinson 4320b3a919 Merge branch '2.3.x'
Closes gh-23089
2020-08-26 09:04:09 +01:00
Andy Wilkinson 4143c31f9c Merge branch '2.2.x' into 2.3.x
Closes gh-23087
2020-08-26 09:03:46 +01:00
Stephane Nicoll 28b938a229 Merge branch '2.3.x'
Closes gh-23088
2020-08-26 10:00:24 +02:00
dreis2211 d8ba7dd4d0 Remove unused methods
See gh-23086
2020-08-26 09:57:49 +02:00
Andy Wilkinson 6f047c8356 Polish "Handle null RSocketServer address when setting port property"
See gh-23084
2020-08-26 08:52:57 +01:00
spencergibb f08f948c3e Handle null RSocketServer address when setting port property
See gh-23084
2020-08-26 08:52:57 +01:00
Phillip Webb d0fce0553f Support extensionless file imports
Update `ResourceConfigDataLocationResolver` so that it can import files
that have no file extension.

Closes gh-22280
2020-08-25 13:57:10 -07:00
Phillip Webb 081a7ee28c Throw exception if import locations are not found
Update config data processing code so that import locations are
mandatory by default. Any import request will now throw a
`ConfigDataLocationNotFoundException` if the specified import
location cannot be found. For optional imports, the user can
use the `optional:` prefix to indicate that the application should
continue to start, even if the location does not exist.

Closes gh-23032
2020-08-25 12:56:55 -07:00
Andy Wilkinson 19558ecda7 Merge branch '2.3.x' 2020-08-25 16:51:17 +01:00
Andy Wilkinson d133f228e2 Increase wait times in DevToolsIntegrationTests
See gh-22909
2020-08-25 16:50:56 +01:00
Andy Wilkinson cf0036992f Increase timeouts used in Cassandra integration tests
Closes gh-23083
2020-08-25 16:33:26 +01:00
Andy Wilkinson e9ab269b3b Polish "Add a configuration property for KLC's idleBetweenPolls"
See gh-23048
2020-08-25 16:02:29 +01:00
hoaphan 03a8937d5c Add a configuration property for KLC's idleBetweenPolls
See gh-23048
2020-08-25 15:54:59 +01:00
Andy Wilkinson 56ded38f5d Generate default values from Duration and Period .ZERO
Closes gh-23082
2020-08-25 15:46:50 +01:00
Stephane Nicoll 085091dbe3 Adapt auto-configurations to back-off in presence of TransactionManager
Previous to this commit, an auto-configuration would create a
PlatformTransactionManager if none is present and others conditions are
met. Spring Framework now has the notion of TransactionManager, a parent
interface that gathers both PlatformTransactionManager and
ReactiveTransactionManager.

Spring Boot should not be in a situation where both managers are defined
out-of-the-box. This commit makes sure to back-off if any
TransactionManager is available.

Closes gh-22851
2020-08-25 15:32:38 +02:00
Stephane Nicoll f191b7513d Polish 2020-08-25 15:13:56 +02:00
Andy Wilkinson b57b2f0b44 Test the Gradle Plugin against 6.5 and 6.6
Closes gh-23075
2020-08-25 12:01:25 +01:00
Andy Wilkinson dbf583bc3c Merge branch '2.3.x' 2020-08-25 10:22:43 +01:00
Andy Wilkinson 0b3a1310bd Align managed version of Nimbus JOSE JWT with Spring Security
Closes gh-22996
2020-08-25 09:53:50 +01:00
Andy Wilkinson 7a5392d6bd Polish 2020-08-25 09:45:40 +01:00
Andy Wilkinson 4fa7b3dc02 Merge branch '2.3.x'
Closes gh-23072
2020-08-25 08:50:19 +01:00
Andy Wilkinson 858e1948dd Polish "Added dependency management for nimbus-jose-jwt"
See gh-22996
2020-08-25 08:49:36 +01:00
Thomas Kåsene 0277dce3da Added dependency management for nimbus-jose-jwt
See gh-22996
2020-08-25 08:49:36 +01:00
Stephane Nicoll 640000c0bb Disable file system preference for Freemarker templates
Previously to this commit, a project that has several classpath
locations matching the template path may lead to some of those
locations to be ignored if one of them is a directory. This can easily
happen if you run your tests in your IDE.

This commit changes the default of "preferFileSystemAccess" to
false so that the complete classpath is always considered.

Closes gh-23051
2020-08-24 18:22:50 +02:00
Andy Wilkinson 0417f949ad Start building against Reactor 2020.0.0-RC1 snapshots
See gh-23065
2020-08-24 15:58:53 +01:00
Stephane Nicoll deee3606c3 Merge branch '2.3.x'
Closes gh-23064
2020-08-24 12:21:12 +02:00
Stephane Nicoll 0374ed2a0c Merge branch '2.2.x' into 2.3.x
Closes gh-23063
2020-08-24 12:20:30 +02:00
Stephane Nicoll 5b0f22e8fe Fix unintended import on commons lang
Closes gh-23059
2020-08-24 12:12:33 +02:00
Stephane Nicoll 65a5994354 Merge branch '2.3.x'
Closes gh-23061
2020-08-24 11:57:42 +02:00
Stephane Nicoll 39dc2e7de4 Merge branch '2.2.x' into 2.3.x
Closes gh-23060
2020-08-24 11:57:22 +02:00
Stephane Nicoll f1455b156a Polish "Add example of custom Actuator operations"
See gh-23028
2020-08-24 11:56:31 +02:00
Ivo Smid e8de069e00 Add example of custom Actuator operations
See gh-23028
2020-08-24 11:37:00 +02:00
dreis2211 33cd875cb8 Simplify InputStream assertions
See gh-23052
2020-08-24 11:35:17 +02:00
Stephane Nicoll 2f7f5f4c8e Polish "Add Hyperledger Fabric for Spring Boot Starter"
See gh-23058
2020-08-24 11:33:02 +02:00
mvanmeerbeck cd6945aad2 Add Hyperledger Fabric for Spring Boot Starter
See gh-23058
2020-08-24 11:30:44 +02:00
Phillip Webb 758df17c7d Allow placeholders to be used in imports
Allow `${..}` property placeholders to be used in `spring.config.import`
properties. Prior to this commit, placeholders were not resolved when
binding the `ConfigDataProperty` instance. Furthermore, binding happened
too early for all placeholders to be resolved correctly. The
`ConfigDataEnvironmentContributor` class now has two states for imported
contributors, `UNBOUND_IMPORT` has the initial unbound state and is
eventually replaced with a `BOUND_IMPORT`.

Closes gh-23020
2020-08-23 20:27:12 -07:00
dreis2211 f7d6f38368 Fix typos in tests
See gh-23050
2020-08-22 11:44:19 -07:00
Phillip Webb d123c924a0 Add BootstrapRegisty support for config data
Expose the `BootstrapRegisty` to both `ConfigDataLocationResolver` and
`ConfigDataLoader` implementations. The registry is exposed via the
context interfaces and may be used to reuse instances that are expensive
to create. It may also be used to ultimately register beans with the
`ApplicationContext`.

Closes gh-22956
2020-08-20 21:49:03 -07:00
Phillip Webb 2260657781 Add BootstrapRegistry for long lived instances
Add a simple `BootstrapRegistry` that can be used to store and share
object instances across `EnvironmentPostProcessors`. The registry
can be injected into the constructor of any `EnvironmentPostProcessor`.

Registrations can also perform additional actions when the
`ApplicationContext` has been prepared. For example, they could register
the the bootstrap instances as beans so that they become available to
the application.

See gh-22956
2020-08-20 21:45:02 -07:00
Phillip Webb 167e31d564 Provide a simple Instantiator utility class
Make `Instantiator` a public utility class so that it can be used
by other parts of the codebase.

Closes gh-23029
2020-08-20 13:02:17 -07:00
Stephane Nicoll f7ef3445a6 Upgrade to Kotlin Coroutines 1.3.9
Closes gh-23025
2020-08-20 11:32:21 +02:00
Stephane Nicoll aed49c0631 Add configuration option for GridFsTemplate's bucket
Closes gh-22854
2020-08-20 10:45:51 +02:00
Scott Frederick ee41d71ea8 Merge branch '2.3.x'
Closes gh-23016
2020-08-19 16:12:44 -05:00
Scott Frederick 56bc0eb9e0 Use canonical path for CNB builder lifecycle binaries
This commit changes the path used to invoke lifecycle binaries in
CNB builders from `/lifecycle` to `/cnb/lifecycle` to conform to
the CNB spec. This will ensure the build plugin image-building
goals and tasks are compatible with future versions of builders
that may not support both paths.

See gh-23009
2020-08-19 16:11:59 -05:00
Phillip Webb c302b72083 Merge branch '2.3.x'
Closes gh-23015
2020-08-19 13:24:10 -07:00
Phillip Webb 8fd9c685a2 Reduce HTTP debug logging when building image
Update `BuildImageMojo` so that commons HTTP wire logging is configured
to ERROR. Without this update, running `mvn -X` will produce a great
deal of logging since by default HTTP Client logs all bytes transfered
at DEBUG and Maven will enable DEBUG for all logs.

Closes gh-22674
2020-08-19 13:20:06 -07:00
Phillip Webb c8d7aa8fbc Upgrade to Spring Kafka 2.6.0-SNAPSHOT
See gh-23012
2020-08-19 10:55:19 -07:00
Phillip Webb 847baba0b1 Upgrade to Spring AMQP 2.3.0-SNAPSHOT
See gh-23011
2020-08-19 10:53:39 -07:00
Phillip Webb 0beb30bb5a Upgrade to Spring Integration 5.4.0-SNAPSHOT
See gh-23010
2020-08-19 10:52:25 -07:00
Phillip Webb ea8bd75ba1 Merge branch '2.3.x' 2020-08-19 10:34:17 -07:00
Phillip Webb 73038267a0 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:34:06 -07:00
Phillip Webb 17e2d72bcb Fix Windows path issue in JarFileWrapperTests
See gh-22991
2020-08-19 10:33:23 -07:00
Phillip Webb bb57c7eacf Merge branch '2.3.x' 2020-08-19 10:26:25 -07:00
Phillip Webb 8722c2c5de Close writer after use in ExtractCommandTests
Update `ExtractCommandTests` so that the writer is closed after the
contents have been written.

See gh-22993
2020-08-19 10:25:37 -07:00
Phillip Webb bd5266b9b1 Merge branch '2.3.x' 2020-08-19 10:22:55 -07:00
Phillip Webb 0dd38a7264 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:22:45 -07:00
Phillip Webb 3fe2005e06 Use @AfterEach to close the source jar file
Update `JarFileWrapperTests` so that the jar files are closed after each
test.

See gh-22991
2020-08-19 10:22:10 -07:00
Stephane Nicoll d04f2583f1 Merge branch '2.3.x'
Closes gh-23005
2020-08-19 10:09:43 +02:00
Stephane Nicoll 9a374f7d67 Merge branch '2.2.x' into 2.3.x
Closes gh-23004
2020-08-19 10:09:22 +02:00
dreis2211 06eb7e9777 Mention correct JUnit 5 annotations in Kotlin testing section
See gh-23002
2020-08-19 10:07:40 +02:00
Phillip Webb 899e8e189b Merge branch '2.3.x'
Closes gh-23001
2020-08-18 16:49:12 -07:00
Phillip Webb f7452b9383 Ensure LayoutFactory is not passed an empty file
Update `Repackager` to ensure that `getLayout` is called before we
backup the source file. This restores earlier behavior that some
custom `ModuleFactory` implementations were relying on.

Closes gh-22995
2020-08-18 16:45:44 -07:00
Phillip Webb cfc053d75e Merge branch '2.3.x' 2020-08-18 16:21:23 -07:00
Phillip Webb c5b12effbf Merge branch '2.2.x' into 2.3.x 2020-08-18 16:21:03 -07:00
Phillip Webb 2a137a2d8a Remove Mockito from JarFileWrapperTests
Remove Mockto from JarFileWrapperTests since it seems to be failing on
later versions of Java.

See gh-22991
2020-08-18 16:20:05 -07:00
Phillip Webb ea8762c484 Update copyright year of changed files 2020-08-18 15:40:05 -07:00
Phillip Webb 2fb08ca48f Merge branch '2.3.x' 2020-08-18 15:39:29 -07:00
Phillip Webb 15a0cbc96b Update copyright year of changed files 2020-08-18 15:39:23 -07:00
Phillip Webb aa2580bb51 Merge branch '2.3.x' 2020-08-18 15:39:08 -07:00
Phillip Webb ba2ab3363b Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:53 -07:00
Phillip Webb 60b5de192c Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:11 -07:00
Phillip Webb 4e76138ebc Update copyright year of changed files 2020-08-18 15:37:59 -07:00
Phillip Webb 5997cbd21f Refine AbstractJarFile method visibility
Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
2020-08-18 15:37:37 -07:00
Scott Frederick 341615d7d0 Merge branch '2.3.x'
Closes gh-23000
2020-08-18 17:07:25 -05:00
Scott Frederick 3f80638a36 Fail on layertools extract with launch script
This commit adds a check to the `layertools extract` command to
ensure that the jar file being processed is readable and has a
valid directory.

Fixes gh-22993
2020-08-18 17:06:31 -05:00
Phillip Webb b60820564e Merge branch '2.3.x'
Closes gh-22999
2020-08-18 14:35:59 -07:00
Phillip Webb 2b1b096fac Merge branch '2.2.x' into 2.3.x
Closes gh-22998
2020-08-18 14:35:45 -07:00
Phillip Webb aac367e9c5 Attempt to fix memory leak in JarFile class
Create a new `JarFileWrapper` class so that we can wrap and existing
`JarFile` and offer a version that can be safely closed.

Prior to this commit, we provided wrapper functionality in the `JarFile`
class itself. Unfortunately, because we override `close` and also create
a lot of wrappers this caused memory issues when running on Java 11.

With Java 11 `java.util.zip.ZipFile` class uses `FinalizableResource`
for any implementation that overrides `close()`. This means that any
wrapper classes will not be garbage collected until the JVM finalizer
thread runs.

Closes gh-22991
2020-08-18 14:07:03 -07:00
Stephane Nicoll 0b28236e55 Rename neo4j.version to neo4j-java-driver.version
Closes gh-22952
2020-08-18 11:00:11 +02:00
Phillip Webb 9460d74e8a Rename CompositeMeterRegistryAutoConfiguration
Rename `CompositeMeterRegistryAutoConfiguration` to
`MeterRegistryAutoConfiguration` since it can also create non-composite
registries.

Closes gh-22988
2020-08-17 16:41:10 -07:00
Phillip Webb 12bae2ad52 Merge branch '2.3.x'
Closes gh-22990
2020-08-17 16:18:23 -07:00
Phillip Webb ff36f8bab8 Merge branch '2.2.x' into 2.3.x
Closes gh-22989
2020-08-17 16:17:47 -07:00
Phillip Webb 10da595302 Polish 'Order metrics auto-configurations correctly'
See gh-21134
2020-08-17 16:10:18 -07:00
Martin Benda 02b7ec787e Order metrics auto-configurations correctly
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.

Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.

See gh-21134
2020-08-17 16:03:27 -07:00
Scott Frederick b7fdf8fe87 Preserve user-provided values in MongoClientSettings
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.

Fixes gh-22321
2020-08-17 16:07:40 -05:00
Phillip Webb 9c6f0d8f7e Merge branch '2.3.x'
Closes gh-22984
2020-08-17 12:40:18 -07:00
Scott Frederick c2ec46c5b1 Polish "Fix include exception handling in DefaultErrorAttributes"
See gh-22750
2020-08-17 13:33:59 -05:00
Lopfest c49605cd7b Fix include exception handling in DefaultErrorAttributes
This commit fixes a problem with the handling of the includeException
field in DefaultErrorAttributes.

See gh-22750
2020-08-17 13:33:59 -05:00
Stephane Nicoll f8265e3e44 Merge branch '2.3.x'
Closes gh-22980
2020-08-17 14:20:50 +02:00
Jean-Baptiste Nizet 27528fdd07 Fix custom image name example and documentation
There is no `artifactId` property in a gradle Project, and the default
value uses the project name.

See gh-22918
2020-08-17 13:59:42 +02:00
Stephane Nicoll b1e631e8a6 Remove trailing whitespaces 2020-08-17 13:59:08 +02:00
Stephane Nicoll 8c0318edc7 Polish "Consider RecordFilterStrategy in Kafka auto-configuration"
See gh-22973
2020-08-17 13:54:20 +02:00
anshlykov f68dfde35e Consider RecordFilterStrategy in Kafka auto-configuration
See gh-22973
2020-08-17 13:37:00 +02:00
dreis2211 61838eede1 Fix typos in docs
See gh-22945
2020-08-17 13:27:46 +02:00
Stephane Nicoll 80e9bfb9a6 Merge branch '2.3.x' 2020-08-17 13:26:58 +02:00
Stephane Nicoll 6b679b7d64 Polish
See gh-22945
2020-08-17 13:24:51 +02:00
Phillip Webb 4df618a2b1 Merge branch '2.3.x'
Closes gh-22967
2020-08-14 17:12:53 -07:00
Phillip Webb f75e988450 Merge branch '2.2.x' into 2.3.x
Closes gh-22966
2020-08-14 17:12:41 -07:00
Phillip Webb 3271542d98 Add @Interited to @TypeExcludeFilters
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
2020-08-14 17:12:31 -07:00
Phillip Webb 7a85373fea Merge branch '2.3.x'
Closes gh-22965
2020-08-14 17:09:13 -07:00
Phillip Webb 1675b47637 Merge branch '2.2.x' into 2.3.x
Closes gh-22964
2020-08-14 17:08:48 -07:00
Phillip Webb 89a6f83344 Fix and improve SpringApplicationBuilder javadoc
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
2020-08-14 17:06:39 -07:00
Phillip Webb 3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb 5591a6ab77 Merge branch '2.3.x'
Closes gh-22961
2020-08-14 15:11:47 -07:00
Phillip Webb 03d4b89c06 Merge branch '2.2.x' into 2.3.x
Closes gh-22960
2020-08-14 15:11:23 -07:00
Maciej Walkowiak 15de956566 Fix typo `Assert4J` -> `AssertJ`
See gh-22948
2020-08-14 15:09:56 -07:00
Madhura Bhave bbbbe8e4d2 Make security auto-configs back off when SecurityFilterChain present
Closes gh-22739
2020-08-14 12:24:25 -07:00
Andy Wilkinson c9b8a05321 Merge branch '2.3.x' 2020-08-14 15:41:20 +01:00
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout
See gh-22909
2020-08-14 15:34:41 +01:00
Phillip Webb 310ef6e999 Rename volumemount -> configtree
Closes gh-22941
2020-08-13 13:28:25 -07:00
Phillip Webb 5579f9d1c4 Polish 2020-08-13 11:53:36 -07:00
Scott Frederick 2a998a4373 Fix DataNeo4jTestReactiveIntegrationTests
See gh-22940
2020-08-13 13:45:04 -05:00
Stephane Nicoll 045d2f678d Document Spring Data Neo4j 6 support
Closes gh-22652
2020-08-13 17:51:39 +02:00
Stephane Nicoll d4ba55f8d6 Do not configure a ReactiveNeo4jTransactionManager
The current arrangement with Neo4j does not allow us to know for sure
that the user intends to use `@Transactional` for reactive or imperative
operations.

The main reason for that is that the only trigger for the reactive
auto-configuration is the presence of reactor on the classpath given
that the Neo4j driver ships with both styles in the same jar. And
reactor can be on the classpath for a number of reasons that are
unrelated to imperative access (typically `WebClient`).

This commits removes the auto-configuration of the
ReactiveNeo4jAutoConfiguration and makes sure that if the user defines
one, the regular `PlatformTransactionManager` backs off. This is
a temporarily situation until we can provide a better signal that the
user intends to primarily use imperative repositories.

Closes gh-22940
2020-08-13 16:57:51 +02:00
Andy Wilkinson 4398c71d12 Merge branch '2.3.x'
Closes gh-22938
2020-08-13 13:32:27 +01:00
Andy Wilkinson 8c4e6f766c Revert "Merge pull request #21060 from dsyer"
This reverts commit 6547ea56f9, reversing
changes made to e9e4a34e62.

Fixes gh-22039
2020-08-13 13:31:45 +01:00
Andy Wilkinson 1c8392e980 Upgrade to Selenium HtmlUnit 2.43.1
Closes gh-22937
2020-08-13 12:04:42 +01:00
Andy Wilkinson 7310b7dbcd Upgrade to Micrometer 1.5.4
Closes gh-22936
2020-08-13 12:04:40 +01:00
Andy Wilkinson 1c930396b4 Upgrade to Flyway 6.5.4
Closes gh-22935
2020-08-13 12:04:39 +01:00
Stephane Nicoll 2f5145b6a1 Upgrade to Micrometer 1.5.4
Closes gh-22932
2020-08-13 13:04:03 +02:00
Andy Wilkinson a087d706d0 Upgrade to Spring Batch 4.3.0-M2
Closes gh-22892
2020-08-13 12:03:07 +01:00
Stephane Nicoll 42ca62b2e7 Merge branch '2.3.x'
Closes gh-22931
2020-08-13 11:49:03 +02:00
Stephane Nicoll df78105a3c Merge branch '2.2.x' into 2.3.x
Closes gh-22930
2020-08-13 11:48:43 +02:00
Stephane Nicoll f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway"
See gh-22919
2020-08-13 11:47:43 +02:00
smlc c355b95f6c Fix conditions that lead to auto-configure PushGateway
See gh-22919
2020-08-13 11:41:49 +02:00
Stephane Nicoll 947e484001 Merge branch '2.3.x'
Closes gh-22928
2020-08-13 09:44:26 +02:00
Stephane Nicoll d0662e824a Fix default value of server.jetty.accesslog.format
Closes gh-22921
2020-08-13 09:43:37 +02:00
Scott Frederick 7c7079f91a Merge branch '2.3.x' 2020-08-12 17:44:52 -05:00
Scott Frederick 4c6a722f18 Fix test for Java version in image building docs
See gh-22916
2020-08-12 17:43:37 -05:00
Scott Frederick 092bbd198e Merge branch '2.3.x'
Closes gh-22923
2020-08-12 17:04:54 -05:00
Scott Frederick 005ed8b8db Use Java version wildcard in image building docs
Fixes gh-22916
2020-08-12 17:04:17 -05:00
Scott Frederick 6b15822cb1 Polish "Add pullPolicy option for image building"
See gh-22736
2020-08-12 15:16:38 -05:00
anshlykov c7449b57ce Add pullPolicy option for image building
This commit adds a pullPolicy option to the configuration of the Maven
plugin spring-boot:build-image goal and the Gradle plugin bootBuildImage
task. The new option gives users control over pulling the builder image
and run image from a remote image registry to the local Docker daemon.

See gh-22736
2020-08-12 15:16:38 -05:00
Andy Wilkinson b35cfb7fb7 Upgrade to Spring Integration 5.4.0-M2
Closes gh-22729
2020-08-12 20:17:50 +01:00
Andy Wilkinson c59b48b690 Upgrade to Spring Kafka 2.5.5.RELEASE
Closes gh-22843
2020-08-12 19:19:57 +01:00
Andy Wilkinson ce729b7188 Upgrade to Spring AMQP 2.2.10.RELEASE
Closes gh-22842
2020-08-12 19:19:18 +01:00
Andy Wilkinson 2de48ac6ee Upgrade to Spring Kafka 2.6.0-M1
Closes gh-22730
2020-08-12 19:17:14 +01:00
dreis2211 c00d5c5643 Introduce @ForkedClassPath for testing unmodified class path
See gh-22710
2020-08-12 17:21:31 +01:00
Andy Wilkinson 0158213b3f Upgrade to Spring AMQP 2.3.0-M2
Closes gh-22761
2020-08-12 17:20:33 +01:00
Andy Wilkinson fff9193860 Merge branch '2.3.x'
Closes gh-22917
2020-08-12 17:06:30 +01:00
Andy Wilkinson f43a0b4891 Fix configuration of environment in Kotlin bootBuildImage examples
Fixes gh-22913
2020-08-12 17:06:16 +01:00
Phillip Webb bc3f028a1f Fix spring.config.activate.on-profile metadata
Fix the `spring.config.activate.on-profile` entry which was accidentally
entered as `spring.config.import.on-profile`.

See gh-22497
2020-08-12 07:13:11 -07:00
Stephane Nicoll 5e5c1fb4d0 Upgrade to Spring Data Neumann SR3
Closes gh-22844
2020-08-12 15:42:54 +02:00
Andy Wilkinson 147b048a07 Merge branch '2.3.x'
See gh-22909
2020-08-12 13:24:50 +01:00
Andy Wilkinson 2b1bb2f18f Improve diagnostics when remote application does not start as expected
See gh-22909
2020-08-12 13:24:17 +01:00
Andy Wilkinson 0d8719adb7 Merge branch '2.3.x'
Closes gh-22911
2020-08-12 13:14:33 +01:00
Andy Wilkinson 65ccb514d0 Merge branch '2.2.x' into 2.3.x
Closes gh-22910
2020-08-12 13:14:15 +01:00
Johnny Lim 68e2dd626d Mention configuration customizers for WebTestClient and RestAssured
See gh-22765
2020-08-12 13:13:11 +01:00
Stephane Nicoll 25e08d2dee Restore handling of certain spring.data.neo4j.* properties
This commit switches the deprecation level of several properties in the
spring.data.neo4j namespace from error and warning. The server URI and
basic authentication can be used in a deprecated fashion to configure
the new neo4j driver.

Closes gh-22653
2020-08-12 14:07:44 +02:00
Andy Wilkinson 9a2d2effa5 Merge branch '2.3.x'
Closes gh-22907
2020-08-12 12:24:38 +01:00
Andy Wilkinson 1381929525 Upgrade to Gradle 6.6
Closes gh-22905
2020-08-12 12:24:08 +01:00
Andy Wilkinson 520cfa4638 Merge branch '2.3.x'
Closes gh-22904
2020-08-12 11:40:48 +01:00
Andy Wilkinson 0841eab877 Simplify build.gradle for spring-boot-starter-data-solr
Closes gh-22903
2020-08-12 11:40:21 +01:00
Stephane Nicoll 8409df5540 Upgrade to Spring Data 2020.0.0-M2
Closes gh-22647
2020-08-12 12:15:23 +02:00
Stephane Nicoll 14eb041086 Polish "Add basic auth support for Prometheus pushgateway"
See gh-22548
2020-08-12 10:27:07 +02:00
AndrewDi 9ddc97f815 Add basic auth support for Prometheus pushgateway
See gh-22548
2020-08-12 09:54:08 +02:00
Stephane Nicoll 2c120eb161 Merge branch '2.3.x'
Closes gh-22900
2020-08-12 09:51:44 +02:00
Stephane Nicoll 38baaf31d3 Merge branch '2.2.x' into 2.3.x
Closes gh-22899
2020-08-12 09:51:25 +02:00
Stephane Nicoll ee2363fca7 Polish "Harmonize Discover the HTTP Port at Runtime How-To"
See gh-22898
2020-08-12 09:50:44 +02:00
John Franco 303768b2b5 Harmonize Discover the HTTP Port at Runtime How-To
See gh-22898
2020-08-12 09:48:57 +02:00
Phillip Webb 7838c7b072 Polish 'Support ConfigurationClassPostProcessor supplier'
See gh-22858
2020-08-11 12:31:02 -07:00
Dave Syer 06eff45a71 Support ConfigurationClassPostProcessor supplier
Update `SharedMetadataReaderFactoryContextInitializer` to optionally
support a `ConfigurationClassPostProcessor` provided via an instance
`Supplier`.

If the instance supplier is available then we can use that to set the
`MetadataReaderFactory` non-reflectively, instead of using a
`PropertyValue` (and the `BeanWrapper` eventually).

The previous behavior is left as a  fallback and without a change in
Spring Framework will continue to be the default for most applications.

See gh-22858
2020-08-11 12:31:02 -07:00
Madhura Bhave 4799b26d2c Merge branch '2.3.x'
Closes gh-22897
2020-08-11 12:25:48 -07:00
Madhura Bhave eeca767c49 Merge branch '2.2.x' into 2.3.x
Closes gh-22895
2020-08-11 12:22:43 -07:00
Madhura Bhave cdbb7f441a Do not ignore null/empty values from SPRING_APPLICATION_JSON
Fixes gh-21542
2020-08-11 12:22:08 -07:00
Phillip Webb a062b51efb Polish 'Allow step action to be optional'
See gh-22845
2020-08-11 10:57:03 -07:00
Marten Deinum 0e5be0ab62 Allow step action to be optional
Update `SpringApplicationRunListeners` so that the step action
is optional and does not need to call `end()`.

This commit also introduces a test for the failure case showing
that there is a missed call to end with the initial solution.

See gh-22845
2020-08-11 10:54:00 -07:00
Andy Wilkinson ac357283a6 Upgrade to Spring HATEOAS 1.2.0-M1
Closes gh-22893
2020-08-11 16:28:16 +01:00
Andy Wilkinson e358144b2e Polish "Exclude cookie headers by default from HTTP traces"
See gh-22829
2020-08-11 15:58:55 +01:00
Emily Tsanova 5ff515727d Exclude cookie headers by default from HTTP traces
See gh-22829
2020-08-11 15:58:55 +01:00
Stephane Nicoll 8bcf5186dc Merge branch '2.3.x'
Closes gh-22891
2020-08-11 16:51:58 +02:00
Stephane Nicoll 92445fcc54 Merge branch '2.2.x' into 2.3.x
Closes gh-22890
2020-08-11 16:51:34 +02:00
Stephane Nicoll ccffd50285 Document the limitation of default value detection
Closes gh-22685
2020-08-11 16:51:00 +02:00
Stephane Nicoll 64a5aa9340 Polish 2020-08-11 16:41:47 +02:00
Stephane Nicoll 44e807738b Merge branch '2.3.x'
Closes gh-22889
2020-08-11 15:54:03 +02:00
Stephane Nicoll ac7320d7fe Document that Cassandra's application.conf is not considered
Closes gh-21787
2020-08-11 15:53:06 +02:00
Andy Wilkinson 5e04e1f4a3 Merge branch '2.3.x'
Closes gh-22888
2020-08-11 14:34:27 +01:00
Andy Wilkinson 1896566bc8 Avoid duplicates with different versions in Devtools' int test deps
Closes gh-22887
2020-08-11 14:33:27 +01:00
Andy Wilkinson b54ef4c4ab Upgrade to Versions Maven Plugin 2.8.1
Closes gh-22884
2020-08-11 12:53:29 +01:00
Andy Wilkinson 7f143af6a2 Upgrade to Selenium HtmlUnit 2.43.0
Closes gh-22883
2020-08-11 12:53:27 +01:00
Andy Wilkinson 23f5bec312 Upgrade to Pooled JMS 1.1.2
Closes gh-22882
2020-08-11 12:53:26 +01:00
Andy Wilkinson 5bfc14b3bd Upgrade to Maven Resources Plugin 3.2.0
Closes gh-22881
2020-08-11 12:53:24 +01:00
Andy Wilkinson 76901bbb0c Upgrade to Lettuce 5.3.3.RELEASE
Closes gh-22880
2020-08-11 12:53:23 +01:00
Andy Wilkinson 59c0a16833 Upgrade to Kotlin Coroutines 1.3.8
Closes gh-22879
2020-08-11 12:53:21 +01:00
Andy Wilkinson e51d2734dd Upgrade to HtmlUnit 2.43.0
Closes gh-22878
2020-08-11 12:53:20 +01:00
Andy Wilkinson 28aac6cda5 Upgrade to Hibernate 5.4.20.Final
Closes gh-22877
2020-08-11 12:53:18 +01:00
Andy Wilkinson 92bc60fd87 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-22876
2020-08-11 12:53:17 +01:00
Andy Wilkinson 62845b5a8d Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22875
2020-08-11 12:53:16 +01:00
Andy Wilkinson 289797b5d4 Upgrade to Spring Security 5.3.4.RELEASE
Closes gh-22873
2020-08-11 12:50:16 +01:00
Andy Wilkinson 4f79f39b31 Upgrade to Spring HATEOAS 1.1.1.RELEASE
Closes gh-22872
2020-08-11 12:50:16 +01:00
Andy Wilkinson 33ece49921 Upgrade to RSocket 1.0.2
Closes gh-22871
2020-08-11 12:50:16 +01:00
Andy Wilkinson ad109c10d3 Upgrade to Pooled JMS 1.1.2
Closes gh-22870
2020-08-11 12:50:16 +01:00
Andy Wilkinson 006d960044 Upgrade to Lettuce 5.3.3.RELEASE
Closes gh-22869
2020-08-11 12:50:15 +01:00
Andy Wilkinson abf6123bae Upgrade to Kafka 2.5.1
Closes gh-22868
2020-08-11 12:50:15 +01:00
Andy Wilkinson e8307178c3 Upgrade to jOOQ 3.13.4
Closes gh-22867
2020-08-11 12:50:15 +01:00
Andy Wilkinson 6b843d3066 Upgrade to Jetty 9.4.31.v20200723
Closes gh-22866
2020-08-11 12:50:15 +01:00
Andy Wilkinson c89bc5120e Upgrade to Jackson Bom 2.11.2
Closes gh-22865
2020-08-11 12:50:15 +01:00
Andy Wilkinson 7a0af85b6e Upgrade to Hibernate 5.4.20.Final
Closes gh-22864
2020-08-11 12:50:15 +01:00
Andy Wilkinson 38891f7594 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-22863
2020-08-11 12:50:14 +01:00
Andy Wilkinson 977f33ad80 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22862
2020-08-11 12:50:14 +01:00
Andy Wilkinson 8af4246db5 Upgrade to Couchbase Client 3.0.7
Closes gh-22861
2020-08-11 12:50:14 +01:00
Andy Wilkinson 6cb7eb926e Upgrade to Commons Pool2 2.8.1
Closes gh-22860
2020-08-11 12:50:14 +01:00
Andy Wilkinson d16aa3f377 Upgrade to Byte Buddy 1.10.14
Closes gh-22859
2020-08-11 12:50:14 +01:00
Stephane Nicoll 5bd69fcd61 Merge branch '2.3.x'
Closes gh-22874
2020-08-11 13:40:21 +02:00
Stephane Nicoll dc4de06b35 Restore customization of the Couchbase cache manager
With the upgrade to the new Couchbase SDK and the related changes in
Spring Data Couchbase, CacheManagerCustomizer can no longer be used to
customize the Couchbase cache manager as it is an immutable class.

This commit introduces a dedicated callback for the
CouchbaseCacheManagerBuilder that is used by the auto-configuration and
update the documentation to refer to it with a sample usage.

Closes gh-22573
2020-08-11 13:32:17 +02:00
Andy Wilkinson b2c0c958c9 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22615
2020-08-11 12:14:24 +01:00
Andy Wilkinson ca93c8da94 Merge branch '2.3.x'
Closes gh-22856
2020-08-11 10:29:20 +01:00
Stephane Nicoll 91934b5e5a Upgrade to Spring Framework 5.3.0-M2
Closes gh-22640
2020-08-11 11:10:50 +02:00
Andy Wilkinson 1270af90c2 Only enable full path optimization when there's one DispatcherServlet
Previously, UrlPathHelper's full path optimization was enabled when
there was a dispatcher servlet mapped to /. The UrlPathHelper is used
across Spring MVC and if there are multiple dispatcher servlets they
all share the sample UrlPathHelper. This meant that any additional
dispatcher servlets mapping to locations other than / would not be able
to map requests correctly as the UrlPathHelper would use the full path,
ignoring the url mapping of the dispatcher servlet.

This commit updates the MVC auto-configuration so that use of the full
path is only enabled if there's a single dispatcher servlet
registration.

Fixes gh-22682
2020-08-11 09:59:06 +01:00
Stephane Nicoll 5a96f7d682 Upgrade to RSocket 1.1.0-M1
Closes gh-22751
2020-08-11 09:23:32 +02:00
Stephane Nicoll 72189eed3d Upgrade to Reactor 2020.0.0-M2
Closes gh-22667
2020-08-11 09:23:01 +02:00
Andy Wilkinson 969dd35e45 Upgrade to Mockito 3.4.6
Closes gh-22838
2020-08-10 15:22:03 +01:00
Stephane Nicoll f2a52a87ec Merge branch '2.3.x'
Closes gh-22850
2020-08-10 16:05:47 +02:00
Stephane Nicoll 980ddcffd0 Merge branch '2.2.x' into 2.3.x
Closes gh-22849
2020-08-10 16:05:13 +02:00
Stephane Nicoll dd9c9fd171 Polish "Migrate legacy endpoint that have a dash in their id"
See gh-21615
2020-08-10 14:53:18 +02:00
Gabriele Bianchet-David 0f9f10f97e Migrate legacy endpoint that have a dash in their id
See gh-21615
2020-08-10 14:42:46 +02:00
dreis2211 11df8216ad Fix some doc anchors
See gh-22839
2020-08-10 14:34:22 +02:00
Stephane Nicoll fcab5d6ce1 Merge branch '2.3.x' 2020-08-10 14:33:50 +02:00
Stephane Nicoll 2b578296f9 Merge branch '2.2.x' into 2.3.x 2020-08-10 14:33:37 +02:00
Stephane Nicoll 8962d6ca21 Polish 2020-08-10 14:31:16 +02:00
Stephane Nicoll dedf09d20f Merge branch '2.3.x'
Closes gh-22848
2020-08-10 14:23:56 +02:00
Stephane Nicoll f466734801 Merge branch '2.2.x' into 2.3.x
Closes gh-22847
2020-08-10 14:23:31 +02:00