Commit Graph

13854 Commits (530d17cf7ed8a0aabb99ff37610ed8b50b560ce7)

Author SHA1 Message Date
Stephane Nicoll 7ca9794f3c Upgrade to Reactor 2020.0.8
Closes gh-26968
3 years ago
Stephane Nicoll c21099b142 Upgrade to Reactor 2020.0.8
Closes gh-26962
3 years ago
Andy Wilkinson 051638631b Merge branch '2.4.x' into 2.5.x
Closes gh-27024
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
Andy Wilkinson cf940fd374 Disable Log4j2's shutdown hook by default
Previously, Log4j2's own shutdown hook was only disabled when Log4j2
detected javax.servlet.Servlet on the classpath and, therefore,
determined that it was running in a web application. In an application
without Servlet on the classpath, this could lead to both Log4j2's shut
down hook and and logging system's shutdown handler both stopping
Log4j2. This could result in a failure as the second attempt at stopping
would result in reinitialization which would fail as the JVM is already
shutting down.

This commit introduces a new Log4j2 PropertySource implementation,
registered via META-INF/services, that sets the
log4j.shutdownHookEnabled property to false. This will ensure that
Log4j2's own shutdown hook is disabled by default whenever Spring Boot
is on the classpath and not just in Servlet-based web applications.

Fixes gh-26953
3 years ago
Stephane Nicoll 0a2fe3562d Start building against Micrometer 1.7.1 snapshots
See gh-27015
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
dreis2211 03cd6bec6e Avoid illegal reflective access in RabbitAutoConfigurationTests
See gh-26954
3 years ago
Stephane Nicoll 168478f68c Merge branch '2.4.x' into 2.5.x
Closes gh-27010
3 years ago
Sviatoslav Hryb 2252deb69b Document uuid support in RandomValuePropertySource
See gh-26975
3 years ago
Stephane Nicoll 8668e55631 Revert "Avoid dependency on Kotlin when depending on spring-security-config"
Closes gh-26728
3 years ago
Stephane Nicoll 5044137658 Revert "Avoid duplicate crypto classes when depending on spring-security-core"
Closes gh-26588
3 years ago
Stephane Nicoll c67c09df32 Upgrade to Spring Security 5.5.1
Closes gh-26945
3 years ago
Stephane Nicoll 333c7a7cd8 Upgrade to Spring Security 5.4.7
Closes gh-26965
3 years ago
Phillip Webb f914dc15fc Merge branch '2.4.x' into 2.5.x
Closes gh-27005
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
Andy Wilkinson 07e7398d10 Include 6.9.x in version requirements message
Fixes gh-26952
3 years ago
Stephane Nicoll 5dc1065876 Revert "Upgrade to Dropwizard Metrics 4.1.23"
This reverts commit ce24270271.

