Commit Graph

796 Commits

Author SHA1 Message Date
Andy Wilkinson
23c0e0cccc Merge branch '2.7.x' into 3.0.x
Closes gh-35876
2023-06-13 20:30:18 +01:00
Andy Wilkinson
b2ef9da154 Always run Actuator documentation tests
The tests must run so that the snippets included in the docs are
generated.

Closes gh-35875
2023-06-13 20:29:30 +01:00
Andy Wilkinson
795d8ca194 Merge branch '3.0.x' into 3.1.x
Closes gh-35871
2023-06-13 15:54:59 +01:00
Andy Wilkinson
2ce6a4b2d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35870
2023-06-13 15:54:36 +01:00
Andy Wilkinson
1e0c129452 Enable predictive test selection for local builds
Closes gh-35869
2023-06-13 15:54:20 +01:00
Andy Wilkinson
50a5e31873 Fix comparision of identical snapshots
Closes gh-35860
2023-06-13 11:53:36 +01:00
Andy Wilkinson
409eb055bb Prepare 3.1.x branch 2023-06-08 10:19:32 +01:00
Andy Wilkinson
159c93d0b2 Polish "Expose spring.ssl bundle keys"
See gh-35667
2023-06-06 17:57:40 +01:00
Stephane Nicoll
7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2023-05-22 16:24:56 +02:00
Moritz Halbritter
b70399e998 Merge branch '3.0.x' 2023-05-12 12:03:32 +02:00
Moritz Halbritter
7b4056df7f Merge branch '2.7.x' into 3.0.x 2023-05-12 12:00:11 +02:00
Moritz Halbritter
700e89097c Polish
See https://stackoverflow.com/questions/28671903/the-hashsett-removeall-method-is-surprisingly-slow
2023-05-12 11:57:33 +02:00
Andy Wilkinson
1ec6195994 Merge branch '3.0.x'
Closes gh-35320
2023-05-05 08:21:00 +01:00
Andy Wilkinson
1af5f4e40b Merge branch '2.7.x' into 3.0.x
Closes gh-35319
2023-05-05 08:20:05 +01:00
Andy Wilkinson
3a45d46583 Allow buildSrc to resolve Framework snapshots
Closes gh-35297
2023-05-05 08:16:37 +01:00
Phillip Webb
a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Andy Wilkinson
d24167371e Merge branch '3.0.x'
Closes gh-35226
2023-05-02 09:17:28 +01:00
Andy Wilkinson
8f3f74ffd5 Merge branch '2.7.x' into 3.0.x
Closes gh-35225
2023-05-02 09:03:17 +01:00
Andy Wilkinson
695e58f418 Align buildSrc's Framework version with the main build's version
Closes gh-35224
2023-05-02 08:59:58 +01:00
Andy Wilkinson
95a8c11773 Merge branch '3.0.x' 2023-05-02 08:44:45 +01:00
Andy Wilkinson
c208a4482d Merge branch '2.7.x' into 3.0.x 2023-05-02 08:41:35 +01:00
Andy Wilkinson
d0a354352d Polish buildSrc's build.gradle 2023-05-02 08:41:20 +01:00
Andy Wilkinson
ad4f7577c7 Merge branch '3.0.x' 2023-04-26 20:37:08 +01:00
Andy Wilkinson
32b52102d8 Merge branch '2.7.x' into 3.0.x 2023-04-26 20:36:57 +01:00
Andy Wilkinson
c72b77c08e Polish 2023-04-26 20:36:45 +01:00
Andy Wilkinson
9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson
7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson
6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2023-04-26 11:47:03 +01:00
Phillip Webb
13d00d85e0 Filter out /build folders on Eclipse classpath
Add `EclipseConventions` to filter out build folders contributed by
the Kotlin Gradle Plugin.

Closes gh-35101
2023-04-25 13:02:50 -07:00
Mortitz Halbritter
842e17eced Add Docker Compose support
Add `spring-boot-docker-compose` module with service connection
support.

Closes gh-34747

Co-authored-by: Phillip Webb <pwebb@vmware.com>
Co-authored-by: "Andy Wilkinson <wilkinsona@vmware.com>
2023-04-17 01:00:08 -07:00
Phillip Webb
1849b82334 Don't apply configuration-properties from auto-configuration plugin
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This  allows us to have auto-configuration modules that don't ship
configuration properties.

