Phillip Webb
7c4f178c17
Merge branch '2.3.x' into 2.4.x
3 years ago
Phillip Webb
3b48526732
Polish
3 years ago
Stephane Nicoll
2aa1c9764a
Upgrade CI to Docker 20.10.7
...
Closes gh-26841
3 years ago
Stephane Nicoll
ed386e67df
Merge branch '2.3.x' into 2.4.x
3 years ago
Stephane Nicoll
456fcac0f2
Upgrade CI to Docker 20.10.7
...
Closes gh-26842
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
f111a90525
Merge branch '2.3.x' into 2.4.x
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
66823c7641
Merge branch '2.3.x' into 2.4.x
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
8ce7a2b5a3
Merge branch '2.3.x' into 2.4.x
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
3 years ago
Stephane Nicoll
d6f22f0802
Upgrade to jOOQ 3.14.11
...
Closes gh-26790
3 years ago
Stephane Nicoll
99169af57c
Upgrade to Johnzon 1.2.13
...
Closes gh-26789
3 years ago
Stephane Nicoll
fe249dd772
Upgrade to JBoss Logging 3.4.2.Final
...
Closes gh-26788
3 years ago
Stephane Nicoll
5be4a9ab50
Upgrade to Hibernate 5.4.32.Final
...
Closes gh-26787
3 years ago
Stephane Nicoll
e496d2e321
Upgrade to Gson 2.8.7
...
Closes gh-26786
3 years ago
Stephane Nicoll
16ff9318b5
Upgrade to Ehcache3 3.9.4
...
Closes gh-26785
3 years ago
Stephane Nicoll
90f96e2d48
Upgrade to Dropwizard Metrics 4.1.22
...
Closes gh-26784
3 years ago
Stephane Nicoll
cfaab0904b
Upgrade to AppEngine SDK 1.9.89
...
Closes gh-26783
3 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
3 years ago
Stephane Nicoll
c0cbef9aaa
Merge branch '2.3.x' into 2.4.x
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
d1652c2749
Merge branch '2.3.x' into 2.4.x
4 years ago
Stephane Nicoll
39f259554b
Start building against Spring Integration 5.3.8 snapshots
...
See gh-26772
4 years ago