See gh-26983
3 years ago
Stephane Nicoll 3ef7ba7f9b Upgrade to SLF4J 1.7.31
Closes gh-26995
3 years ago
Stephane Nicoll 68cd28a481 Upgrade to Postgresql 42.2.22
Closes gh-26994
3 years ago
Stephane Nicoll b3b2d9a095 Upgrade to Jetty EL 9.0.48
Closes gh-26993
3 years ago
Stephane Nicoll fc5d781cfc Upgrade to Jedis 3.6.1
Closes gh-26992
3 years ago
Stephane Nicoll 2a190f3589 Upgrade to Cassandra Driver 4.11.2
Closes gh-26990
3 years ago
Andy Wilkinson 8405df10b8 Merge branch '2.4.x' into 2.5.x
Closes gh-26997
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 c99d1dae08 Start building against Spring Integration 5.5.1 snapshots
See gh-26974
3 years ago
Stephane Nicoll d015464a7e Start building against Spring Kafka 2.7.3 snapshots
See gh-26973
3 years ago
Stephane Nicoll 516228730f Start building against Spring Session 2021.0.1 snapshots
See gh-26971
3 years ago
Stephane Nicoll 1aa99b1549 Start building against Spring Data 2021.0.2 snapshots
See gh-26970
3 years ago
Stephane Nicoll a487bd6423 Start building against Spring HATEOAS 1.3.2 snapshots
See gh-26969
3 years ago
Andy Wilkinson 580b1b81ab Fix HTTP/2 over TLS with Jetty 10
Fixes gh-26988
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
Yanming Zhou 12a6e4c231 Add missing space for asciidoc ordered list
See gh-26955
3 years ago
Andy Wilkinson 5d20edc666 Allow BFPP to modify database initialization ordering
Fixes gh-26899
3 years ago
Andy Wilkinson a2772e288a Merge branch '2.4.x' into 2.5.x
Closes gh-26947
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 566a642ce7 Merge branch '2.4.x' into 2.5.x
See gh-26935
3 years ago
Andy Wilkinson 204dd29c51 Fix test on Windows
See gh-26821
3 years ago
Andy Wilkinson 7ee3b287e1 Catch isEmbedded failure and treat database as not embedded
Fixes gh-26926
3 years ago
Andy Wilkinson 7cd2d6474c Only check database's type when there are scripts to apply
Fixes gh-26925
3 years ago
Phillip Webb 5c65b1bcde Fix asciidoctor anchor references
See gh-26939
3 years ago
Phillip Webb c3b873c11d Merge branch '2.4.x' into 2.5.x
Closes gh-26939
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 79f47b150a Merge branch '2.4.x' into 2.5.x
Closes gh-26935
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 bc7004d9c6 Fix WebSocket support with Jetty 10.0.x
Fixes gh-26847
3 years ago
Andy Wilkinson d635e1e779 Merge branch '2.4.x' into 2.5.x
Closes gh-26923
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 b75c79cc7c Merge branch '2.4.x' into 2.5.x
Closes gh-26919
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 2c2ab69315 Merge branch '2.4.x' into 2.5.x
Closes gh-26917
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 44187bc6bf Merge branch '2.4.x' into 2.5.x
See gh-26901
3 years ago
Andy Wilkinson 7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts
See gh-26900
3 years ago
Stephane Nicoll 96029dbd8a Polish "Add Azure info to the cloud deployment docs"
See gh-26910
3 years ago
Andy Clement 8321faaf16 Add Azure info to the cloud deployment docs
See gh-26910
3 years ago
izeye eeefaf4314 Fix Javadoc deprecated since
See gh-26907
3 years ago
Andy Wilkinson 6a51c272b9 Test our Gradle plugin against Gradle 7.1
Closes gh-26904
3 years ago
Andy Wilkinson 017ba504d7 Merge branch '2.4.x' into 2.5.x
Closes gh-26901
3 years ago
Andy Wilkinson 32effdba0a Try to stabilize RestarterTests.testRestart
Closes gh-26900
3 years ago
Madhura Bhave aa873d3a22 Reorder documentation overview section
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
3 years ago
Andy Wilkinson 9e2339b5d0 Merge branch '2.4.x' into 2.5.x 3 years ago
Andy Wilkinson 16bfa669e1 Polish authors separators 3 years ago
Andy Wilkinson 5f26fd9ccb Merge branch '2.4.x' into 2.5.x
Closes gh-26891
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 5de5390ef9 Merge branch '2.4.x' into 2.5.x
Closes gh-26889
3 years ago
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
Closes gh-26888
3 years ago
Andy Wilkinson 3858c6299d Merge branch '2.4.x' into 2.5.x
Closes gh-26886
3 years ago
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener()
Closes gh-26885
3 years ago
Andy Wilkinson 866f1e34c1 Merge branch '2.4.x' into 2.5.x
Closes gh-26873
3 years ago
Andy Wilkinson 37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test
Closes gh-26855
3 years ago
Andy Wilkinson 0ab7144bf1 Merge branch '2.4.x' into 2.5.x
Closes gh-26870
3 years ago
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests
Closes gh-26857
3 years ago
Andy Wilkinson 00b9e7f498 Merge branch '2.4.x' into 2.5.x
Closes gh-26868
3 years ago
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose
Closes gh-26856
3 years ago
Andy Wilkinson f3f119b111 Don't shutdown logging system before contexts
Add `SpringApplicationShutdownHook` to manage orderly application
shutdown, specifically around the `LoggingSystem`. `SpringApplication`
now offers a `getShutdownHandlers()` method that can be used to add
handlers that are guaranteed to only run after the `ApplicationContext`
has been closed and is inactive.

Fixes gh-26660
3 years ago
Andy Wilkinson 39aa27e13c Make DB init back off without DatabasePopulator
Fixes gh-26850
3 years ago
Phillip Webb 2835085ffb Polish 3 years ago
Phillip Webb 17671980dc Merge branch '2.4.x' 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
Stephane Nicoll 18eb88b281 Upgrade to Git Commit ID Plugin 4.0.5
Closes gh-26845
3 years ago
Stephane Nicoll f79f2b1594 Upgrade to Spring AMQP 2.3.8
Closes gh-26764
3 years ago
Stephane Nicoll ab90a948be Polish "Fix Optaplanner starter url"
See gh-26816
3 years ago
Geoffrey De Smet 736b0678e5 Fix Optaplanner starter url
See gh-26816
3 years ago
Stephane Nicoll a7c538faa0 Upgrade to RSocket 1.1.1
Closes gh-26839
3 years ago
Stephane Nicoll 2201315556 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26838
3 years ago
Stephane Nicoll 5cb1bd8245 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26837
3 years ago
Madhura Bhave 2e2d1fe8d3 Merge branch '2.4.x' into main 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 9fb7cf49e4 Upgrade to Spring Kafka 2.7.2
Closes gh-26765
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 46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning
See gh-26682
3 years ago
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
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 8590eccac4 Polish
See gh-26682
3 years ago
Stephane Nicoll d23b07a166 Upgrade to Spring Framework 5.3.8
Closes gh-26761
3 years ago
Stephane Nicoll e9592229fc Upgrade to Spring Framework 5.3.8
Closes gh-26760
3 years ago
Andy Wilkinson 03f8a46c80 Test our Gradle plugin against 7.1-rc-2
Closes gh-26825
3 years ago
Andy Wilkinson c5728c9560 Merge branch '2.4.x'
Closes gh-26827
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 850088de32 Merge branch '2.4.x'
Closes gh-26823
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 f798f26596 Merge branch '2.4.x' 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
Phillip Webb 703eaa71f4 Remove main class configuration fallback
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.