Closes gh-35028
2023-04-17 00:41:25 -07:00
Phillip Webb
e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Phillip Webb
7fea4c84b4 Update copyright year of changed files 2023-04-12 22:16:07 -07:00
Phillip Webb
7da347ad91 Merge branch '3.0.x' 2023-04-09 15:43:43 -07:00
Phillip Webb
e0b9ec2bc2 Fix Eclipse WTP facet version
Add `WarConventions` to fix the facet version used by Eclipse WTP
2023-04-09 15:42:44 -07:00
Andy Wilkinson
1aaf498bb9 Merge branch '3.0.x'
Closes gh-34797
2023-03-28 13:47:32 +01:00
Andy Wilkinson
c37ff8d687 Merge branch '2.7.x' into 3.0.x
Closes gh-34798
2023-03-28 13:47:12 +01:00
Andy Wilkinson
0ed73a859b Upgrade to Spring Asciidoctor Backends 0.0.5
Closes gh-34432
2023-03-28 13:23:12 +01:00
Andy Wilkinson
a401ff87d0 Improve Bomr's upgrade suggestions for milestones and RCs
Closes gh-34307
2023-03-22 17:53:53 +00:00
Andy Wilkinson
7283493031 Upgrade to Maven Help Plugin 3.4.0
Closes gh-34687
2023-03-21 12:04:36 +00:00
Andy Wilkinson
0bba1903ea Merge branch '3.0.x'
Closes gh-34485
2023-03-06 10:18:58 +00:00
Andy Wilkinson
dd397c124c Merge branch '2.7.x' into 3.0.x
Closes gh-34484
2023-03-06 10:18:43 +00:00
Andy Wilkinson
b4fccf480a Ensure that Maven plugin's intTest runs when Maven binaries change
Previously, the intTest task had a dependsOn relationship with
prepareMavenBinaries task. This ensured that the two tasks ran in the
correct order but did not ensure that the intTest task would run if
the prepared binaries had changed.

This commit updates the configuration of the intTest task to wire up
the output of the prepareMavenBinaries as an input of the intTest
task. This ensures that the intTest task will run when the prepared
binaries have changed and also creates an implicit dependsOn
relationship between the two tasks.

Closes gh-34474
2023-03-06 10:18:24 +00:00
Phillip Webb
157091a811 Merge branch '3.0.x' 2023-02-22 18:36:57 -08:00
Phillip Webb
0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb
a5902d7a00 Update copyright year of changed files 2023-02-22 18:35:17 -08:00
Andy Wilkinson
7d697310a0 Merge branch '3.0.x'
Closes gh-34335
2023-02-22 11:03:10 +00:00
Andy Wilkinson
50da0bce56 Merge branch '2.7.x' into 3.0.x
Closes gh-34334
2023-02-22 11:02:41 +00:00
Andy Wilkinson
510c78154b Remove unused version alignment support from Bomr
Closes gh-34333
2023-02-22 10:51:42 +00:00
Phillip Webb
b07269a018 Merge branch '3.0.x' 2023-02-21 23:20:07 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Phillip Webb
d2e3e5231c Merge branch '3.0.x'
Closes gh-34331
2023-02-21 22:39:03 -08:00
Phillip Webb
d3104257d7 Merge branch '2.7.x' into 3.0.x
Closes gh-34330
2023-02-21 22:37:44 -08:00
Phillip Webb
b93c9f7fec Upgrade to spring-javaformat 0.0.38
Closes gh-34329
2023-02-21 22:29:11 -08:00
Scott Frederick
12537c7170 Merge branch '3.0.x'
Closes gh-34162
2023-02-09 15:47:57 -06:00
Scott Frederick
cbac3c81d6 Merge branch '2.7.x' into 3.0.x
Closes gh-34161
2023-02-09 15:47:34 -06:00
Scott Frederick
33aef7fe27 Update CLI installation docs to download releases from Maven Central
Closes gh-33962
2023-02-09 15:45:15 -06:00
Andy Wilkinson
6aceca710f Merge branch '3.0.x'
Closes gh-34159
2023-02-09 18:05:55 +00:00
Andy Wilkinson
a6f357c2fd Merge branch '2.7.x'
Closes gh-34147
2023-02-09 15:55:20 +00:00
Andy Wilkinson
994a7a0795 Add support to Bomr for moving to snapshots
Closes gh-27002
2023-02-09 15:53:52 +00:00
Andy Wilkinson
64dcbec763 Merge branch '3.0.x'
Closes gh-34124
2023-02-08 14:17:30 +00:00
Andy Wilkinson
1cdc24a11d Merge branch '2.7.x' into 3.0.x
Closes gh-34123
2023-02-08 14:17:06 +00:00
Andy Wilkinson
07fcb67540 Use repo.maven.apache.org consistently
Maven Central has two canonical URLs [1]:

- https://repo1.maven.org
- https://repo.maven.apache.org

This commit updates the codebase to only use repo.maven.apache.org.

Closes gh-33938

