Andy Wilkinson
228be786ca
Polish
2022-06-10 13:44:21 +01:00
Andy Wilkinson
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
003f747e77
Merge branch '2.7.x'
...
Closes gh-31170
2022-05-26 13:52:41 +01:00
Andy Wilkinson
e617035dba
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31167
2022-05-26 13:45:52 +01:00
Andy Wilkinson
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
Phillip Webb
06f8041e4d
Merge branch '2.7.x'
2022-05-17 21:50:42 -07:00
Phillip Webb
d5d5997be7
Merge branch '2.6.x' into 2.7.x
2022-05-17 21:49:20 -07:00
Phillip Webb
99f5c781a5
Merge branch '2.5.x' into 2.6.x
2022-05-17 21:48:50 -07:00
Phillip Webb
350d27fe50
Polish code to use method references when possible
2022-05-17 21:16:42 -07:00
Andy Wilkinson
395cfd068b
Merge branch '2.7.x'
2022-05-16 11:35:29 +01:00
Andy Wilkinson
9fcb5749ba
Merge branch '2.6.x' into 2.7.x
2022-05-16 11:34:54 +01:00
Andy Wilkinson
195b12e1ea
Merge branch '2.5.x'
2022-05-16 11:34:37 +01:00
Andy Wilkinson
ac65d35f75
Improve diagnostics for 403 response to upgrade issue creation
...
See gh-30304
2022-05-16 11:26:10 +01:00
Andy Wilkinson
48c948973d
Polish
2022-05-12 12:12:22 +01:00
Andy Wilkinson
d0e55643b1
Polish
...
Closes gh-30993
2022-05-12 12:11:51 +01:00
Andy Wilkinson
1fd9c4d82c
Polish
...
Closes gh-30992
2022-05-12 12:10:52 +01:00
izeye
624c41c80e
Polish
...
See gh-30862
2022-05-12 12:07:12 +01:00
Andy Wilkinson
9711160190
Merge branch '2.7.x'
2022-05-12 11:07:44 +01:00
Andy Wilkinson
dacfae2d59
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30991
2022-05-12 11:07:29 +01:00
Andy Wilkinson
075d01db54
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30990
2022-05-12 11:07:13 +01:00
Andy Wilkinson
d5f4323f53
Upgrade to Test Retry Gradle Plugin 1.4.0
...
Closes gh-30989
2022-05-12 11:06:16 +01:00
Andy Wilkinson
61995d762f
Merge branch '2.7.x'
2022-04-29 11:02:30 +01:00
Andy Wilkinson
fb121a1d40
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30836
2022-04-29 11:01:55 +01:00
Andy Wilkinson
de1cda786e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30835
2022-04-29 11:01:37 +01:00
Andy Wilkinson
d338df513a
Avoid stale inputs by using sync rather than copy
...
Closes gh-30829
2022-04-29 11:00:25 +01:00
Phillip Webb
c7374fd415
Update copyright year of changed files
2022-04-20 15:30:20 -07:00
Stephane Nicoll
a4cccc98c6
Merge branch '2.7.x'
2022-04-19 09:37:08 +02:00
izeye
ed412af138
Polish
...
See gh-30695
2022-04-19 09:34:28 +02:00
Andy Wilkinson
dd812a3f76
Upgrade to Groovy 4.0.1
...
Closes gh-30279
2022-03-18 12:38:41 +00:00
Andy Wilkinson
5736f5401b
Merge branch '2.7.x'
2022-03-11 08:23:27 +00:00
Andy Wilkinson
c0a72bf5ea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30167
2022-03-11 08:21:13 +00:00
Andy Wilkinson
4c1d1a6a69
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30166
2022-03-11 08:17:59 +00:00
Andy Wilkinson
cced7edd9c
Document Devtools' property defaults directly in reference docs
...
Closes gh-29406
2022-03-11 08:15:40 +00:00
Andy Wilkinson
b3588cf8c3
Merge branch '2.7.x'
2022-03-09 15:51:33 +00:00
Andy Wilkinson
3c80049ccc
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30138
2022-03-09 15:51:12 +00:00
Andy Wilkinson
a31135ebfc
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30137
2022-03-09 15:50:56 +00:00
Andy Wilkinson
0e627b00b3
Remove --illegal-access=warn from toolchain configuration
...
As of Java 17, it is ignored. Our Toolchain-based builds use at least
Java 17 so specifying it no longer has any effect.
Closes gh-30122
2022-03-09 15:49:18 +00:00
Andy Wilkinson
573934d545
Only treat warnings as errors when compiling with Java 17
2022-03-09 14:24:30 +00:00
Stephane Nicoll
0a81c238c2
Compile Kotlin code with a JVM target of 17
...
Closes gh-29956
2022-03-08 12:43:54 +01:00
Stephane Nicoll
099e811a38
Raise the minimum supported version of Kotlin to 1.6
...
Closes gh-29660
2022-03-08 12:42:31 +01:00
Andy Wilkinson
1547bad452
Merge branch '2.7.x'
2022-03-02 11:07:40 +00:00
Andy Wilkinson
1f8c5942cf
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30030
2022-03-02 11:07:27 +00:00
Andy Wilkinson
4ac884ee2d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30029
2022-03-02 10:28:50 +00:00
Andy Wilkinson
69ce392c34
Add support for classifiers when defining a bom
...
Closes gh-29298
2022-03-02 10:17:45 +00:00
Phillip Webb
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
Andy Wilkinson
132bf686f8
Merge branch '2.7.x'
2022-02-22 20:13:28 +00:00
Andy Wilkinson
2d9177dd9d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29955
2022-02-22 20:11:47 +00:00
Andy Wilkinson
3614c8d1f8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29954
2022-02-22 20:08:31 +00:00
Andy Wilkinson
1e8d29f7aa
Configure Kotlin compilation JVM target by convention
...
Closes gh-29952
2022-02-22 18:11:51 +00:00
Andy Wilkinson
834f07083d
Merge branch '2.7.x'
2022-02-21 14:24:34 +00:00
Andy Wilkinson
43c339824c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29924
2022-02-21 14:24:23 +00:00
Andy Wilkinson
30fcc195b4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29923
2022-02-21 14:24:00 +00:00
Andy Wilkinson
4cb8ae6c8a
Try to avoid hitting secondary rate limit when opening issues
...
GitHub employs a secondary rate limit for actions that can trigger
notifications, such as opening a new issue. To avoid hitting this
limit, they recommend [1] waiting at least one second between each
request.
This commit attempts to comply with this guidance by adding a
one-second sleep prior to each POST request that opens an issue.
Closes gh-29879
[1] https://docs.github.com/en/rest/guides/best-practices-for-integrators#dealing-with-secondary-rate-limits
2022-02-21 14:19:08 +00:00
Andy Wilkinson
1940f7a5d9
Merge branch '2.7.x'
2022-02-21 14:04:54 +00:00
Andy Wilkinson
6493c7c561
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29922
2022-02-21 14:01:58 +00:00
Andy Wilkinson
fcd52c02a7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29921
2022-02-21 14:01:47 +00:00
Andy Wilkinson
55f68989d8
Remove redundant action to make plugins dat file reproducible
...
Closes gh-29917
2022-02-21 14:01:04 +00:00
Moritz Halbritter
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
Moritz Halbritter
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
2022-02-21 10:34:38 +01:00
Andy Wilkinson
8209980ca0
Merge branch '2.7.x'
2022-02-18 19:02:54 +00:00
Andy Wilkinson
027093d852
Use a templated source file for SpringBootVersion
...
Closes gh-29670
2022-02-18 18:08:09 +00:00
Moritz Halbritter
829ff4d03f
Merge branch '2.7.x'
2022-02-18 14:49:24 +01:00
Moritz Halbritter
2afa02c856
Fix missing test slice configuration
...
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.
See gh-29873
2022-02-18 14:49:07 +01:00
Moritz Halbritter
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
Moritz Halbritter
7d68b58c8f
Load auto-configurations from META-INF/spring-boot
...
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.
Adapts the AutoConfigurationImportSelector to use the new loader.
Adapts the ImportAutoConfigurationImportSelector to use the new loader.
Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.
Updates the documentation for auto-configurations and test slices.
Closes gh-29872
2022-02-17 09:17:23 +01:00
Phillip Webb
f4b849ec95
Merge branch '2.7.x'
2022-02-16 20:27:18 -08:00
Phillip Webb
26512f8ac6
Merge branch '2.6.x' into 2.7.x
2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645
Merge branch '2.5.x' into 2.6.x
2022-02-16 18:56:12 -08:00
Phillip Webb
c86b1330cf
Update copyright year of changed files
2022-02-16 17:56:19 -08:00
Scott Frederick
79e5d3a2d0
Merge branch '2.7.x' into main
2022-02-11 14:45:00 -06:00
Scott Frederick
f80490bafb
Precompute Spring Boot version at build time
...
Closes gh-29670
2022-02-11 14:44:28 -06:00
Andy Wilkinson
3b5e7ee0a8
Merge branch '2.7.x'
2022-02-09 12:19:21 +00:00
Andy Wilkinson
7e8d499333
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29690
2022-02-09 12:18:57 +00:00
Andy Wilkinson
093e8a524d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29689
2022-02-09 12:18:35 +00:00
Moritz Halbritter
52d9ba58d8
Move appendix subsections under appendix section
...
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.
See gh-29667
2022-02-09 12:04:05 +00:00
Andy Wilkinson
977a0a8356
Merge branch '2.7.x'
2022-02-05 10:07:41 +00:00
Andy Wilkinson
2fec7b8562
Only use Kotlin 1.6 API and language versions in docs project
...
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.
Closes gh-29654
2022-02-05 09:54:00 +00:00
Phillip Webb
a6b7ae2110
Merge branch '2.7.x'
2022-02-04 19:45:01 -08:00
Phillip Webb
71695d2162
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29658
2022-02-04 19:44:31 -08:00
Phillip Webb
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
2022-02-04 19:43:47 -08:00
Phillip Webb
50047e6d8c
Merge branch '2.7.x'
2022-02-04 16:10:50 -08:00
Phillip Webb
6c74e24147
Update copyright year of changed files
2022-02-04 16:09:35 -08:00
Phillip Webb
8ed5d15cd3
Merge branch '2.7.x'
2022-02-04 16:08:29 -08:00
Phillip Webb
d33d92dfce
Polish KotlinConventions
2022-02-04 16:08:08 -08:00
Phillip Webb
f8c2bff825
Use Kotlin 1.6 for API and language version
...
Closes gh-29654
2022-02-04 16:07:37 -08:00
Phillip Webb
a726210afc
Merge branch '2.7.x'
2022-02-02 19:05:39 -08:00
Phillip Webb
546cad06db
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29635
2022-02-02 19:01:29 -08:00
Phillip Webb
c01cee18b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29634
2022-02-02 19:01:09 -08:00
Phillip Webb
79fc77fade
Upgrade to spring-javaformat 0.0.31
...
Closes gh-29633
2022-02-02 19:00:28 -08:00
Andy Wilkinson
f2ac7d10ef
Merge branch '2.7.x'
2022-01-25 12:19:51 +00:00
Andy Wilkinson
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
Andy Wilkinson
b8983cef59
Merge branch '2.7.x'
2022-01-24 15:11:51 +00:00
Andy Wilkinson
cd426fd21e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29547
2022-01-24 15:10:28 +00:00
Andy Wilkinson
75c3bff765
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29546
2022-01-24 15:10:08 +00:00
Andy Wilkinson
761bed6c48
Upgrade buildSrc to Spring Framework 5.3.15
...
Closes gh-29545
2022-01-24 14:19:47 +00:00
Phillip Webb
fb83e6930d
Merge branch '2.7.x'
2022-01-19 13:35:20 -08:00
Phillip Webb
b31e9d6b4a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29492
2022-01-19 13:35:07 -08:00
Phillip Webb
1f61c36f7a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29491
2022-01-19 13:33:36 -08:00
Andy Wilkinson
66428527e0
Minimize tasks run in ConventionsPluginTests
...
Update `ConventionsPluginTests` so that dependency resolution is
not required. This provides a work-around for our currently failing
Windows build.
Closes gh-29490
2022-01-19 13:31:40 -08:00
Andy Wilkinson
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
Stephane Nicoll
119b920969
Merge branch '2.7.x'
2022-01-02 11:30:28 +01:00
Stephane Nicoll
f3d99f9ccc
Merge branch '2.6.x' into 2.7.x
2022-01-02 11:30:22 +01:00
Stephane Nicoll
01c19ef444
Merge branch '2.5.x' into 2.6.x
2022-01-02 11:30:11 +01:00
Stephane Nicoll
a0537888f5
Upgrade build to Log4j 2.17.1
2022-01-02 11:29:56 +01:00
Stephane Nicoll
3ef03cddb9
Merge branch '2.7.x'
2022-01-02 11:26:04 +01:00
Stephane Nicoll
9c868751d6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29199
2022-01-02 11:25:56 +01:00
Stephane Nicoll
f54ea67ed6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29198
2022-01-02 11:25:46 +01:00
dreis2211
7a87d18b12
Update copyrights to 2022
...
See gh-29195
2022-01-02 11:24:58 +01:00
Brian Clozel
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c
, reversing
changes made to 938d58f32c
.
2021-12-21 09:05:06 +01:00
Brian Clozel
f0677a119c
Merge branch '2.7.x'
2021-12-21 09:04:10 +01:00
Brian Clozel
de808834f5
Auto-configure Spring GraphQL base infrastructure
...
This commit adds the auto-configuration for setting up the base Spring
GraphQL infrastructure. Because GraphQL doesn't depend on any particular
transport, we must have a separate configuration for creating:
* the `GraphQlSource`, which holds the schema and the `GraphQL` instance
* the `GraphQlService` for executing incoming requests
* the `BatchLoaderRegistry` for batch loading support
* the `AnnotatedControllerConfigurer` for supporting the annotated
controllers programming model
This comes with a starting point for the `"spring.graphql.*"`
configuration properties; we can now configure the locations and file
extensions of GraphQL schema files we should load and configure at
startup.
See gh-29140
2021-12-21 08:32:37 +01:00
Madhura Bhave
34f96514ad
Fix link to source code in snapshot documentation
...
Fixes gh-28856
2021-12-20 10:49:07 -08:00
Stephane Nicoll
e994ee3be5
Merge branch '2.7.x'
...
See gh-28986
2021-12-18 17:54:06 +01:00
Stephane Nicoll
821f7086d9
Merge branch '2.6.x' into 2.7.x
...
See gh-28985
2021-12-18 17:53:59 +01:00
Stephane Nicoll
e048562c34
Merge branch '2.5.x' into 2.6.x
...
See gh-28984
2021-12-18 17:53:39 +01:00
Stephane Nicoll
21e54a595e
Upgrade Build to Log4j 2.17.0
...
See gh-28983
2021-12-18 17:53:30 +01:00
Phillip Webb
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
Phillip Webb
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
Scott Frederick
07243539bd
Remove unused import
...
See gh-29029
2021-12-15 14:30:12 -06:00
Scott Frederick
caf49783d4
Merge branch '2.7.x'
2021-12-15 14:06:55 -06:00
Scott Frederick
a773af0387
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29073
2021-12-15 14:05:31 -06:00
Scott Frederick
9e6709eda0
Enable caching for system tests in CI
...
Setting the `systemTest` Gradle task output as never up-to-date ensures
that all system tests are executed each time they are run in CI. The
`--rerun-tasks` Gradle option that was used previously had the same
effect but also disabled build caching.
Closes gh-29029
2021-12-15 14:04:17 -06:00
Stephane Nicoll
1c72330bd9
Upgrade to Log4j2 2.16.0
...
Closes gh-28986
2021-12-15 09:31:43 +01:00
Stephane Nicoll
894eb83e66
Upgrade to Log4j2 2.16.0
...
Closes gh-28985
2021-12-15 09:31:04 +01:00
Stephane Nicoll
15ade0b5d3
Upgrade to Log4j2 2.16.0
...
Closes gh-28984
2021-12-15 09:30:10 +01:00
Stephane Nicoll
4c57d1717d
Upgrade to Log4j2 2.16.0
...
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll
9f07bb50b2
Merge branch '2.7.x'
2021-12-14 09:50:51 +01:00
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
91faec3917
Merge branch '2.7.x'
2021-12-01 12:17:34 +00: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
95025d442f
Merge branch '2.7.x'
2021-12-01 11:21:54 +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
87a5b72aa5
Merge branch '2.7.x'
2021-11-30 19:27:53 +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
Scott Frederick
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson
8bf2ffd93c
Drop support for Jersey until jersey-spring6 is available
...
Closes gh-28808
2021-11-30 15:39:39 +00:00
Andy Wilkinson
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson
814c86c5e8
Raise the minimum supported version of Gradle to 7.3
...
Closes gh-28100
2021-11-30 15:36:54 +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
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
Andy Wilkinson
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
2021-08-18 13:48:29 +01:00
izeye
07da144826
Use 2012 for copyright beginning year
...
See gh-27734
2021-08-18 13:46:35 +01:00
Andy Wilkinson
44884cc495
Merge branch '2.5.x'
...
Closes gh-27752
2021-08-18 13:00:32 +01:00
Andy Wilkinson
10ceb504ae
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27751
2021-08-18 13:00:19 +01:00
Andy Wilkinson
32c184e31c
Revert changes made to work around JDK-8156584
...
Closes gh-26848
2021-08-18 13:00:11 +01:00
Andy Wilkinson
af13125796
Merge branch '2.5.x'
...
Closes gh-27498
2021-07-26 15:37:03 +01:00
Andy Wilkinson
9127588082
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27497
2021-07-26 15:36:52 +01:00
Andy Wilkinson
ea6cb74ccf
Ignore Spring Boot when finding dependency upgrades
...
Closes gh-27447
2021-07-26 15:36:08 +01:00
Andy Wilkinson
a5ec7560f5
Merge branch '2.5.x'
...
Closes gh-27314
2021-07-13 17:42:54 +01:00
dreis2211
e4978f604c
Fix JDK 16 pipeline
...
See gh-27310
2021-07-13 17:42:20 +01:00
Andy Wilkinson
9ccd6a6f2f
Merge branch '2.5.x'
...
Closes gh-27307
2021-07-13 15:56:32 +01:00
Andy Wilkinson
705feeed6a
Polish "Allow additional JVM args when running tests via toolchain"
...
See gh-27089
2021-07-13 15:28:04 +01:00
dreis2211
01b0156fed
Allow additional JVM args when running tests via toolchain
...
See gh-27089
2021-07-13 15:24:45 +01:00
Scott Frederick
18c7c0af22
Add Paketo image building system tests
...
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.
The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.
Closes gh-25824
2021-07-08 17:02:43 -05:00
Andy Wilkinson
fcf7240f3c
Merge branch '2.5.x'
...
See gh-27047
2021-06-24 10:03:44 +01:00
Andy Wilkinson
f7140d0401
Merge branch '2.4.x' into 2.5.x
...
See gh-27045
2021-06-24 10:03:17 +01:00
Andy Wilkinson
316d2cce89
Don't offer upgrade for version that is already aligned
...
See gh-27044
2021-06-24 10:02:14 +01:00
Phillip Webb
6102f10639
Merge branch '2.5.x'
2021-06-23 21:02:36 -07:00
Phillip Webb
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e
Update copyright year of changed files
2021-06-23 21:01:45 -07:00
Andy Wilkinson
aa3d72cb05
Merge branch '2.5.x'
...
See gh-27047
2021-06-23 19:52:04 +01:00
Andy Wilkinson
5139c79c4f
Merge branch '2.4.x' into 2.5.x
...
See gh-27045
2021-06-23 19:51:40 +01:00
Andy Wilkinson
4d694ddaa8
Fix bom plugin management versions
...
See gh-27044
2021-06-23 19:50:06 +01:00
Andy Wilkinson
5d6a612b4b
Merge branch '2.5.x'
...
Closes gh-27047
2021-06-23 17:39:06 +01:00
Andy Wilkinson
ec2a7b9a5b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27045
2021-06-23 17:10:50 +01:00
Andy Wilkinson
363de4cfa5
Add dependency lock and constraint version alignment to Bomr
...
Closes gh-27044
2021-06-23 17:09:24 +01:00
Andy Wilkinson
06778abb61
Merge branch '2.5.x'
...
See gh-26934
2021-06-16 20:37:21 +01:00
Andy Wilkinson
577c58b798
Merge branch '2.4.x' into 2.5.x
...
See gh-26933
2021-06-16 20:35:56 +01:00
Andy Wilkinson
ac8c6a6fb7
Tune config of source and target compatilility with toolchain
...
See gh-26932
2021-06-16 20:33:17 +01:00
Andy Wilkinson
2106114f64
Merge branch '2.5.x'
...
Closes gh-26934
2021-06-16 19:57:00 +01:00
Andy Wilkinson
560d272db3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26933
2021-06-16 19:56:41 +01:00
Andy Wilkinson
6e43dd879b
Allow Eclipse to properly detect source and target compatibility
...
Previously, our conventions configured the source and target
compatibility on the project's JavaCompile tasks. This causes the
settings to be missed when importing the projects into Eclipse [1].
This commit updates the conventions to set the source and target
compatibility on the project-wide JavaPluginExtension. This allows
the Eclipse import to correctly detect and honour the settings.
Closes gh-26932
[1] https://github.com/eclipse/buildship/issues/978
2021-06-16 19:56:20 +01:00
Andy Wilkinson
0f52bbc560
Stop using ConfigureUtil in BomExtension
...
While we're building with Gradle 6.9 at the moment and ConfigureUtil
has only been deprecated in Gradle 7.1, it doesn't do any harm to
stop using it now.
Closes gh-26928
2021-06-16 12:24:38 +01:00
Phillip Webb
28abcf88a0
Upgrade to spring-asciidoctor-backends 0.0.2
...
Closes gh-26846
2021-06-10 00:18:34 -07:00
Andy Wilkinson
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
2021-06-09 18:00:45 +01:00
Phillip Webb
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00
Phillip Webb
6424e3de12
Merge branch '2.4.x'
...
Closes gh-26671
2021-05-25 17:40:23 -07:00
Phillip Webb
14f578ed80
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26670
2021-05-25 17:40:05 -07:00