Closes gh-26794
3 years ago
Phillip Webb b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
3 years ago
Phillip Webb f8c3e0e5aa Respect custom username/password properties
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
3 years ago
Phillip Webb d19b2681ab Rework build-image-customization table in docs
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.

Closes gh-25739
3 years ago
Phillip Webb 6ab2df5698 Order DataSourceScriptDatabaseInitializer last
Change the order of `DataSourceScriptDatabaseInitializerDetector` so
that it always runs last. This update allows script initialization to
be combined with a high-level migration tool such as Flyway.

Closes gh-26692
3 years ago
Phillip Webb dafd511284 Support DatabaseInitializerDetector ordering
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.

Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.

See gh-26692
3 years ago
Scott Frederick fba5ffc626 Fix FilePermissionsTests on Windows
See gh-26658
3 years ago
Andy Wilkinson 8df6392ca5 Polish
The use of the file's absolute path caused test failures on Windows.

See gh-26682
3 years ago
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization
Closes gh-26682
3 years ago
Andy Wilkinson 1a0e008a8c Prevent Netty tcNative from loading classes with wrong class loader
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.

It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.

Closes gh-26749
3 years ago
Stephane Nicoll faeda6f917 Polish 3 years ago
Stephane Nicoll 4c71e8124d Upgrade to Undertow 2.2.8.Final
Closes gh-26809
3 years ago
Stephane Nicoll 11d31edf0a Upgrade to Neo4j Java Driver 4.2.6
Closes gh-26808
3 years ago
Stephane Nicoll 88b9b88cd9 Upgrade to jOOQ 3.14.11
Closes gh-26807
3 years ago
Stephane Nicoll b755eacd86 Upgrade to Johnzon 1.2.13
Closes gh-26806
3 years ago
Stephane Nicoll 3d5caf0863 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26805
3 years ago
Stephane Nicoll a74fb0c2f0 Upgrade to Infinispan 12.1.4.Final
Closes gh-26804
3 years ago
Stephane Nicoll b4d0c3df6d Upgrade to Hibernate 5.4.32.Final
Closes gh-26803
3 years ago
Stephane Nicoll 7ea263548c Upgrade to Gson 2.8.7
Closes gh-26802
3 years ago
Stephane Nicoll e2a877ca07 Upgrade to Ehcache3 3.9.4
Closes gh-26801
3 years ago
Stephane Nicoll 5a18553b50 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26800
3 years ago
Stephane Nicoll b9d29130fb Upgrade to Couchbase Client 3.1.6
Closes gh-26799
3 years ago
Stephane Nicoll cd8a9d3705 Upgrade to AppEngine SDK 1.9.89
Closes gh-26798
3 years ago
Phillip Webb f5b93da90f Fix conversion failures when using DefaultResolver
Update `ConfigurationPropertySourcesPropertyResolver` so that calls to
the `DefaultResolver` do not attempt conversion.

Prior to this commit, the delegate resolver was accidentally called
with the target type which could cause a `ConversionFailedException`
to be thrown. We should have always used `Object.class` and let the
`convertValueIfNecessary` method perform conversion.

Fixes gh-26732
3 years ago
Phillip Webb be23a29651 Polish 3 years ago
Andy Wilkinson 87d35250a5 Test our Gradle plugin against 7.1-rc-1
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.

Closes gh-26793
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 abd926788f Merge branch '2.4.x'
Closes gh-26782
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 5391f028a7 Start building against Spring Kafka 2.7.2 snapshots
See gh-26765
4 years ago
Stephane Nicoll caacee5f1c Start building against Spring AMQP 2.3.8
See gh-26764
4 years ago
Stephane Nicoll c435f6337c Start building against Spring Framework 5.3.8 snapshots
See gh-26761
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 5ac5038176 Merge branch '2.4.x' 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
Stephane Nicoll aff1366731 Polish "Fix typo in 'Reacting to the Maven plugin' title"
See gh-26751
4 years ago
Abel Salgado Romero 9eea502c3e Fix typo in 'Reacting to the Maven plugin' title
See gh-26751
4 years ago
Phillip Webb e73062aefa Merge branch '2.4.x'
Closes gh-26755
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 3c7a0d3bf2 Merge branch '2.4.x'
Closes gh-26754
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 75f31f6bc4 Merge branch '2.4.x'
Closes gh-26748
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 02494d63d2 Merge branch '2.4.x'
Closes gh-26744
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