Commit Graph

33658 Commits

Author SHA1 Message Date
Stephane Nicoll f2288a84b7 Upgrade Java 17 version in CI image
Closes gh-28026
2021-09-16 06:42:32 +02:00
Stephane Nicoll 62fc733b2c Merge branch '2.4.x' into 2.5.x 2021-09-16 06:37:07 +02:00
Stephane Nicoll 17c35c7e31 Upgrade to Micrometer 1.7.4
Closes gh-27916
2021-09-16 06:36:50 +02:00
Stephane Nicoll 3118c16c48 Upgrade to Micrometer 1.6.11
Closes gh-27910
2021-09-16 06:36:11 +02:00
Stephane Nicoll c94c94abab Merge branch '2.4.x' into 2.5.x 2021-09-15 12:12:31 +02:00
Stephane Nicoll 915f565435 Upgrade to Spring Framework 5.3.10
Closes gh-27915
2021-09-15 12:11:59 +02:00
Stephane Nicoll 4ada440b4d Upgrade to Spring Framework 5.3.10
Closes gh-27909
2021-09-15 12:11:13 +02:00
Stephane Nicoll aa5a645419 Remove Java 16 pipeline
Closes gh-28023
2021-09-15 09:17:53 +02:00
Scott Frederick a540da11ad Merge branch '2.4.x' into 2.5.x
Closes gh-27993
2021-09-14 16:45:34 -05:00
Scott Frederick c8ff874e91 Add builderFor label to ephemeral builder image
Adding a label to the ephemeral builder image cloned from the base
builder image eliminates contention between builds that are run
concurrently. Without this label, concurrent builds could result in
a race condition in the Docker daemon if the ephemeral builder image
shared by builds was deleted by both builds at exactly the same time.

Fixes gh-27888
2021-09-14 15:22:23 -05:00
Stephane Nicoll 2c02f5f43a Merge branch '2.4.x' into 2.5.x 2021-09-14 18:41:19 +02:00
Stephane Nicoll c7ded01d05 Upgrade to Reactor 2020.0.11
Closes gh-27914
2021-09-14 18:41:02 +02:00
Stephane Nicoll bb693d73a6 Upgrade to Reactor 2020.0.11
Closes gh-27908
2021-09-14 18:40:12 +02:00
Stephane Nicoll 242631f40e Upgrade to Netty tcNative 2.0.43.Final
Closes gh-27986
2021-09-14 07:15:35 +02:00
Stephane Nicoll 441037ce18 Upgrade to Netty 4.1.68.Final
Closes gh-27985
2021-09-14 07:15:34 +02:00
Stephane Nicoll 9c6138fa1c Upgrade to Maven War Plugin 3.3.2
Closes gh-27984
2021-09-14 07:15:33 +02:00
Stephane Nicoll 8454812df1 Upgrade to Logback 1.2.6
Closes gh-27983
2021-09-14 07:15:32 +02:00
Stephane Nicoll 5813021b7b Upgrade to Kotlin Coroutines 1.5.2
Closes gh-27982
2021-09-14 07:15:31 +02:00
Stephane Nicoll 1f5946b3e4 Upgrade to Kotlin 1.5.30
Closes gh-27981
2021-09-14 07:15:30 +02:00
Stephane Nicoll 3e221094c0 Upgrade to jOOQ 3.14.14
Closes gh-27980
2021-09-14 07:15:29 +02:00
Stephane Nicoll afba450e53 Upgrade to Jetty EL 9.0.52
Closes gh-27979
2021-09-14 07:15:28 +02:00
Stephane Nicoll d8254af351 Upgrade to Jackson Bom 2.12.5
Closes gh-27978
2021-09-14 07:15:27 +02:00
Stephane Nicoll c624dc9c78 Upgrade to Gson 2.8.8
Closes gh-27977
2021-09-14 07:15:26 +02:00
Stephane Nicoll f4cbcaf774 Upgrade to Groovy 3.0.9
Closes gh-27976
2021-09-14 07:15:25 +02:00
Stephane Nicoll bffd983d56 Upgrade to Glassfish EL 3.0.4
Closes gh-27975
2021-09-14 07:15:24 +02:00
Stephane Nicoll 1aaa79c841 Upgrade to Ehcache3 3.9.6
Closes gh-27974
2021-09-14 07:15:23 +02:00
Stephane Nicoll 3043b00fcb Merge branch '2.4.x' into 2.5.x 2021-09-13 14:37:10 +02:00
Stephane Nicoll 35f61bf1ca Start building against Spring HATEOAS 1.3.4 snapshots
See gh-27970
2021-09-13 14:28:22 +02:00
Stephane Nicoll 57dcb70910 Start building against Spring HATEOAS 1.2.9 snapshots
See gh-27969
2021-09-13 14:27:28 +02:00
Andy Wilkinson f530819d68 Merge branch '2.4.x' into 2.5.x
Closes gh-27966
2021-09-13 10:47:47 +01:00
Andy Wilkinson 273600bcdd Retain distinction between compile and runtime deps of optional deps
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.

