Commit Graph

12897 Commits (5c995a2d9b14ff838be68d4266d82e4b88d506f6)

Author SHA1 Message Date
Phillip Webb 93d316ddd1 Add additional ConfigDataProperties tests
Add more `isActive` tests to cover negative cases.

See gh-27017
3 years ago
fengyuanwei b91c66b823 Fix typo in ConfigDataPropertiesTests
See gh-27017
3 years ago
Phillip Webb 63ed921554 Restore simple Library constructor
See gh-15808
3 years ago
Madhura Bhave b790c82732 Apply exclusions to existing war entries
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.

Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin

Fixes gh-15808

Co-authored-by: Phillip Webb <pwebb@vmware.com>
3 years ago
Andy Wilkinson 3746155916 Align Nimbus dependency versions with Spring Security
Closes gh-26820
3 years ago
Stephane Nicoll d0f12392ab Upgrade to Micrometer 1.6.8
Closes gh-27014
3 years ago
Stephane Nicoll fb2ed6076f Upgrade to Spring Session 2020.0.5
Closes gh-26964
3 years ago
Stephane Nicoll fb1cd82061 Upgrade to OAuth2 OIDC SDK 8.36.2
Closes gh-27034
3 years ago
Stephane Nicoll ded6b26ea5 Upgrade to Neo4j Java Driver 4.1.4
Closes gh-27033
3 years ago
Stephane Nicoll 6db9fe2e36 Upgrade to Lettuce 6.0.6.RELEASE
Closes gh-27032
3 years ago
Stephane Nicoll 9bc1c4dff2 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27031
3 years ago
Stephane Nicoll 7e09c1d8dc Upgrade to Spring Data 2020.0.10
Closes gh-26963
3 years ago
Stephane Nicoll 58320c6af9 Upgrade to Spring HATEOAS 1.2.7
Closes gh-27013
3 years ago
Stephane Nicoll c21099b142 Upgrade to Reactor 2020.0.8
Closes gh-26962
3 years ago
Andy Wilkinson ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration"
See gh-26937
3 years ago
Yanming Zhou a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration
See gh-26937
3 years ago
Stephane Nicoll b8a5d9b882 Start building against Micrometer 1.6.8 snapshots
See gh-27014
3 years ago
Stephane Nicoll 9ab8c625e5 Start building against Spring HATEOAS 1.2.7 snapshots
See gh-27013
3 years ago
Sviatoslav Hryb 2252deb69b Document uuid support in RandomValuePropertySource
See gh-26975
3 years ago
Stephane Nicoll 333c7a7cd8 Upgrade to Spring Security 5.4.7
Closes gh-26965
3 years ago
Phillip Webb 8189e82c02 Allow nested profile-specific resolution
Effectively revert commit 0da0d2d46 so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is again called when resolving
imports declared in a profile-specific file.

Fixes gh-26960
3 years ago
Stephane Nicoll 5dc1065876 Revert "Upgrade to Dropwizard Metrics 4.1.23"
This reverts commit ce24270271.

See gh-26983
3 years ago
Andy Wilkinson e18eb08222 Fix additional metadata locations with config cache
Previously, a project with a dependency on Spring Boot's configuration
processor would fail to build when the configuration cache is enabled
due to it accessing the Project during task execution.

Instead of accessing the project during task execution, this commit
updates the code to retrieve the resource locations from the matching
source set in advance. The locations are then stored in the action
that configures the compile task when needed.

Closes gh-26880
3 years ago
Stephane Nicoll 1374491305 Upgrade to SLF4J 1.7.31
Closes gh-26986
3 years ago
Stephane Nicoll 799f6b0bdd Upgrade to Postgresql 42.2.22
Closes gh-26985
3 years ago
Stephane Nicoll c9a787c7ac Upgrade to Jetty EL 8.5.68
Closes gh-26984
3 years ago
Stephane Nicoll ce24270271 Upgrade to Dropwizard Metrics 4.1.23
Closes gh-26983
3 years ago
Stephane Nicoll cc6c53f040 Start building against Spring Integration 5.4.8 snapshots
See gh-26967
3 years ago
Stephane Nicoll 9477231c51 Start building against Spring AMQP 2.3.9 snapshots
See gh-26966
3 years ago
Stephane Nicoll fa37fb0a69 Start building against Spring Security 5.4.7 snapshots
See gh-26965
3 years ago
Stephane Nicoll 2f30449d11 Start building against Spring Session 2020.0.5 snapshots
See gh-26964
3 years ago
Stephane Nicoll b462feaa58 Start building against Spring Data 2020.0.10 snapshots
See gh-26963
3 years ago
Stephane Nicoll 22c4c6ea80 Start building against Reactor 2020.0.8 snapshots
See gh-26962
3 years ago
Andy Wilkinson cd808d2f18 Only get Kotlin plugin's version once we know we need it
Fixes gh-26946
3 years ago
Andy Wilkinson 204dd29c51 Fix test on Windows
See gh-26821
3 years ago
Phillip Webb b5c92d5174 Allow indirect standard profile-specific imports
Effectively revert commit d1b256a169 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
3 years ago
Scott Frederick 5147fcacdf Improve BeanNotOfRequiredTypeFailureAnalyzer output
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.

