Commit Graph

34328 Commits

Author SHA1 Message Date
Stephane Nicoll
9f6ae194dd Merge branch '2.5.x' 2021-10-07 09:40:36 +02:00
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
Madhura Bhave
b350eaee8a Fix checkstyle 2021-10-06 21:36:52 -07:00
Madhura Bhave
e571894903 Merge pull request #28169 from Pooja199
* pr/28169:
  Auto-configure JwtSupplierDecoder to defer OIDC lookup

Closes gh-28169
2021-10-06 16:40:05 -07:00
Anjee
4e9f536a8e Auto-configure JwtSupplierDecoder to defer OIDC lookup
See gh-28169
2021-10-06 16:39:26 -07:00
Madhura Bhave
1ff900cce8 Merge pull request #28173 from kandulsh
* pr/28173:
  Polish "Add smoke test with Spring Session and Hazelcast"
  Add smoke test with Spring Session and Hazelcast

Closes gh-28173
2021-10-06 16:02:24 -07:00
Madhura Bhave
8dcf3e2c70 Polish "Add smoke test with Spring Session and Hazelcast"
See gh-28173
2021-10-06 16:02:14 -07:00
Susmitha
70dd655b60 Add smoke test with Spring Session and Hazelcast
See gh-28173
2021-10-06 16:00:27 -07:00
Andy Wilkinson
1a505964ee Merge branch '2.5.x'
Closes gh-28207
2021-10-06 10:03:24 +01: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
a86a84e00b Merge branch '2.5.x' into main
Closes gh-28202
2021-10-05 15:46:26 -07: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
Stephane Nicoll
0b852492f5 Merge pull request #28162 from dreis2211
* pr/28162:
  Avoid explicit initialization of Atomics with their default values

Closes gh-28162
2021-10-05 15:39:03 +02:00
dreis2211
c5088a3bd3 Avoid explicit initialization of Atomics with their default values
See gh-28162
2021-10-05 15:37:00 +02:00
Stephane Nicoll
f1c1a4fc8b Merge pull request #28136 from jonatan-ivanov
* pr/28136:
  Polish "Add Java InfoContributor"
  Add Java InfoContributor

Closes gh-28136
2021-10-05 15:13:44 +02:00
Stephane Nicoll
5d17257a52 Polish "Add Java InfoContributor"
See gh-28136
2021-10-05 15:11:58 +02:00
Jonatan Ivanov
fc87da7ef3 Add Java InfoContributor
See gh-28136
2021-10-05 13:52:42 +02:00
Andy Wilkinson
0b58d4858d Merge branch '2.5.x'
Closes gh-28200
2021-10-05 11:13:20 +01: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
8aa9d0c13d Merge branch '2.5.x'
Closes gh-28198
2021-10-05 11:12:22 +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
d34a5f1103 Merge branch '2.5.x'
Closes gh-28196
2021-10-05 09:09:10 +02: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
1008b754d7 Merge branch '2.5.x'
Closes gh-28194
2021-10-05 08:36:28 +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
2b7645b806 Merge branch '2.5.x'
Closes gh-28191
2021-10-04 10:23:02 +01: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
3d08d6dee9 Merge branch '2.5.x'
Closes gh-28187
2021-10-03 07:08:04 +02: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