Commit Graph

34513 Commits (6fc57fa855a1c5739bf664e4e3cbb44598ed9d12)
 

Author SHA1 Message Date
Andy Wilkinson f530819d68 Merge branch '2.4.x' into 2.5.x
Closes gh-27966
3 years ago
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
3 years ago
Stephane Nicoll 8c819c94d6 Upgrade to Tomcat 9.0.53
Closes gh-27964
3 years ago
Stephane Nicoll 57e2c0dfa4 Merge branch '2.5.x' 3 years ago
Stephane Nicoll 2004c062df Upgrade to Tomcat 9.0.53
Closes gh-27963
3 years ago
Stephane Nicoll 3274c115b0 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll ab81e3c05c Upgrade to Tomcat 9.0.53
Closes gh-27961
3 years ago
Stephane Nicoll 97f3c82743 Upgrade to Netty tcNative 2.0.42.Final
Closes gh-27960
3 years ago
Stephane Nicoll c8ea3af6f7 Upgrade to Netty 4.1.68.Final
Closes gh-27959
3 years ago
Stephane Nicoll 21c53729ab Upgrade to Maven War Plugin 3.3.2
Closes gh-27958
3 years ago
Stephane Nicoll fadf5ba33a Upgrade to Logback 1.2.6
Closes gh-27957
3 years ago
Stephane Nicoll 3276c977e3 Upgrade to jOOQ 3.14.14
Closes gh-27956
3 years ago
Stephane Nicoll 0e3ac71857 Upgrade to Jetty EL 8.5.70
Closes gh-27955
3 years ago
Stephane Nicoll d09beaf968 Upgrade to Gson 2.8.8
Closes gh-27954
3 years ago
Stephane Nicoll 6eedf9cfe4 Upgrade to Groovy 2.5.15
Closes gh-27953
3 years ago
Stephane Nicoll a5b5b2d10f Upgrade to Glassfish EL 3.0.4
Closes gh-27952
3 years ago
Stephane Nicoll a3762b3f08 Upgrade to Ehcache3 3.9.6
Closes gh-27951
3 years ago
Stephane Nicoll 730692f7f4 Merge branch '2.5.x' 3 years ago
Stephane Nicoll 919617ae61 Start building against Spring Integration 5.5.4 snapshots
See gh-27950
3 years ago
Stephane Nicoll 9d96e65d87 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll d481a75beb Start building against Spring Integration 5.5.4 snapshots
See gh-27949
3 years ago
Stephane Nicoll c678a0edc0 Start building against Spring Integration 5.4.11 snapshots
See gh-27948
3 years ago
Stephane Nicoll 43a19c16a8 Merge branch '2.5.x'
Closes gh-27944
3 years ago
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x
Closes gh-27943
3 years ago
Stephane Nicoll a0289d770e Merge pull request #27920 from cdalexndr
* pr/27920:
  Clarify Selenium auto-configuration requires HtmlUnit

Closes gh-27920
3 years ago
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
3 years ago
Stephane Nicoll 599cc1f696 Start building against Spring Data 2021.1.0-M3 snapshots
See gh-27932
3 years ago
Stephane Nicoll 726a2591fb Start building against Micrometer 1.8.0-M3 snapshots
See gh-27931
3 years ago
Stephane Nicoll 0b26ac213f Merge branch '2.5.x'
Closes gh-27939
3 years ago
Stephane Nicoll ad6018a109 Merge branch '2.4.x' into 2.5.x
Closes gh-27938
3 years ago
Stephane Nicoll 29a2321ee8 Fix bug fix icon in changelog configuration
Closes gh-27937
3 years ago
Stephane Nicoll 3bc5f7903b Start building against Spring Security 5.6.0-M3 snapshots
See gh-27935
3 years ago
Stephane Nicoll 157288e1e1 Start building against Spring Kafka 2.8.0-M3 snapshots
See gh-27934
3 years ago
Stephane Nicoll ef32e02df1 Start building against Spring AMQP 2.4.0-M3 snapshots
See gh-27933
3 years ago
Stephane Nicoll 4b4e5f9bf8 Start building against Spring Framework 5.3.10 snapshots
See gh-27930
3 years ago
Stephane Nicoll c58db8d828 Start building against Reactor 2020.0.11 snapshots
See gh-27929
3 years ago
Stephane Nicoll aa0329c24d Merge pull request #27927 from garyrussell
* pr/27927:
  Polish "Auto-Configure Kafka CommonErrorHandler"
  Auto-Configure Kafka CommonErrorHandler

Closes gh-27927
3 years ago
Stephane Nicoll 78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler"
See gh-27927
3 years ago
Gary Russell c3583a4b06 Auto-Configure Kafka CommonErrorHandler
`ErrorHandler/BatchErrorHandler` will be deprecated in a future release
in favor of `CommonErrorHandler`. Currently, the legacy handlers are
adapted to a `CommonErrorHandler` or ignored if a `CommonErrorHandler`
is configured.

See gh-27927
3 years ago
Stephane Nicoll 657b8cea51 Merge pull request #27823 from quaff
* pr/27823:
  Include WebMvcRegistrations beans in WebMvcTest

Closes gh-27823
3 years ago
Yanming Zhou 6e9bdacc10 Include WebMvcRegistrations beans in WebMvcTest
See gh-27823
3 years ago
Stephane Nicoll 0fed29d440 Merge pull request #27925 from dreis2211
* pr/27925:
  Polish javadoc comments

Closes gh-27925
3 years ago
dreis2211 e1afc91ae2 Polish javadoc comments
See gh-27925
3 years ago
Stephane Nicoll 12c197df8e Merge pull request #27926 from dreis2211
* pr/27926:
  Deprecate DataSourceInitializationMode

Closes gh-27926
3 years ago
dreis2211 242d730f51 Deprecate DataSourceInitializationMode
See gh-27926
3 years ago
Andy Wilkinson bb11abef2c Merge branch '2.5.x'
Closes gh-27923
3 years ago
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x
Closes gh-27922
3 years ago
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration
Closes gh-27919
3 years ago
Stephane Nicoll ee074d3af3 Merge branch '2.5.x' 3 years ago
Stephane Nicoll ef8f402942 Merge branch '2.4.x' into 2.5.x 3 years ago