Fixes gh-26821
3 years ago
Andy Wilkinson fe078c8afc Avoid capturing URI template when interceptor won't use it
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.

This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.

Fixes gh-26915
3 years ago
Phillip Webb 5ca687c9a6 Polish 'Make livereload websocket headers case insensitive'
See gh-26813

Closes gh-26813
3 years ago
Francis Lavoie 8755512719 Make livereload websocket headers case insensitive
Update livereload `Connection` handling code so that websocket headers
are no longer case sensitive.

See gh-26813
3 years ago
Andy Wilkinson a1e279f736 Make Flyway and Liquibase auto-config back off without spring-jdbc
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.

This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.

Closes gh-26849
3 years ago
Andy Wilkinson 7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts
See gh-26900
3 years ago
Andy Wilkinson 32effdba0a Try to stabilize RestarterTests.testRestart
Closes gh-26900
3 years ago
Andy Wilkinson 16bfa669e1 Polish authors separators 3 years ago
Andy Wilkinson f6b7730dac Use Asciidoctor's revision line to provide document's version
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
3 years ago
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
Closes gh-26888
3 years ago
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener()
Closes gh-26885
3 years ago
Andy Wilkinson 37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test
Closes gh-26855
3 years ago
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests
Closes gh-26857
3 years ago
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose
Closes gh-26856
3 years ago
Phillip Webb 7c4f178c17 Merge branch '2.3.x' into 2.4.x 3 years ago
Phillip Webb 3b48526732 Polish 3 years ago
Madhura Bhave e3042b38f5 Merge branch '2.3.x' into 2.4.x 3 years ago
Madhura Bhave 63806d5bac Remove duplicate copyright notice from docs 3 years ago
Andy Wilkinson d79b3597bb Upgrade to Spring AMQP 2.3.8
Closes gh-26762
3 years ago
Andy Wilkinson d4200a7c56 Upgrade to Spring Integration 5.3.8.RELEASE
Closes gh-26772
3 years ago
Andy Wilkinson 03e1b255ea Upgrade to Spring AMQP 2.2.18.RELEASE
Closes gh-26770
3 years ago
Andy Wilkinson 4a11c6a135 Upgrade to Spring Kafka 2.6.9
Closes gh-26763
3 years ago
Andy Wilkinson 53068a2489 Upgrade to Spring Kafka 2.5.14.RELEASE
Closes gh-26771
3 years ago
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
3 years ago
Stephane Nicoll 6a7a11ba59 Upgrade to RSocket 1.1.1
Closes gh-26836
3 years ago
Stephane Nicoll 66ae421f74 Upgrade to Neo4j Java Driver 4.1.3
Closes gh-26835
3 years ago
Stephane Nicoll f9a0b0308d Upgrade to Jetty 9.4.42.v20210604
Closes gh-26834
3 years ago
Stephane Nicoll 6cdbed7dc3 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26833
3 years ago
Stephane Nicoll 872ec0bf00 Upgrade to RSocket 1.0.5
Closes gh-26832
3 years ago
Stephane Nicoll f73e7bcc0c Upgrade to Neo4j OGM 3.2.24
Closes gh-26831
3 years ago
Stephane Nicoll 1ef0068b38 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26830
3 years ago
Stephane Nicoll 0563955324 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26829
3 years ago
Stephane Nicoll e9592229fc Upgrade to Spring Framework 5.3.8
Closes gh-26760
3 years ago
Andy Wilkinson 303edac6bb Merge branch '2.3.x' into 2.4.x
Closes gh-26826
3 years ago
Andy Wilkinson d1e1796f76 Consider overridden getRootUri() when getting root URI
Fixes gh-26812
3 years ago
Phillip Webb d5264664e6 Merge branch '2.3.x' into 2.4.x
Closes gh-26822
3 years ago
Phillip Webb 1f6983c4c9 Make CompositeHealth.getDetails() public
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.