[1] https://central.sonatype.org/news/20190715_http_deprecation_update/#canonical-urls
2023-02-08 14:04:16 +00:00
Moritz Halbritter
48db5ff35c Merge branch '3.0.x'
Closes gh-34018
2023-01-31 10:51:45 +01:00
Moritz Halbritter
0a080736d8 Merge branch '2.7.x' into 3.0.x
Closes gh-34017
2023-01-31 10:50:30 +01:00
Johnny Lim
5eeb429e44 Polish
See gh-33966
2023-01-31 10:48:30 +01:00
Phillip Webb
390892f11b Merge branch '3.0.x'
Closes gh-33998
2023-01-26 21:45:57 -08:00
Krzysztof Krason
1b5b1cd250 Use Files.writeString
See gh-33987
2023-01-26 20:47:35 -08:00
Krzysztof Krason
55a50d565c Use Comparator.comparing
See gh-33987
2023-01-26 20:47:34 -08:00
Krzysztof Krason
6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Andy Wilkinson
8e7822d214 Create 3.0.x branch 2023-01-23 12:04:16 +00:00
Phillip Webb
a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb
a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter
522ef881a0 Merge branch '2.7.x'
Closes gh-33852
2023-01-17 10:35:52 +01:00
Moritz Halbritter
af2b5b4571 Increase sleep duration after creating GitHib issue in BOMR
Closes gh-30304
2023-01-17 10:32:36 +01:00
Moritz Halbritter
e3483f10be Merge branch '2.7.x'
Closes gh-33844
2023-01-16 15:29:03 +01:00
Moritz Halbritter
a41ca05a2f Default to empty string if description in plugin.xml is not set
Closes gh-20890
2023-01-16 14:52:29 +01:00
Moritz Halbritter
6567f40650 Merge branch '2.7.x' 2023-01-13 13:54:05 +01:00
Moritz Halbritter
a2f9e30e77 Reduce number of threads used for BOMR library update checks
See gh-33824
2023-01-13 13:53:49 +01:00
Moritz Halbritter
c1ca05d99d Merge branch '2.7.x'
Closes gh-33825
2023-01-13 10:51:19 +01:00
Moritz Halbritter
e0b7720b9e Implement multithreaded BOMR library resolution
- BOMR now first looks for library updates, collects them all and then
  prompts the user to choose which update to apply
- Refactored code into StandardLibraryUpdateResolver
- Implemented MultithreadedLibraryUpdateResolver on top of the standard
  one
- Uses 8 threads by default, this is configurable
- When run with --info, it logs how long each update search took

Closes gh-33824
2023-01-13 10:47:24 +01:00
Moritz Halbritter
600300c071 Merge branch '2.7.x' 2023-01-13 09:28:52 +01:00
Moritz Halbritter
484d662085 Allow multiple startsWith, contains and endsWith clauses in bomr
- Add support for startsWith prohibition
2023-01-12 17:33:26 +01:00
Moritz Halbritter
3d42ab085a Polish MavenMetadataVersionResolver 2023-01-12 17:32:44 +01:00
Moritz Halbritter
b3644c1a99 Polish StandardGitHub 2023-01-12 17:32:24 +01:00
Moritz Halbritter
75f934c92e Merge branch '2.7.x'
Closes gh-33816
2023-01-12 16:13:26 +01:00
Moritz Halbritter
aca087e762 Add more possibilities to prohibit version upgrades
Closes gh-32457
2023-01-12 16:08:06 +01:00
Moritz Halbritter
af04d4ae46 Merge branch '2.7.x'
Closes gh-33793
2023-01-12 13:52:15 +01:00
Moritz Halbritter
d5e541226b Add bomr support for 5 component version numbers
Closes gh-29928
2023-01-12 13:49:27 +01:00
Andy Wilkinson
485025310e Merge branch '2.7.x'
Closes gh-33777
2023-01-12 12:04:04 +00:00
Andy Wilkinson
9d57cbc1d5 Drop scoop manifest creation
Closes gh-33703
2023-01-12 12:00:39 +00:00
Andy Wilkinson
433364601d Merge branch '2.7.x' 2023-01-11 17:04:33 +00:00
Andy Wilkinson
3b2e5e5292 Remove references to https://repo.spring.io/release 2023-01-11 17:03:45 +00:00
Andy Wilkinson
4c62de1710 Merge branch '2.7.x'
Closes gh-33764
2023-01-11 17:03:17 +00:00
Andy Wilkinson
a8da4e1004 Upgrade to Asciidoctor Backends 0.0.4
Closes gh-33761
2023-01-11 17:02:39 +00:00
Phillip Webb
29b7c121fb Merge branch '2.7.x'
Closes gh-33739
2023-01-09 19:01:57 -08:00
Phillip Webb
a369f936c9 Replace references to Pivotal
Closes gh-33737
2023-01-09 18:09:20 -08:00
Phillip Webb
a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Phillip Webb
1621cfd578 Merge branch '2.7.x' 2023-01-09 15:44:44 -08:00
Phillip Webb
80cfcb71ec Update copyright year of changed files 2023-01-09 15:18:10 -08:00
Krzysztof Krason
cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Moritz Halbritter
b641073777 Merge branch '2.7.x'
Closes gh-33725
2023-01-09 10:35:50 +01:00
Christoph Dreis
1b4ef5db0f Update copyrights to 2023
See gh-33682
2023-01-09 10:35:07 +01:00
Phillip Webb
5ec5007bf0 Merge branch '2.7.x'
Closes gh-33706
2023-01-05 17:21:34 -08:00
Phillip Webb
68af379714 Don't use repo.spring.io in released Homebrew or Scoop recipes
Update our Homebrew and Scoop recipes to use `repo1.maven.org` rather
than `repo.spring.io` for releases.

