Commit Graph

116 Commits

Author SHA1 Message Date
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
7cbd90d87d Merge branch '2.7.x' 2022-11-08 10:18:48 +00:00
Andy Wilkinson
fb954e8109 Temporarily work around problems with Gradle's plugin portal 2022-11-08 10:18:13 +00: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
Andy Wilkinson
d1810941e8 Automatically configure annotation processing in Eclipse
Closes gh-32236
2022-09-06 20:14:14 +01:00
Andy Wilkinson
19a7fee1d7 Merge branch '2.7.x'
Closes gh-32202
2022-08-31 17:49:37 +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
Andy Wilkinson
0c0d3f27c4 Merge branch '2.7.x'
Closes gh-31389
2022-06-14 20:10:14 +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
003f747e77 Merge branch '2.7.x'
Closes gh-31170
2022-05-26 13:52:41 +01:00
Andy Wilkinson
3e7bd582a3 Upgrade to Spring Java Format 0.0.33
Closes gh-31166
2022-05-26 13:22:23 +01:00
Andy Wilkinson
9711160190 Merge branch '2.7.x' 2022-05-12 11:07:44 +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
b8983cef59 Merge branch '2.7.x' 2022-01-24 15:11:51 +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
Stephane Nicoll
119b920969 Merge branch '2.7.x' 2022-01-02 11:30:28 +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
e994ee3be5 Merge branch '2.7.x'
See gh-28986
2021-12-18 17:54:06 +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
Stephane Nicoll
1c72330bd9 Upgrade to Log4j2 2.16.0
Closes gh-28986
2021-12-15 09:31:43 +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
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
87a5b72aa5 Merge branch '2.7.x' 2021-11-30 19:27:53 +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
900085628a Raise the minimum supported version of Java to 17
Closes gh-28101
2021-11-30 15:37:40 +00: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
Phillip Webb
34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
2021-05-18 21:19:24 -07:00
Andy Wilkinson
aaceb9565c Upgrade to Kotlin 1.5.0
Closes gh-26553
2021-05-17 13:39:56 +01:00
Phillip Webb
87d8aedd3c Use spring-pdf backend for PDF generation
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
2021-05-10 18:04:05 -07:00
Andy Wilkinson
47709ec0e4 Align buildSrc's Kotlin version with main project's
See gh-26080
2021-04-13 20:49:10 +01:00
Andy Wilkinson
660dc5fcd7 Merge branch '2.4.x'
Closes gh-25900
2021-04-07 12:24:33 +01:00
Andy Wilkinson
8cd08c3926 Merge branch '2.3.x' into 2.4.x
Closes gh-25899
2021-04-07 12:24:07 +01:00
Andy Wilkinson
7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
2021-04-07 11:43:39 +01:00
Phillip Webb
6e5c510e0a Migrate to asciidoctor-spring-backends
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
2021-03-08 22:07:17 -08:00
Andy Wilkinson
f5176f3569 Merge branch '2.3.x' into 2.4.x
Closes gh-25180
2021-02-11 10:09:03 +00:00
Andy Wilkinson
2ba9a8c211 Polish "Remove duplicate declaration of jackson-databind"
See gh-25178
2021-02-11 10:08:34 +00:00
Vitalii Mahas
a2c491ef43 Remove duplicate declaration of jackson-databind
See gh-25178
2021-02-11 10:08:22 +00:00
Andy Wilkinson
3c8a974558 Merge branch '2.3.x' into 2.4.x
Closes gh-25176
2021-02-10 19:42:54 +00:00
Andy Wilkinson
b6d2da0f84 Stop integer default values from becoming decimals
Fixes gh-25172
2021-02-10 19:05:38 +00:00
Andy Wilkinson
d6f10e16f7 Merge branch '2.3.x'
Closes gh-24056
2020-11-05 14:37:49 +00:00
Andy Wilkinson
49ea023a64 Upgrade to test-retry-gradle-plugin 1.1.9
Closes gh-24055
2020-11-05 14:37:22 +00:00
dreis2211
be56cac2bb Note starters' and annotation processors' jar type in their manifest
See gh-22203
2020-09-10 14:37:06 +01:00
Andy Wilkinson
0de466e06e Require dependency on s-b-dependencies to use its constraints
Previously, Spring Boot's modules published Gradle Module Metadata
(GMM) the declared a platform dependency on spring-boot-dependencies.
This provided versions for each module's own dependencies but also had
they unwanted side-effect of pulling in spring-boot-dependencies
constraints which would influence the version of other dependencies
declared in the same configuration. This was undesirable as users
should be able to opt in to this level of dependency management, either
by using the dependency management plugin or by using Gradle's built-in
support via a platform dependency on spring-boot-dependencies.