Fixes gh-26797
3 years ago
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 3 years ago
Phillip Webb 9e1c78da99 Update copyright year of changed files 3 years ago
Stephane Nicoll bac89a3919 Upgrade to Undertow 2.2.8.Final
Closes gh-26791
4 years ago
Stephane Nicoll d6f22f0802 Upgrade to jOOQ 3.14.11
Closes gh-26790
4 years ago
Stephane Nicoll 99169af57c Upgrade to Johnzon 1.2.13
Closes gh-26789
4 years ago
Stephane Nicoll fe249dd772 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26788
4 years ago
Stephane Nicoll 5be4a9ab50 Upgrade to Hibernate 5.4.32.Final
Closes gh-26787
4 years ago
Stephane Nicoll e496d2e321 Upgrade to Gson 2.8.7
Closes gh-26786
4 years ago
Stephane Nicoll 16ff9318b5 Upgrade to Ehcache3 3.9.4
Closes gh-26785
4 years ago
Stephane Nicoll 90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26784
4 years ago
Stephane Nicoll cfaab0904b Upgrade to AppEngine SDK 1.9.89
Closes gh-26783
4 years ago
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config'
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
4 years ago
Stephane Nicoll 1e680241ed Upgrade to Johnzon 1.2.13
Closes gh-26781
4 years ago
Stephane Nicoll 3a0794da4b Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26780
4 years ago
Stephane Nicoll 84a4693dcf Upgrade to Hibernate 5.4.32.Final
Closes gh-26779
4 years ago
Stephane Nicoll 790a8c1f47 Upgrade to Gson 2.8.7
Closes gh-26778
4 years ago
Stephane Nicoll 7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26777
4 years ago
Stephane Nicoll f3049e8e94 Upgrade to AppEngine SDK 1.9.89
Closes gh-26776
4 years ago
Stephane Nicoll 39f259554b Start building against Spring Integration 5.3.8 snapshots
See gh-26772
4 years ago
Stephane Nicoll 37625854b6 Start building against Spring Kafka 2.5.14 snapshots
See gh-26771
4 years ago
Stephane Nicoll 323d1e224d Start building against Spring AMQP 2.2.18 snapshots
See gh-26770
4 years ago
Stephane Nicoll de06bbb4dc Start building against Spring Kafka 2.6.9 snapshots
See gh-26763
4 years ago
Stephane Nicoll 4c31ccb576 Start building against Spring AMQP 2.3.8 snapshots
See gh-26762
4 years ago
Stephane Nicoll d2fe417bbb Start building against Spring Framework 5.3.8 snapshots
See gh-26760
4 years ago
Stephane Nicoll aea8597114 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 6490edc16d Polish 4 years ago
Phillip Webb 0da0d2d469 Prevent nested profile-specific resolution
Update the `ConfigDataEnvironment` so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is no longer called when
resolving imports declared in a profile-specific file.

Fixes gh-26753
4 years ago
Phillip Webb d1b256a169 Prevent indirect standard profile-specific imports
Update `StandardConfigDataLocationResolver` so that profile-specific
imports can only be used when there is no parent import.

Prior to this commit, given the following application.properties file:

	spring.profiles.active=p1,p2
	spring.config.import=other.properties

We would attempt to import `other.properties`, `other-p1.properties`
and `other-p2.properties`. This seems quite confusing and when we really
only need to support profile-specific properties for the initial root
set of locations.

Fixes gh-26752
4 years ago
Stephane Nicoll ad99aa2f4a Merge branch '2.3.x' into 2.4.x
Closes gh-26747
4 years ago
dreis2211 f470151535 Remove reference to surefirebooter JAR
See gh-26737
4 years ago
Phillip Webb 1cda557d03 Merge branch '2.3.x' into 2.4.x
Closes gh-26743
4 years ago
Phillip Webb 1beee5700c Don't close early when SecurityManager present
Update `JarFile` and `JarFileWrapper` classes so that they no longer
close the `JarFile` early if a `SecurityManager` is in use.

Prior to this commit, the closed `JarFile` would cause (an ultimately
swallowed) NPE in `ZipFile` which manifested itself as a
`ClassNotFoundException` when starting the app.

Closes gh-25538
4 years ago
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
4 years ago
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
4 years ago
Madhura Bhave b102fdd392 Merge branch '2.3.x' into 2.4.x
Closes gh-26738
4 years ago
Madhura Bhave 15324956a8 Align int and long in RandomValuePropertySource
This commit aligns int and long so that a random number is generated
by delegating to ints/longs in the JDK's Random API. In the case of a
single bound value, it needs to be greater than 0 because 0 is used as
the lower bound.

Fixes gh-26628
4 years ago
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x
Closes gh-26734
4 years ago
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis
Closes gh-26733
4 years ago
Stephane Nicoll c8959180fe Merge branch '2.3.x' into 2.4.x
Closes gh-26724
4 years ago
Stephane Nicoll 7e4defbcba Properly guard LogbackLoggingSystem
Previously, LoggingSystem#get would chose Logback by the sole presence
of a class in logback-core, with the assumption that logback-classic is
also on the classpath. An app that only had the former would therefore
fail.

This commit updates the condition to check for a class in
logback-classic instead.