Fixes gh-33702
2023-01-05 13:56:58 -08:00
Phillip Webb
0d9967c70c Polish 2023-01-05 13:17:20 -08:00
Andy Wilkinson
3bcc7ece55 Merge branch '2.7.x'
Closes gh-33676
2023-01-03 16:09:51 +00:00
Andy Wilkinson
84c021bc97 Upgrade to Gradle Enterprise Gradle Plugin 3.12.1
Closes gh-33672
2023-01-03 15:57:48 +00:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb
0254619782 Merge branch '2.7.x' 2022-12-22 00:59:40 -08:00
Phillip Webb
e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Phillip Webb
9562a2c2f1 Merge branch '2.7.x' 2022-12-21 23:01:57 -08:00
Phillip Webb
60a75e3799 Increase timeout for ApplicationRunner task 2022-12-21 23:00:10 -08:00
Moritz Halbritter
f36e2ecb7b Use AutoClosables with try-with-resources
Closes gh-33538
2022-12-16 15:43:15 +01:00
Moritz Halbritter
725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Phillip Webb
67c9c7377a Merge branch '2.7.x'
Closes gh-33414
2022-11-29 11:00:18 -08:00
Jerome Prinet
72a9f494f3 Document that SystemTestPlugin output should never be cached
See gh-33411
2022-11-29 10:53:46 -08:00
Andy Wilkinson
f39b297677 Merge branch '2.7.x'
Closes gh-33227
2022-11-16 18:09:35 +00:00
Andy Wilkinson
04353e4961 Merge branch '2.6.x' into 2.7.x
Closes gh-33226
2022-11-16 16:41:02 +00:00
Andy Wilkinson
1494deb4a0 Check for package tangles at build time
See gh-17299
2022-11-16 16:11:59 +00:00
Andy Wilkinson
f8a2e68a5d Merge branch '2.7.x' 2022-11-08 13:53:44 +00:00
Andy Wilkinson
1e536f5c20 Merge branch '2.6.x' into 2.7.x 2022-11-08 13:53:35 +00:00
Andy Wilkinson
5dab9b0e9f Revert "Temporarily work around problems with Gradle's plugin portal"
This reverts commit fb954e8109.
2022-11-08 13:53:21 +00:00
Andy Wilkinson
b357239861 Upgrade to Jakarta Activation 2.1.0
Closes gh-33045
2022-11-08 11:01:17 +00:00
Andy Wilkinson
7cbd90d87d Merge branch '2.7.x' 2022-11-08 10:18:48 +00:00
Andy Wilkinson
1d838f6faa Merge branch '2.6.x' into 2.7.x 2022-11-08 10:18:27 +00:00
Andy Wilkinson
fb954e8109 Temporarily work around problems with Gradle's plugin portal 2022-11-08 10:18:13 +00:00
Phillip Webb
2b5a29d514 No longer log hostname during application start
Remove hostname logging since `InetAddress.getLocalHost().getHostName()`
causes a network lookup and can take a long time.

Closes gh-32908
2022-10-31 13:46:47 -07:00
Johnny Lim
5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Phillip Webb
4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Andy Wilkinson
99edda735e Polish 2022-10-25 12:57:58 +01:00
Andy Wilkinson
edce1f4e91 Merge branch '2.7.x'
Closes gh-32611
2022-10-06 11:12:12 +01:00
Andy Wilkinson
d909c4efb6 Merge branch '2.6.x' into 2.7.x
Closes gh-32610
2022-10-06 11:11:56 +01:00
Andy Wilkinson
c4a0dad6fe Upgrade to Spring Java Format 0.0.35
Closes gh-32609
2022-10-06 11:10:45 +01:00
Phillip Webb
e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2022-10-04 00:29:22 -07:00
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