589a22eb0d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27470
2021-07-23 11:02:24 +01:00
9e81fb3e38
Fix race condition in Jetty graceful shutdown tests
...
Some of the Jetty graceful shutdown tests were flaky due to the way
in which Jetty behaves when it is stopped.
Stopping the Jetty web server interrupts the thread that's handling
the active request. This initiates a race between the request-handling
thread which will decrement the number of active requests and the
main thread which expects an active request to cause the shutdown
result to be REQUESTS_ACTIVE. The test passes when the main thread
wins and fails as a request is active which it's checked. When the
request-handling thread wins the test fails as the count of active
requests has been deprecated before it is checked.
The blocking servlet that's used to stall a request and keep it
active needs to be updated to ignore the thread being interrupted
and continue waiting. This will ensure that a request remains active
until the main thread has checked the active request count and
determine the result of the shutdown.
Closes gh-27464
2021-07-23 10:30:17 +01:00
c334e06d29
Merge branch '2.5.x'
...
Closes gh-27467
2021-07-22 18:08:36 -07:00
807582ec06
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27466
2021-07-22 18:07:18 -07:00
8ebeedbf93
Upgrade to Artifactory Resource 0.0.17
...
Closes gh-27465
2021-07-22 18:05:50 -07:00
e5edec6c51
Upgrade to artifactory-resource 0.0.16
...
See gh-27465
2021-07-22 14:01:03 -07:00
7e9ac39f0d
Update copyright year of changed files
2021-07-22 09:50:37 -07:00
20a6073913
Polish
2021-07-22 09:50:17 -07:00
452446f056
Merge branch '2.5.x'
...
Closes gh-27463
2021-07-22 15:40:27 +01:00
4b74399486
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27462
2021-07-22 15:40:11 +01:00
62db4c76f1
Fix problems with gradle-plugin-publishing
...
Closes gh-27461
2021-07-22 15:39:46 +01:00
54fbfd3914
Merge branch '2.5.x'
2021-07-22 15:16:39 +01:00
2400e4e591
Next development version (v2.5.4-SNAPSHOT)
2021-07-22 13:51:31 +00:00
eb5ef73b65
Merge branch '2.5.x'
...
Closes gh-27460
2021-07-22 12:14:45 +01:00
e2c6929d2b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27459
2021-07-22 12:14:21 +01:00
f0625b42bf
Trigger publish-gradle-plugin automatically
...
Closes gh-27454
2021-07-22 12:13:31 +01:00
30224412e7
Merge branch '2.5.x'
...
Closes gh-27458
2021-07-22 12:11:58 +01:00
3e99a97bd8
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27457
2021-07-22 12:11:43 +01:00
1389d803ae
Correct path in publish-gradle-plugin script
...
Fixes gh-27456
2021-07-22 12:05:41 +01:00
c9361798be
Merge branch '2.5.x'
...
Closes gh-27455
2021-07-22 11:42:45 +01:00
7225d0e54b
Merge pull request #27453 from saraswathy-krish
...
* gh-27453:
Polish "Fix deriving DataSources from custom type"
Fix deriving DataSources from custom type
Closes gh-27453
2021-07-22 11:42:01 +01:00
18b4898977
Polish "Fix deriving DataSources from custom type"
...
See gh-27453
2021-07-22 11:41:54 +01:00
d0e2823c49
Fix deriving DataSources from custom type
...
Eliminate the unsupported datasource property exception thrown
when trying to derive a datasource from an unknown datasource type.
See gh-27453
2021-07-22 11:41:54 +01:00
58ee531ddb
Merge branch '2.5.x'
2021-07-22 11:40:45 +01:00
44a9531ace
Merge branch '2.4.x' into 2.5.x
2021-07-22 11:40:35 +01:00
3321b835f4
Next development version (v2.4.10-SNAPSHOT)
2021-07-22 10:18:53 +00:00
3b3dff3b4b
Merge branch '2.5.x'
2021-07-22 10:38:14 +01:00
68c5f6cd30
Upgrade to Undertow 2.2.9.Final
...
Closes gh-27452
2021-07-22 10:05:59 +01:00
191bd8ca57
Upgrade to SLF4J 1.7.32
...
Closes gh-27451
2021-07-22 10:05:58 +01:00
a279d42712
Upgrade to MySQL 8.0.26
...
Closes gh-27450
2021-07-22 10:05:57 +01:00
982d6c6097
Upgrade to Logback 1.2.4
...
Closes gh-27449
2021-07-22 10:05:55 +01:00
8044bd2424
Upgrade to Jedis 3.6.3
...
Closes gh-27448
2021-07-22 10:05:54 +01:00
fcdc3833e8
Merge branch '2.4.x' into 2.5.x
2021-07-22 09:41:05 +01:00
3ca86435d1
Upgrade to Undertow 2.2.9.Final
...
Closes gh-27446
2021-07-22 09:05:30 +01:00
aaf26245d5
Upgrade to SLF4J 1.7.32
...
Closes gh-27445
2021-07-22 09:05:29 +01:00
7fbfbfe21e
Upgrade to MySQL 8.0.26
...
Closes gh-27444
2021-07-22 09:05:27 +01:00
d69e7313b2
Merge branch '2.5.x'
...
Closes gh-27443
2021-07-22 08:38:54 +01:00
c7ba905993
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27442
2021-07-22 08:38:03 +01:00
70ecaac16c
Configure a mirror for registry-image image_resources
...
Closes gh-27441
2021-07-22 08:35:32 +01:00
3866f5f4d7
Merge branch '2.5.x'
...
Closes gh-27440
2021-07-22 08:28:11 +01:00
ca9396d890
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27439
2021-07-22 08:27:56 +01:00
79990a1b9c
Upgrade to artifactory-resource 0.0.15
...
Closes gh-27232
2021-07-22 08:26:36 +01:00
37f690323f
Polish
...
Closes gh-27432
2021-07-21 11:55:38 +01:00
bb26b7bdf5
Polish
...
Closes gh-27431
2021-07-21 11:53:10 +01:00
14e23bf556
Merge pull request #27418 from izeye
...
* gh-27418:
Polish
Closes gh-27418
2021-07-21 11:49:15 +01:00
734293d491
Polish
...
See gh-27418
2021-07-21 11:17:43 +01:00
c211c971f1
Polishing
...
Closes gh-27429
2021-07-21 11:07:15 +01:00
4a533e14c3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27428
2021-07-21 11:06:40 +01:00
c8c1452ced
Merge pull request #27417 from dreis2211
...
* gh-27417:
Polishing
Closes gh-27417
2021-07-21 11:06:30 +01:00
4d0c98011e
Polishing
...
See gh-27417
2021-07-21 11:05:59 +01:00
Andy Wilkinson
Phillip Webb
Spring Buildmaster
saraswathy-krish
izeye
dreis2211