Closes gh-26711
4 years ago
Stephane Nicoll 897fd63faf Merge branch '2.3.x' into 2.4.x
Closes gh-26716
4 years ago
weixsun 4b3bf75a4c Remove redudant space
See gh-26713
4 years ago
Phillip Webb 49d3ecc2b2 Merge branch '2.3.x' into 2.4.x
Closes gh-26702
4 years ago
Phillip Webb 617f7b9587 Improve ImageName/ImageReference parse performance
Update `ImageName` and `ImageReference` to use distinct regex patterns
to parse specific parts of the value. Prior to this commit a single
regex pattern was used which could hang given certain input strings.

Fixes gh-23115
4 years ago
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x
Closes gh-26700
4 years ago
Madhura Bhave f55e4c08f5 Add note about Kubernetes termination grace period
Closes gh-26469
4 years ago
Stephane Nicoll 7f5adb7e9d Merge branch '2.3.x' into 2.4.x
Closes gh-26696
4 years ago
Stephane Nicoll 454d72d9b2 Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Stephane Nicoll 67fe60ba8a Add missing static on JerseyInfrastructureConfiguration
Closes gh-26695
4 years ago
Phillip Webb 49c30854af Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
Rename the now public constant for consistency with the JavaPlugin.

See gh-26686
4 years ago
Phillip Webb 1e0ae9d5e3 Make PRODUCTION_RUNTIME_CLASSPATH_NAME public
Change `SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME` from package
private to public so that it can be accessed in user build scripts.

Fixes gh-26686
4 years ago
Phillip Webb 8661f74f2e Revert "Test optional directories without sub-directories"
This reverts commit 3f858ed8a4
since the test already existed.
4 years ago
Phillip Webb 3f858ed8a4 Test optional directories without sub-directories
Add an additional test to ensure that optional wildcard
directory patterns do not fail.

See gh-26677
4 years ago
izeye 38b9a833bd Fix "Allow optional directories without sub-directories"
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e29e which was incorrectly checking `isOptional`.

See gh-26677
4 years ago
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Andy Wilkinson 01dd68e29e Allow optional directories without sub-directories
Update `StandardConfigDataLocationResolver` so that directory resources
are only required when the location is not optional.

Closes gh-26627

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Stephane Nicoll fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation"
See gh-26421
4 years ago
Lovekesh Garg 944ba34556 Clarify Kotlin version requirements in documentation
See gh-26421
4 years ago
Stephane Nicoll 9ff372c915 Merge branch '2.3.x' into 2.4.x
Closes gh-26653
4 years ago
Stephane Nicoll b5ebf836e3 Document spring.profiles.default
Closes gh-26592
4 years ago
Madhura Bhave 4955c80da5 Remove test that is no long necessary 4 years ago
Madhura Bhave 8f2b180eb6 Use Sso Binding from SAML metadata uri if present
If the property is explicitly configured, that gets used.
If none are present, we rely on Spring Security's default value of
REDIRECT.

Fixes gh-26454
4 years ago
Stephane Nicoll 942691753d Merge branch '2.3.x' into 2.4.x
Closes gh-26645
4 years ago
dreis2211 01ee6190a2 Remove workaround for SUREFIRE-1679
See gh-26632
4 years ago
Phillip Webb 6bf069d9e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26622
4 years ago
Phillip Webb 004363ceaf Use WebMvcConfigurer to add resource handlers
Move resource handler auto-configuration logic back to the
`WebMvcConfigurer` so that they also get applied to child contexts.

Closes gh-25743
4 years ago
Madhura Bhave 27fee5fa95 Configure filter to process preflight requests for webflux actuator endpoints
Fixes gh-24541
4 years ago
Madhura Bhave 29d1e22b91 Fix rawtypes 4 years ago
Madhura Bhave 743ac4c394 Merge branch '2.3.x' into 2.4.x
Closes gh-26611
4 years ago
Madhura Bhave b26e842050 Configure CORS in default security configuration for MVC
Fixes gh-11987
4 years ago
Madhura Bhave 80610fa250 Restore order of additional and active profiles
This commit restores the order of additional and active profiles
so that active profiles now take precedence.

