Commit Graph

34307 Commits

Author SHA1 Message Date
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
Madhura Bhave fb9f1eba41 Merge branch '2.5.x' into main
Closes gh-28172
2021-10-01 15:55:06 -07: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 29637706a9 Merge branch '2.5.x'
Closes gh-28166
2021-10-01 14:16:33 +01: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 bddfe9ef6e Merge branch '2.5.x'
See gh-28135
2021-10-01 11:32:59 +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 86a4425162 Merge pull request #28124 from radoslawdabrowski
* pr/28124:
  Polish "Stop considering persistent when scanning for Couchbase entities"
  Stop considering persistent when scanning for Couchbase entities

Closes gh-28124
2021-10-01 08:40:34 +02:00
Stephane Nicoll 14fc0f78b2 Polish "Stop considering persistent when scanning for Couchbase entities"
See gh-28124
2021-10-01 08:31:14 +02:00
Dąbrowski 067b349fb1 Stop considering persistent when scanning for Couchbase entities
See gh-28124
2021-10-01 08:28:36 +02:00
Stephane Nicoll 1b7536fda4 Merge branch '2.5.x'
Closes gh-28160
2021-10-01 08:14:03 +02: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
Stephane Nicoll e31e02ab2a Merge pull request #28141 from ghostd
* pr/28141:
  Polish "Replace latin locutions in the documentation"
  Replace latin locutions in the documentation

Closes gh-28141
2021-10-01 07:39:00 +02:00
Stephane Nicoll 9e1ef76f84 Polish "Replace latin locutions in the documentation"
See gh-28141
2021-10-01 07:38:41 +02:00
Vincent Ricard 873bca36c4 Replace latin locutions in the documentation
See gh-28141
2021-10-01 07:33:01 +02:00