Commit Graph

610 Commits

Author SHA1 Message Date
Andy Wilkinson
a036b30822 Merge branch '2.7.x' 2022-09-29 12:52:51 +01:00
Andy Wilkinson
c31d99d3a0 Merge branch '2.6.x' into 2.7.x 2022-09-29 12:52:37 +01:00
Andy Wilkinson
8a93abfaaa Improve diagnostics when run does not produce expected logging 2022-09-29 12:52:02 +01:00
Scott Frederick
08022ba86e Remove support for locating imports using spring.factories
With this commit, loading `@AutoConfiguration`,
`@ImportAutoConfiguration`, and `@ManagementContextConfiguration`
classes is supported with `.imports` files only. Support for loading
these classes with `spring.factories` is removed.

Closes gh-29699
2022-09-21 17:34:51 -05:00
Scott Frederick
f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2022-09-21 14:50:15 -05:00
Andy Wilkinson
2f3b681a82 Merge branch '2.7.x' 2022-09-10 07:49:32 +01:00
Andy Wilkinson
3f779191e6 Merge branch '2.6.x' into 2.7.x 2022-09-10 07:49:12 +01:00
Andy Wilkinson
5cb23aeb85 Only disable test tasks when a project isn't compatible with toolchain
Disabling compilation means that any downstream project will break.
For example, disabling our Gradle plugin's compileJava task means
that the launch script test app fails to build as it uses our
Gradle plugin and its classes are missing.

See gh-gh-32280
2022-09-10 07:47:19 +01:00
Andy Wilkinson
144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2022-09-09 15:14:40 +01:00
Andy Wilkinson
78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2022-09-09 15:13:43 +01:00
Phillip Webb
46be4a3f30 Merge branch '2.7.x' 2022-09-08 19:38:18 -07:00
Phillip Webb
d4ed2bd47a Support import into Eclipse 2022-06
Fix a few issues preventing clean project import into Eclipse 2022-06:

  - `buildSrc` need to limit module imports to prevent clashes
    with those in the gradle API jar.

  - The CLI app needs some classpath changes in order to allow
    compileOnly project dependencies to resolve.

  - `AbstractJpaAutoConfigurationTests` needs some minor refactoring
    in order for generic captures to work with the Eclipse compiler.
2022-09-07 15:56:57 -07:00
Johnny Lim
2273191c03 Polish
See gh-32215
2022-09-07 08:48:08 +02:00
Andy Wilkinson
d1810941e8 Automatically configure annotation processing in Eclipse
Closes gh-32236
2022-09-06 20:14:14 +01:00
Brian Clozel
cca5ee8a89 Merge branch '2.6.x' into 2.7.x
Closes gh-32229
2022-09-05 14:24:06 +02:00
Andy Wilkinson
d9265f0a92 Build against SnakeYAML 1.31 but still use 1.29 in dep mgmt and starter 2022-09-05 13:55:19 +02:00
Scott Frederick
da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2022-09-02 15:10:22 -05:00
Andy Wilkinson
19a7fee1d7 Merge branch '2.7.x'
Closes gh-32202
2022-08-31 17:49:37 +01:00
Andy Wilkinson
d189853412 Merge branch '2.6.x' into 2.7.x
Closes gh-32201
2022-08-31 17:48:12 +01:00
Andy Wilkinson
01aeb550b6 Upgrade to Test Retry Gradle Plugin 1.4.1
Closes gh-32200
2022-08-31 14:58:03 +01:00
Phillip Webb
09bd531fe5 Add Maven plugin support for processing test contexts Ahead-of-time
Refactor and update the Spring Boot Maven Plugin so that it can
be used to perform AOT processing of test classes.