Fixes gh-26189
4 years ago
Andy Wilkinson 64e76badc2 Merge branch '2.3.x' into 2.4.x
Closes gh-26607
4 years ago
Andy Wilkinson b6e860b2d4 Prevent Jetty from delaying shutdown beyond grace period
Fixes gh-22689
4 years ago
Andy Wilkinson 6874c42d3c Merge branch '2.3.x' into 2.4.x
Closes gh-26605
4 years ago
Andy Wilkinson 2a89b11df3 Exclude SmartInitializingSingletones from lazy initialization
Fixes gh-26470
4 years ago
Stephane Nicoll 6a45026097 Upgrade to Netty 4.1.65.Final
Closes gh-26602
4 years ago
Stephane Nicoll 8904649fcf Upgrade to Jetty 9.4.41.v20210516
Closes gh-26601
4 years ago
Stephane Nicoll 5edb788241 Upgrade to Netty 4.1.65.Final
Closes gh-26600
4 years ago
Stephane Nicoll 0d1b3fb078 Upgrade to Neo4j OGM 3.2.23
Closes gh-26599
4 years ago
Stephane Nicoll 22ec27dcd3 Upgrade to Json-smart 2.3.1
Closes gh-26598
4 years ago
Stephane Nicoll 32381ad61c Upgrade to Jetty 9.4.41.v20210516
Closes gh-26597
4 years ago
Stephane Nicoll e5ab626638 Upgrade to Spring Batch 4.3.3
Closes gh-26391
4 years ago
Stephane Nicoll 7769e77775 Upgrade to Spring Batch 4.2.7
Closes gh-26426
4 years ago
Andy Wilkinson ff45e4c418 Merge branch '2.3.x' into 2.4.x
Closes gh-26595
4 years ago
Andy Wilkinson 936c31c7a7 Prevent metrics failures from adversely affecting web responses
Fixes gh-24151
4 years ago
Andy Wilkinson 04e3165c15 Upgrade to Spring Integration 5.4.7
Closes gh-26587
4 years ago
Andy Wilkinson 2edd06fb6e Start building against Spring Integration 5.4.7 snapshots
See gh-26587
4 years ago
Stephane Nicoll 83ad93844b Upgrade to Spring AMQP 2.3.7
Closes gh-26383
4 years ago
Stephane Nicoll 2205024e9d Upgrade to Spring Kafka 2.6.8
Closes gh-26385
4 years ago
Stephane Nicoll 678916fb3d Upgrade to Spring Kafka 2.5.13
Closes gh-26429
4 years ago
Phillip Webb 0e3ef4071e Allow optional ConfigDataLocationResolver results
Update `ConfigData` so that it signal if is considered optional. This
update allows `ConfigDataLocationResolvers` to return results that
behave in the same way as `optional:` prefixed locations without the
user themselves needing to prefix the location string.

Closes gh-25894
4 years ago
Phillip Webb 0699fdcc8a Polish 'Allow remote devtools access with Spring Security'
See gh-25868
4 years ago
Hatef Palizgar 9b2e13aace Allow remote devtools access with Spring Security
Update `ManagementWebSecurityAutoConfiguration` so that the
`managementSecurityFilterChain` bean has an explicit order.

Prior to this commit, the `managementSecurityFilterChain` would override
the `securityFilterChain` in `RemoteDevtoolsSecurityConfiguration` which
would prevent the remote devtools endpoint from being accessed.

See gh-25868
4 years ago
Madhura Bhave c45bb2bd95 Handle empty locations from patterns
Update `StandardConfigDataLocationResolver` to deal with patterns when
resolving empty directories. This update also fixes the handling of
mandatory pattern locations which would previously throw an exception.

The error message returned when a location with a pattern does not
contain any subdirectories has also been improved.

Fixes gh-26468
Fixes gh-26577
Fixes gh-26415
4 years ago
Madhura Bhave cfa26735d2 Merge programmatically set active profiles
Update `Profiles` so that any profiles set programmatically on the
`Environment` are merged with `spring.profiles.active` properties.