This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.

The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.

Closes gh-27965
2021-09-13 10:47:14 +01:00
Stephane Nicoll 2004c062df Upgrade to Tomcat 9.0.53
Closes gh-27963
2021-09-13 11:04:02 +02:00
Stephane Nicoll 3274c115b0 Merge branch '2.4.x' into 2.5.x 2021-09-13 11:02:40 +02:00
Stephane Nicoll ab81e3c05c Upgrade to Tomcat 9.0.53
Closes gh-27961
2021-09-13 10:28:42 +02:00
Stephane Nicoll 97f3c82743 Upgrade to Netty tcNative 2.0.42.Final
Closes gh-27960
2021-09-13 10:10:05 +02:00
Stephane Nicoll c8ea3af6f7 Upgrade to Netty 4.1.68.Final
Closes gh-27959
2021-09-13 10:10:04 +02:00
Stephane Nicoll 21c53729ab Upgrade to Maven War Plugin 3.3.2
Closes gh-27958
2021-09-13 10:10:03 +02:00
Stephane Nicoll fadf5ba33a Upgrade to Logback 1.2.6
Closes gh-27957
2021-09-13 10:10:01 +02:00
Stephane Nicoll 3276c977e3 Upgrade to jOOQ 3.14.14
Closes gh-27956
2021-09-13 10:10:00 +02:00
Stephane Nicoll 0e3ac71857 Upgrade to Jetty EL 8.5.70
Closes gh-27955
2021-09-13 10:09:59 +02:00
Stephane Nicoll d09beaf968 Upgrade to Gson 2.8.8
Closes gh-27954
2021-09-13 10:09:58 +02:00
Stephane Nicoll 6eedf9cfe4 Upgrade to Groovy 2.5.15
Closes gh-27953
2021-09-13 10:09:57 +02:00
Stephane Nicoll a5b5b2d10f Upgrade to Glassfish EL 3.0.4
Closes gh-27952
2021-09-13 10:09:56 +02:00
Stephane Nicoll a3762b3f08 Upgrade to Ehcache3 3.9.6
Closes gh-27951
2021-09-13 10:09:54 +02:00
Stephane Nicoll 9d96e65d87 Merge branch '2.4.x' into 2.5.x 2021-09-13 08:41:48 +02:00
Stephane Nicoll d481a75beb Start building against Spring Integration 5.5.4 snapshots
See gh-27949
2021-09-13 08:41:31 +02:00
Stephane Nicoll c678a0edc0 Start building against Spring Integration 5.4.11 snapshots
See gh-27948
2021-09-13 08:40:32 +02:00
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x
Closes gh-27943
2021-09-12 09:02:35 +02:00
Stephane Nicoll a0289d770e Merge pull request #27920 from cdalexndr
* pr/27920:
  Clarify Selenium auto-configuration requires HtmlUnit

Closes gh-27920
2021-09-12 09:01:41 +02:00
cdalexndr 60bc94e1d4 Clarify Selenium auto-configuration requires HtmlUnit
The auto-configuration requires `HtmlUnit`, so this auto-cofiguration
only works if both Selenium and HtmlUnit are used.

Prevents misinterpretation that WebDriver can be auto configured without
htmlunit.

See gh-27920
2021-09-12 09:00:18 +02:00