Closes gh-32191
2022-08-30 20:41:30 -07:00
Phillip Webb
fe1ffff3d7 Merge branch '2.7.x'
Closes gh-32158
2022-08-23 16:11:27 -07:00
Phillip Webb
5f2f6d32cf Merge branch '2.6.x' into 2.7.x
Closes gh-32157
2022-08-23 16:11:13 -07:00
Phillip Webb
546d7b41e9 Polish 'Add JVM options to prevent warnings with asciidoctor'
See gh-32123
2022-08-23 16:09:58 -07:00
Andy Wilkinson
41334223ff Merge branch '2.7.x'
Closes gh-32044
2022-08-09 18:07:51 +01:00
Andy Wilkinson
a9a9c9f966 Merge branch '2.6.x' into 2.7.x
Closes gh-32043
2022-08-09 18:07:27 +01:00
Andy Wilkinson
f287acd1ff Fix external links in descriptions of Maven Plugin's goal parameters
Closes gh-29171
2022-08-09 18:06:37 +01:00
Andy Wilkinson
ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Madhura Bhave
0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Andy Wilkinson
36cf3b9f78 Merge branch '2.7.x'
See gh-31988
2022-08-04 21:56:57 +01:00
Andy Wilkinson
eb67470b89 Merge branch '2.6.x' into 2.7.x
See gh-31987
2022-08-04 21:56:35 +01:00
Andy Wilkinson
b905d7f341 Normalize included log output to remove CI-specific details
See gh-28208
2022-08-04 21:55:17 +01:00
Andy Wilkinson
05877dc927 Merge branch '2.7.x'
Closes gh-31988
2022-08-04 14:17:39 +01:00
Andy Wilkinson
a69cf002f0 Merge branch '2.6.x' into 2.7.x
Closes gh-31987
2022-08-04 14:16:16 +01:00
Andy Wilkinson
6efa77f3f5 Generate console output examples at build time
Closes gh-28208
2022-08-04 14:15:25 +01:00
Andy Wilkinson
2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2022-08-03 15:20:34 +01:00
Andy Wilkinson
700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson
fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Brian Clozel
38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Andy Wilkinson
8436654614 Merge branch '2.7.x'
Closes gh-31911
2022-07-28 16:32:16 +01:00
Andy Wilkinson
53703206ae Merge branch '2.6.x' into 2.7.x
Closes gh-31910
2022-07-28 16:31:47 +01:00
Andy Wilkinson
532285b47e Add support for upgrading specific libraries with Bomr
Closes gh-31909
2022-07-28 16:30:52 +01:00
Phillip Webb
7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb
a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb
b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +01:00
Phillip Webb
3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb
757a0c2664 Update copyright year of changed files 2022-07-26 10:34:18 +01:00
Andy Wilkinson
0980362a88 Merge branch '2.7.x'
Closes gh-31843
2022-07-22 12:20:17 +01:00
Andy Wilkinson
64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson
a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Andy Wilkinson
3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2022-07-14 13:55:26 +01:00
Andy Wilkinson
631b1e0d76 Merge branch '2.7.x'
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2022-06-24 12:57:52 +01:00
Andy Wilkinson
0bc514593f Polish "Use pattern matching for instanceof where appropriate"
See gh-31475
2022-06-20 17:55:51 +01:00
dreis2211
5db04da275 Use pattern matching for instanceof where appropriate
See gh-31475
2022-06-20 17:55:36 +01:00
dreis2211
fb45fc4819 Use Files.writeString() and Files.readString() where possible
See gh-31459
2022-06-20 09:05:09 +02:00
Andy Wilkinson
fabe0637cd Raise the minimum supported version of Kotlin to 1.7
Closes gh-31391
2022-06-15 10:53:26 +01:00
Andy Wilkinson
0c0d3f27c4 Merge branch '2.7.x'
Closes gh-31389
2022-06-14 20:10:14 +01:00
Andy Wilkinson
88128ccc97 Merge branch '2.6.x' into 2.7.x
Closes gh-31388
2022-06-14 20:09:30 +01:00
Andy Wilkinson
5a028e059c Align buildSrc's Kotlin version with the main build
Closes gh-31387
2022-06-14 20:09:14 +01:00
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