Fixes gh-26151

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Andy Wilkinson 36b6235e86 Upgrade to Spring AMQP 2.2.17.RELEASE
Closes gh-26428
4 years ago
Andy Wilkinson 4eab9476a6 Polish "Detect use of spring.profiles.include as a YAML list"
See gh-26205
4 years ago
ChangYong 80ad6385f1 Detect use of spring.profiles.include as a YAML list
See gh-26205
4 years ago
Andy Wilkinson 1d5abf5af7 Merge branch '2.3.x' into 2.4.x
Closes gh-26572
4 years ago
Andy Wilkinson eecb7dd101 Remove stale jboss-transaction-spi dependencies
Closes gh-26569
4 years ago
Stephane Nicoll ef093bc9c6 Merge branch '2.3.x' into 2.4.x
Closes gh-26570
4 years ago
Stephane Nicoll 306b6f6999 Configure SessionCookieConfig in MockServletWebServer
Closes gh-26479
4 years ago
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x
Closes gh-26525
4 years ago
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies"
See gh-25944
4 years ago
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
4 years ago
Andy Wilkinson 49d362fd7f Merge branch '2.3.x' into 2.4.x
Closes gh-26523
4 years ago
weixsun 7f445630e4 Remove unnecessary semicolon
See gh-26446
4 years ago
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x
Closes gh-26521
4 years ago
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance"
See gh-26227
4 years ago
Carlos Rafael de Oliveira Carneiro a6fa8addb9 Improve documentation of TestRestTemplate's fault tolerance
See gh-26227
4 years ago
Stephane Nicoll 87d986f9b8 Upgrade to Thymeleaf Layout Dialect 2.5.3
Closes gh-26518
4 years ago
Stephane Nicoll 7152c21641 Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26517
4 years ago
Stephane Nicoll 6004835fd2 Upgrade to Postgresql 42.2.20
Closes gh-26516
4 years ago
Stephane Nicoll f84f9f347d Upgrade to Pooled JMS 1.2.2
Closes gh-26515
4 years ago
Stephane Nicoll 5efc9d5aa6 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26514
4 years ago
Stephane Nicoll 67b9aca437 Upgrade to Neo4j Java Driver 4.1.2
Closes gh-26513
4 years ago
Stephane Nicoll 35310b8f9b Upgrade to MySQL 8.0.25
Closes gh-26512
4 years ago
Stephane Nicoll d4c502e60c Upgrade to MariaDB 2.7.3
Closes gh-26511
4 years ago
Stephane Nicoll 0e1d107b82 Upgrade to Lettuce 6.0.5.RELEASE
Closes gh-26510
4 years ago
Stephane Nicoll f3f6294fe2 Upgrade to JUnit Jupiter 5.7.2
Closes gh-26509
4 years ago
Stephane Nicoll dc58916603 Upgrade to Json-smart 2.3.1
Closes gh-26508
4 years ago
Stephane Nicoll 4da1e1351a Upgrade to jOOQ 3.14.9
Closes gh-26507
4 years ago
Stephane Nicoll a4e71fb49f Upgrade to Johnzon 1.2.11
Closes gh-26506
4 years ago
Stephane Nicoll 496e3f1df9 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26505
4 years ago
Stephane Nicoll 2718cfadd8 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26504
4 years ago
Stephane Nicoll 65b18acd81 Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26503
4 years ago
Stephane Nicoll ef5476c764 Upgrade to Janino 3.1.4
Closes gh-26502
4 years ago
Stephane Nicoll 3cc04cf4a5 Upgrade to Infinispan 11.0.11.Final
Closes gh-26501
4 years ago
Stephane Nicoll 03a92fc632 Upgrade to Hibernate 5.4.31.Final
Closes gh-26500
4 years ago
Stephane Nicoll e7ac4f12f1 Upgrade to Ehcache3 3.9.3
Closes gh-26499
4 years ago
Stephane Nicoll 87fce0b480 Upgrade to Ehcache 2.10.9.2
Closes gh-26498
4 years ago
Stephane Nicoll 3b691a2bb1 Upgrade to Dropwizard Metrics 4.1.21
Closes gh-26497
4 years ago
Stephane Nicoll 316ad17856 Upgrade to ActiveMQ 5.16.2
Closes gh-26496
4 years ago
Stephane Nicoll 89be56d63c Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26494
4 years ago
Stephane Nicoll 69ce28617c Upgrade to Postgresql 42.2.20
Closes gh-26493
4 years ago
Stephane Nicoll 626c21e7a1 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26492
4 years ago
Stephane Nicoll fc1d0af5d2 Upgrade to Neo4j OGM 3.2.22
Closes gh-26491
4 years ago
Stephane Nicoll a721493c88 Upgrade to MySQL 8.0.25
Closes gh-26490
4 years ago
Stephane Nicoll 5348a20ff5 Upgrade to Johnzon 1.2.11
Closes gh-26489
4 years ago
Stephane Nicoll bd73166023 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26488
4 years ago
Stephane Nicoll ecbf7cb417 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26487
4 years ago
Stephane Nicoll 96e4dcc103 Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26486
4 years ago
Stephane Nicoll 7739c3337d Upgrade to Janino 3.1.4
Closes gh-26485
4 years ago
Stephane Nicoll 48daeec522 Upgrade to Hibernate 5.4.31.Final
Closes gh-26484
4 years ago
Stephane Nicoll 7f51e43d60 Upgrade to Ehcache 2.10.9.2
Closes gh-26483
4 years ago
Stephane Nicoll ba863e4a5b Upgrade to Dropwizard Metrics 4.1.21
Closes gh-26482
4 years ago
Stephane Nicoll 5a71fa073e Upgrade to ActiveMQ 5.15.15
Closes gh-26481
4 years ago
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x
Closes gh-26473
4 years ago
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM
Closes gh-26467
4 years ago
Andy Wilkinson fbc629a8e7 Upgrade to Spring LDAP 2.3.4.RELEASE
Closes gh-26393
4 years ago
Andy Wilkinson f8bf09ff02 Upgrade to Spring LDAP 2.3.4.RELEASE
Closes gh-25528
4 years ago
Andy Wilkinson 77bb7f6139 Upgrade to Spring Data 2020.0.9
Closes gh-26381
4 years ago
Andy Wilkinson 9f279e0e96 Merge branch '2.3.x' into 2.4.x
Closes gh-26462
4 years ago
Andy Wilkinson 5984d4ee2b Index @ConfigurationProperties so they can be found by scanning
Previously, @ConfigurationProperties was not annotated with @Indexed.
This meant that @ConfigurationPropertiesScan would not be able to
find them when the underlying
ClassPathScanningCandidateComponentProvider is using a
CandidateComponentsIndex.