This commit reworks how Spring Boot's build uses
spring-boot-dependencies and spring-boot-parent to provide its own
dependency management. Configurations that aren't seen by consumers are
configured to extend a dependencyManagement configuration that has an
enforced platform dependency on spring-boot-parent. This enforces
spring-boot-parent's version constraints on Spring Boot's build without
making them visible to consumers. To ensure that the versions that
Spring Boot has been built against are visible to consumers, the
Maven publication that produces pom files and GMM for the published
modules is configured to use the resolved versions from the module's
runtime classpath.

Fixes gh-21911
2020-06-16 08:50:21 +01:00
Andy Wilkinson
9bdf4a75e8 Configure Gradle's Test Retry plugin
Closes gh-20144
2020-03-31 15:59:21 +01:00
dreis2211
23bf948101 Upgrade to Asciidoctor Gradle JVM 3.0.0
See gh-19953
2020-02-13 09:42:17 +00:00
dreis2211
d75de39456 Upgrade to JUnit Jupiter 5.6.0
See gh-19907
2020-01-26 08:39:12 +01:00
Phillip Webb
e0013454b5 Use parentheses when declaring dependencies
Update all dependencies declarations to use the form `scope(reference)`
rather than `scope reference`.

Prior to this commit we declared dependencies without parentheses unless
we were forced to add them due to an `exclude`.
2020-01-22 16:02:38 -08:00
Phillip Webb
0209cd3e4c Polish quote form used in Gradle scripts
Replace Gradle single quote strings with the double quote form
whenever possible. The change helps to being consistency to the
dependencies section where mostly single quotes were used, but
occasionally double quotes were required due to `${}` references.
2020-01-22 15:49:52 -08:00
Phillip Webb
bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
2020-01-21 18:33:33 -08:00
Andy Wilkinson
c5e47c725c Merge branch '2.2.x'
Closes gh-19800
2020-01-17 20:56:24 +00:00
Andy Wilkinson
2ac931cacb Log some information about all test failures when the build completes
Closes gh-19696
2020-01-17 09:22:26 +00:00
Andy Wilkinson
714a187d8f Rework dep mgmt again to avoid consumers picking up strict constraints
This paves the way for publishing Gradle module metadata once the
problem caused by snapshot versions and our two-step publication
process has been addressed.

See gh-19609
2020-01-15 12:33:18 +00:00
Andy Wilkinson
df386be4f1 Use a consistent version of spring-javaformat
See gh-19710
2020-01-14 17:48:00 +00:00
Andy Wilkinson
9baf0e8ffb Start using spring-javaformat 0.0.19 snapshots
See gh-19710
2020-01-14 15:43:59 +00:00
Andy Wilkinson
aefe52e4d0 Revert "Rework dep management to avoid consumers picking up strict constraints"
This reverts commit b34a311d02 as,
having disabled the publishing of Gradle's module metadata (4f75ab5),
the changes are no longer needed.

See gh-19609
2020-01-14 12:15:53 +00:00
Andy Wilkinson
b34a311d02 Rework dep management to avoid consumers picking up strict constraints
Previously, enforcedPlatform dependencies were using to pull in the
constraints defined in spring-boot-dependencies and
spring-boot-parent and applied them strictly so that the constrained
version had to be used. This worked as intended in Spring Boot's own
build but incorrectly enforced those same strict version requirements
on external consumers of Spring Boot's modules.

This commit reworks how Spring Boot defines its internal dependency
management so that platform dependencies are exposed to external
consumers while enforced platform dependencies are using internally.

See gh-19609
2020-01-13 19:59:56 +00:00
Andy Wilkinson
ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00