Commit Graph

354 Commits

Author SHA1 Message Date
Stephane Nicoll
0c1a8c2c5e Merge branch '2.6.x' into 2.7.x
Closes gh-29009
2021-12-14 09:50:41 +01:00
Stephane Nicoll
91593eeea3 Merge branch '2.5.x' into 2.6.x
Closes gh-29008
2021-12-14 09:50:30 +01:00
Arun Suresh
43f3d0dea0 Upgrade Build to Log4j 2.15.0
See gh-29006
2021-12-14 09:42:46 +01:00
Andy Wilkinson
51e0fc4b6b Merge branch '2.6.x' into 2.7.x
See gh-28879
2021-12-01 12:17:10 +00:00
Andy Wilkinson
f0f0aa5c46 Merge branch '2.5.x' into 2.6.x
See gh-28878
2021-12-01 12:16:37 +00:00
Andy Wilkinson
8322dda8cc Fix variant selection in spring-boot-maven-plugin
See gh-28877
2021-12-01 12:16:14 +00:00
Andy Wilkinson
bad05a7860 Merge branch '2.6.x' into 2.7.x
Closes gh-28879
2021-12-01 11:21:24 +00:00
Andy Wilkinson
c7c7592899 Merge branch '2.5.x' into 2.6.x
Closes gh-28878
2021-12-01 11:21:04 +00:00
Andy Wilkinson
25bdc097a0 Make poms of all dependencies available in int test repo
Closes gh-28877
2021-12-01 11:20:21 +00:00
Andy Wilkinson
f3957b7639 Merge branch '2.6.x' into 2.7.x
Closes gh-28865
2021-11-30 19:27:11 +00:00
Andy Wilkinson
9d4375bc12 Merge branch '2.5.x' into 2.6.x
Closes gh-28864
2021-11-30 19:26:22 +00:00
Andy Wilkinson
572bd6ca5c Upgrade to test-retry-gradle-plugin 1.3.1
Closes gh-28863
2021-11-30 19:26:09 +00:00
Andy Wilkinson
75c117a33f Prepare 2.7.x branch 2021-11-30 15:02:11 +00:00
Andy Wilkinson
354a18c9a6 Prepare 2.6.x branch 2021-11-30 10:36:19 +00:00
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