This commit annotated @ConfigurationProperties with @Indexed so that
they can be found by index-based scanning.

Fixes gh-26459
4 years ago
Andy Wilkinson c2ef7578e8 Merge branch '2.3.x' into 2.4.x
Closes gh-26460
4 years ago
Andy Wilkinson 444474926c Configure JTA tests to write logs beneath build/
Closes gh-26440
4 years ago
Phillip Webb 73131e99da Make BufferingApplicationStartup thread safe
Update `BufferingApplicationStartup` to use thread safe data structures.

Prior to this commit, it was possible for calls from different threads
(for example due to request scope beans) to cause a
NoSuchElementException to be thrown.

Closes gh-25792
4 years ago
Andy Wilkinson fd3d619670 Recommend default Servlet when using Jersey as a Filter
Closes gh-25733
4 years ago
Andy Wilkinson 970f933806 Merge branch '2.3.x' into 2.4.x
Closes gh-26450
4 years ago
Andy Wilkinson 2dd94b5554 Polish "Use try-with-resources statement"
See gh-26449
4 years ago
weixsun 5ba9db391f Use try-with-resources statements
See gh-26449
4 years ago
Scott Frederick 8ac297d6f3 Merge branch '2.3.x' into 2.4.x
Closes gh-25839
4 years ago
Scott Frederick 32d378a348 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
4 years ago
Andy Wilkinson e5af3dbfc7 Upgrade to Spring HATEOAS 1.2.6
Closes gh-26442
4 years ago
Andy Wilkinson e29d2e208e Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson b3af6d6403 Polish
See gh-25798
4 years ago
Andy Wilkinson 322d6455db Upgrade to Micrometer 1.6.7
Closes gh-26430
4 years ago
Andy Wilkinson 7a2d5d4eee Upgrade to Spring Framework 5.3.7
Closes gh-26360
4 years ago
Andy Wilkinson ece845a4e0 Upgrade to Micrometer 1.5.14
Closes gh-26427
4 years ago
Andy Wilkinson 1a32a864d4 Upgrade to Spring Framework 5.2.15.RELEASE
Closes gh-26425
4 years ago
Stephane Nicoll efc0a7da44 Properly assert that auto-configured TaskExecutor is lazy
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
4 years ago
Madhura Bhave eff024b0ce Polish "Process additional profiles before config files processing"
See gh-25817
4 years ago
nguyensach 97fd9a7c77 Process additional profiles before config files processing
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.

See gh-25817
4 years ago
Stephane Nicoll c50afc69bd Upgrade to Reactor 2020.0.7
Closes gh-26358
4 years ago
Stephane Nicoll 526af5a790 Upgrade to Reactor Dysprosium-SR20
Closes gh-26424
4 years ago
Stephane Nicoll 21fbb2e79c Start building against Micrometer 1.6.7 snapshots
See gh-26430
4 years ago
Stephane Nicoll 5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots
See gh-26429
4 years ago
Stephane Nicoll 47d5592035 Start building against Spring AMQP 2.2.17 snapshots
See gh-26428
4 years ago
Stephane Nicoll 3a8500126b Start building against Micrometer 1.5.14 snapshots
See gh-26427
4 years ago
Stephane Nicoll 9772867862 Start building against Spring Batch 4.2.7 snapshots
See gh-26426
4 years ago
Stephane Nicoll 66fe98eb3f Start building against Spring Framework 5.2.15 snapshots
See gh-26425
4 years ago
Stephane Nicoll c059759c4d Start building against Reactor Dysprosium-SR20 snapshots
See gh-26424
4 years ago
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots
See gh-26393
4 years ago
Stephane Nicoll 0d920894b7 Start building against Spring Batch 4.3.3 snapshots
See gh-26391
4 years ago
Stephane Nicoll 618475887c Start building against Spring Kafka 2.6.8 snapshots
See gh-26385
4 years ago
Stephane Nicoll 2479f69db1 Start building against Spring AMQP 2.3.7 snapshots
See gh-26383
4 years ago
Stephane Nicoll 05a3b9bbeb Start building against Spring Data 2020.0.9 snapshots
See gh-26381
4 years ago
Andy Wilkinson fe4d20c976 Merge branch '2.3.x' into 2.4.x
Closes gh-26411
4 years ago
Andy Wilkinson 6daf67a88c Upgrade to Gradle 6.9
Closes gh-26408
4 years ago
Stephane Nicoll 559af275a4 Merge branch '2.3.x' into 2.4.x
Closes gh-26405
4 years ago
Sach Nguyen afa77b8253 Fix wrong reference to Cassandra in DockerImageNames#couchbase
See gh-26399
4 years ago
Phillip Webb efad44be43 Refine mandatory location checking logic
Update `ConfigDataEnvironment.checkMandatoryLocations` to use the
actual locations that were imported, including those that were skipped
because the related `ConfigDataResource` had already been imported by a
different location.

