Commit Graph

340 Commits

Author SHA1 Message Date
Phillip Webb
beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Andy Wilkinson
381c094c41 Merge branch '2.5.x' 2021-11-19 13:39:37 +00:00
Andy Wilkinson
8f0e12dc34 Revert accidentally committed changes
This partially reverts commit c083e0b049.
2021-11-19 13:39:22 +00:00
Andy Wilkinson
c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
00fa0fb769 Merge branch '2.5.x'
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Andy Wilkinson
2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
51dc02e37b Merge branch '2.5.x'
See gh-28485
2021-10-29 17:18:52 +01:00
Andy Wilkinson
28d323ee3a Merge branch '2.4.x' into 2.5.x
See gh-28484
2021-10-29 17:18:30 +01:00
Andy Wilkinson
b9e3660833 Revert running tests in parallel
See gh-19876
2021-10-29 17:18:13 +01:00
Andy Wilkinson
c7a2d61aee Merge branch '2.4.x'
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c Merge branch '2.4.x' into 2.5.x
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b Allow tests to be run in parallel across multiple workers
Closes gh-19876
2021-10-29 12:48:45 +01:00
Phillip Webb
66aa713b85 Merge branch '2.5.x' 2021-10-14 17:41:06 -07:00
Phillip Webb
467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb
8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
2021-10-14 17:38:05 -07:00
Phillip Webb
e95b0b5257 Polish 2021-10-14 17:37:48 -07:00
Andy Wilkinson
37a7144426 Merge branch '2.5.x'
Closes gh-28343
2021-10-14 14:26:57 +01:00
Andy Wilkinson
1a30c660f3 Merge branch '2.4.x' into 2.5.x
Closes gh-28342
2021-10-14 14:22:25 +01:00
Andy Wilkinson
adb9226dec Prohibit org.apache.geronimo.specs dependencies in our starters
Closes gh-28338
2021-10-14 14:19:21 +01:00
Andy Wilkinson
2d837a6eae Merge branch '2.5.x'
Closes gh-28337
2021-10-14 13:48:08 +01:00
Andy Wilkinson
3800f060b5 Merge branch '2.4.x' into 2.5.x
Closes gh-28336
2021-10-14 13:42:54 +01:00
Andy Wilkinson
2fb8c8d27e Check starters for unnecessary exclusions
Closes gh-28332
2021-10-14 13:37:53 +01:00
Andy Wilkinson
191b50241d Merge branch '2.5.x'
Closes gh-28331
2021-10-14 10:13:37 +01:00
Andy Wilkinson
d3037103fe Merge branch '2.4.x' into 2.5.x
Closes gh-28330
2021-10-14 10:13:24 +01:00
Andy Wilkinson
9f13941c2f Prohibit org.jboss.spec.* dependencies
Closes gh-28329
2021-10-14 10:09:30 +01:00
Phillip Webb
2034ad4827 Merge branch '2.5.x' 2021-10-13 18:48:18 -07:00
Phillip Webb
02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb
0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -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
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
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
Andy Wilkinson
ea68672594 Merge branch '2.5.x'
Closes gh-28153
2021-09-30 17:06:09 +01:00
Andy Wilkinson
9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson
3824512357 Tighten up build's task interdependencies
Closes gh-28103
2021-09-30 15:35:39 +01:00
dreis2211
cf0fcafd13 Polish
See gh-27940
2021-09-21 08:08:29 +02:00
Andy Wilkinson
7c034c33e2 Merge branch '2.5.x'
Closes gh-27967
2021-09-13 10:48:19 +01: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
Andy Wilkinson
69d4e273d3 Merge branch '2.5.x'
Closes gh-27787
2021-08-20 13:56:09 +01:00
Andy Wilkinson
3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson
9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
2021-08-20 13:53:34 +01:00
Andy Wilkinson
fd2fbcb3c6 Merge branch '2.5.x'
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson
6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00