Stephane Nicoll
a9b1a796ea
Merge branch '2.4.x' into 2.5.x
2021-10-07 09:40:23 +02:00
Stephane Nicoll
33ffae8e74
Start building against Spring Batch 4.3.4 snapshots
...
See gh-28230
2021-10-07 09:07:50 +02:00
Stephane Nicoll
092d3fa81e
Start building against Spring Session 2020.0.7 snapshots
...
See gh-28229
2021-10-07 09:07:22 +02:00
Stephane Nicoll
41eded4b8b
Start building against Spring Security 5.4.9 snapshots
...
See gh-28228
2021-10-07 09:06:54 +02:00
Stephane Nicoll
f8d6d76410
Start building against Spring Kafka 2.6.11 snapshots
...
See gh-28227
2021-10-07 09:06:24 +02:00
Stephane Nicoll
3cf1888cef
Start building against Spring AMQP 2.3.11 snapshots
...
See gh-28226
2021-10-07 09:06:00 +02:00
Stephane Nicoll
6c801b9db9
Start building against Spring Data 2020.0.14 snapshots
...
See gh-28225
2021-10-07 09:05:35 +02:00
Stephane Nicoll
81da876964
Start building against Micrometer 1.6.12 snapshots
...
See gh-28224
2021-10-07 09:05:09 +02:00
Stephane Nicoll
9f06a5fe21
Start building against Spring Framework 5.3.11 snapshots
...
See gh-28223
2021-10-07 09:04:28 +02:00
Stephane Nicoll
dd802ba5e0
Start building against Reactor 2020.0.12 snapshots
...
See gh-28222
2021-10-07 09:03:57 +02:00
Andy Wilkinson
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
Madhura Bhave
9f4cf8398b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28201
2021-10-05 15:46:04 -07:00
Madhura Bhave
747cd9d5d1
Merge pull request #28170 from dvonsegg
...
* pr/28170:
Polish " Update configtree docs about dot notation being correctly mapped"
Update configtree docs about dot notation being correctly mapped
Closes gh-28170
2021-10-05 15:44:15 -07:00
Madhura Bhave
61736e9958
Polish " Update configtree docs about dot notation being correctly mapped"
...
See gh-28170
2021-10-05 15:43:20 -07:00
deb-von-seggern
8f91fc450d
Update configtree docs about dot notation being correctly mapped
...
See gh-28170
2021-10-05 15:14:02 -07:00
Andy Wilkinson
322615d9c5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28199
2021-10-05 11:12:48 +01:00
Andy Wilkinson
51c3758801
Merge branch 'gh-28130' into 2.5.x
...
Fixes gh-28130
2021-10-05 11:12:06 +01:00
Andy Wilkinson
437a1601ef
Fix broken content negotiation for Prometheus with OpenMetrics
...
Update Prometheus `TextOutputFormat` so that OpenMetrics is used in
preference to text output when an appropriate accept header is found.
If the accept header contains `*/*` or is missing then the text format
will be used.
See gh-28130
2021-10-05 11:11:52 +01:00
Andy Wilkinson
8c3820f87e
Fix up-to-date checking of syncAppSource tasks
...
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.
This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.
Closes gh-28197
2021-10-05 11:08:22 +01:00
Phillip Webb
d8141e6a8d
Allow Producible enums to indicate a default value
...
Add an `isDefault()` method to `Producible` which can be used to
indicate which of the enum values should be used when the accept header
is `*/*` or `null`.
Prior to this commit, the last enum value was always used as the
default.
See gh-28130
2021-10-05 09:39:28 +01:00
Stephane Nicoll
a1c88faf46
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28195
2021-10-05 09:08:59 +02:00
Stephane Nicoll
1fc52b65a3
Upgrade to concourse-java-scripts 0.0.4
...
Closes gh-23962
2021-10-05 09:08:36 +02:00
Stephane Nicoll
d22167b96a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28193
2021-10-05 08:35:24 +02:00
Stephane Nicoll
823ae77887
Merge pull request #28189 from inomag
...
* pr/28189:
Fix log4j2 file name reference in reference doc
Closes gh-28189
2021-10-05 08:33:42 +02:00
Pratik Gupta
a3423f1edf
Fix log4j2 file name reference in reference doc
...
See gh-28189
2021-10-05 08:32:59 +02:00
Andy Wilkinson
ff3eed73ee
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28190
2021-10-04 10:21:49 +01:00
Andy Wilkinson
b7a2a2d5e0
Set last access and last modified times in layertools extract
...
Closes gh-28167
2021-10-04 10:17:11 +01:00
Stephane Nicoll
71020fd70d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28186
2021-10-03 07:07:52 +02:00
Stephane Nicoll
6d3e1734f6
Upgrade to GitHub Changelog Generator 0.0.7 in CI
...
Closes gh-28185
2021-10-03 07:07:30 +02:00
Madhura Bhave
3249d05464
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28171
2021-10-01 15:54:49 -07:00
Madhura Bhave
512015c7af
Merge pull request #28168 from kandulsh
...
* pr/28168:
Update ConstructorBinding javadoc with usage information
Closes gh-28168
2021-10-01 15:54:05 -07:00
Susmitha
f94caed7e9
Update ConstructorBinding javadoc with usage information
...
See gh-28168
2021-10-01 15:53:43 -07:00
Andy Wilkinson
14a57adb53
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28165
2021-10-01 14:16:20 +01:00
Andy Wilkinson
35b16ea04e
Minimize dependencies of launch script test app
...
Closes gh-28164
2021-10-01 14:15:52 +01:00
Andy Wilkinson
d238566920
Merge branch '2.4.x' into 2.5.x
...
See gh-28134
2021-10-01 11:32:22 +01:00
Andy Wilkinson
a73293350a
Fix parsing of portless IPv6 spring.rabbitmq.addresses
...
Closes gh-28133
2021-10-01 11:30:11 +01:00
Stephane Nicoll
1c139b1d23
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28159
2021-10-01 08:13:49 +02:00
Stephane Nicoll
218bed1f8e
Merge pull request #28086 from polarbear567
...
* pr/28086:
Polish "Clarify use of @AutoConfigureTestEntityManager"
Clarify use of @AutoConfigureTestEntityManager
Closes gh-28086
2021-10-01 08:12:14 +02:00
Stephane Nicoll
bedd749e1c
Polish "Clarify use of @AutoConfigureTestEntityManager"
...
See gh-28086
2021-10-01 08:12:01 +02:00
Leo Li
70f64f2c26
Clarify use of @AutoConfigureTestEntityManager
...
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.
See gh-28086
2021-10-01 07:55:57 +02:00
Andy Wilkinson
9e484e2cdc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson
3824512357
Tighten up build's task interdependencies
...
Closes gh-28103
2021-09-30 15:35:39 +01:00
Phillip Webb
fcb6f557f7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28134
2021-09-26 13:06:14 -07:00
Phillip Webb
01a39aaf6a
Support IPv6 addresses in spring.rabbitmq.addresses
...
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.
Fixes gh-28133
2021-09-26 13:05:17 -07:00
Andy Wilkinson
ef18a2166d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28119
2021-09-23 13:23:40 +01:00
Andy Wilkinson
5957dfeea4
Don't include binary jars in loader-tools source jar
...
Closes gh-28113
2021-09-23 13:23:29 +01:00
Andy Wilkinson
4e5da6a6ed
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28117
2021-09-23 13:18:50 +01:00
Andy Wilkinson
46b47b80aa
Upgrade to NoHTTP 0.0.10
...
Closes gh-28112
2021-09-23 13:18:41 +01:00
Andy Wilkinson
84d332e527
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28115
2021-09-23 11:26:37 +01:00