Prior to this commit, any location that was skipped because it had
already been imported would throw a `ConfigDataNotFoundException`.

Closes gh-26147

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
4 years ago
Phillip Webb fef62f784a Import profile specific files in correct order
Update `StandardConfigDataLoader` to mark profile specific files with
`Option.PROFILE` so that they are added in the correct order. This is
a variation of the same issue described in commit 5774ea3f0c.

Closes gh-26400

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
4 years ago
Scott Frederick 922517c0e5 Polish 4 years ago
Andy Wilkinson fe696ee22a Merge branch '2.3.x' into 2.4.x
Closes gh-26396
4 years ago
Andy Wilkinson ef9e3bafff Test our Gradle plugin against 6.9-rc-2
Closes gh-26395
4 years ago
Stephane Nicoll 3a596ed130 Start building against Spring Framework 5.3.7 snapshots
See gh-26360
4 years ago
Stephane Nicoll 17fdd5a79f Start building against Reactor 2020.0.7 snapshots
See gh-26358
4 years ago
Andy Wilkinson f7fae8f0f2 Merge branch '2.3.x' into 2.4.x
Closes gh-26364
4 years ago
Andy Wilkinson b3275c5647 Align productionRuntimeClasspath with runtimeClasspath
Fixes gh-25798
4 years ago
Andy Wilkinson cb1af35dde Merge branch '2.3.x' into 2.4.x
Closes gh-26348
4 years ago
Andy Wilkinson 6440843358 Do not wait indefinitely in initialize test if refresh fails
Closes gh-26286
4 years ago
Scott Frederick dbee0cf9f1 Ignore empty values in config location properties
This commit updates config data property binding to ignore empty
elements in `spring.config.location` and `spring.config.import`
property values when a value is a comma-delimited string
representing a collection.

Fixes gh-26342
4 years ago
Andy Wilkinson c0fe23181c Merge branch '2.3.x' into 2.4.x
Closes gh-26329
4 years ago
Andy Wilkinson 94ca2d1e78 Test the Gradle plugin against Gradle 6.9-rc-1
Closes gh-26267
4 years ago
Stephane Nicoll 01d2c70e8c Merge branch '2.3.x' into 2.4.x
Closes gh-26327
4 years ago
Stephane Nicoll 07358c6b79 Support reactive infrastructure with DataRedisTest
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.

Closes gh-26319
4 years ago
Stephane Nicoll c134c38a68 Merge branch '2.3.x' into 2.4.x
Closes gh-26324
4 years ago
Stephane Nicoll af70da0e92 Update copyright year of changed file
See gh-26321
4 years ago
Matthias Stock 6c8c735027 Fix typo in NamedContributors Javadoc
See gh-26321
4 years ago
Stephane Nicoll 4ccce2a74f Merge branch '2.3.x' into 2.4.x
Closes gh-26322
4 years ago
Stephane Nicoll a6e59b357f Polish "Improve failure analysis with a single bean cycle"
See gh-26292
4 years ago
Roman Zabaluev 044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
4 years ago
Stephane Nicoll 63d486158d Merge branch '2.3.x' into 2.4.x
Closes gh-26317
4 years ago
Stephane Nicoll 3f528bb0eb Mark SpringBootConfiguration as Indexed
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.

This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.

Closes gh-26308
4 years ago
Scott Frederick 17fa215cf5 Merge branch '2.3.x' into 2.4.x
Closes gh-26312
4 years ago
Scott Frederick c37b9b8a8e Use layout configuration in Maven build-image goal
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.

Fixes gh-26216
4 years ago
Andy Wilkinson 94519c33b1 Merge branch '2.3.x' into 2.4.x
Closes gh-26300
4 years ago
Andy Wilkinson ef5fbb0669 Configure bootBuildImage's targetJavaVersion using a provider
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.

This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.

Fixes gh-26297
4 years ago
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x
Closes gh-26298
4 years ago
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
4 years ago
Stephane Nicoll 77a231d742 Merge branch '2.3.x' into 2.4.x
Closes gh-26282
4 years ago
Stephane Nicoll e7bf0a0bd6 Fix key to datasource health indicator in reference doc
Closes gh-26268
4 years ago
Stephane Nicoll 52994027f4 Fix checkstyle violation 4 years ago
Stephane Nicoll 05b09907e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26275
4 years ago
Stephane Nicoll d610f3c2ff Polish "Fix ordering of metadata entries"
See gh-26230
4 years ago
Dmitry Pavlov 3e34b0a60a Fix ordering of metadata entries
This commit provides a consistent ordering for groups that share the
same configuration property prefix.

See gh-26230
4 years ago