Commit Graph

83 Commits

Author SHA1 Message Date
Andy Wilkinson
181e3b34ba Isolate Maven Plugin's integration tests from repo.spring.io
Previously, the Maven plugin integration tests used a settings.xml file
that defined https://repo.spring.io/snapshot as a repository. This
allowed them to resolve snapshots of the plugin's Spring Framework
dependencies but it had the unfortunate side-effect of also allowing
them to resolve snapshots of other Spring Boot modules from Artifactory
rather than using those currently being built.

This commit replaces the repositories in settings.xml with a Gradle
task that resolves the necessary dependencies and populates a local
repository with the dependencies' jars and pom files. This is achieved
using a ComponentMetadataRule that creates a custom variant of each
dependency that includes its pom file, inspired by the example in
gradle/gradle/#11449. A configuration that extends the
runtimeClasspath configuration and select the custom variant via its
attribute is then used to resolve the jars and pom files of the runtime
classpath such that they can then be used to populate the local
repository.

Closes gh-22828
2020-08-07 17:18:47 +01:00
Andy Wilkinson
d064ccabc4 Ensure Maven plugin descriptor inputs are out-of-date on version change
Closes gh-22766
2020-08-06 18:18:04 +01:00
Andy Wilkinson
98115239b3 Only create effective bom artifact when needed
Closes gh-22143
2020-07-24 16:44:46 +01:00
Andy Wilkinson
e080dcf8a4 Configure path sensitivity of tasks' file inputs
Closes gh-22359
2020-07-16 16:09:58 +01:00
Andy Wilkinson
be8cd9e867 Extend DefaultTask rather than AbstractTask in buildSrc
Closes gh-22288
2020-07-09 15:31:03 +01:00
Andy Wilkinson
b24f17b35c Rework spring-boot-docs to be a full-blown java project
Previously, spring-boot-docs used the java-base-plugin and then added
configuration on top. This has proven to be error prone, with the most
recent problem being that the tests were not being compiled and run.

This commit changes approach and applies the java plugin to the project
instead of the java-base plugin. Now, rather than adding the necessary
configuration to the base, the unwanted pieces of the java plugin's
configuration – specifically the jar and javadoc tasks – are disabled
instead. The DeployedPlugin has also been updated so that it does not
create a publication from the java component for projects that have a
disabled jar task.

Closes gh-22284
2020-07-09 11:21:03 +01:00
Andy Wilkinson
12d3f14e15 Use bom plugin to configure spring-boot-parent
Closes gh-21439
2020-06-23 10:43:59 +01:00
Andy Wilkinson
a6954614b2 Minimize contents of poms that are an ancestor of a user's pom
Fixes gh-21989
2020-06-17 09:54:53 +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
24138c104c Use highlightjs for syntax highlighting in Asciidoctor's HTML output
Closes gh-21701
2020-06-04 20:25:29 +01:00
Andy Wilkinson
c0f748e143 Always apply retry plugin but only retry on CI
Previously, the retry plugin was only applied on CI as we do not want
tests to be retried in local builds. Unfortunately, this arrangement
led to test tasks from CI builds having additional doFirst and doLast
actions and an additional property. These differences meant that the
output from a test task that has run on CI could not be used by a
local build.

This commit changes our configuration of the test retry plugin so
that it is now always applied. To retain the behaviour of only
retrying tests on CI, max retries is configured to 3 on CI and 0 for
local builds.

Closes gh-21698
2020-06-04 16:10:12 +01:00
Andy Wilkinson
f0bc8ee73c Fix version placeholder replacement in Gradle plugin docs
Closes gh-21640
2020-06-02 08:59:14 +01:00
Phillip Webb
7104d8d81e Polish 2020-06-01 21:20:45 -07:00
Phillip Webb
fc4efe3bf0 Fix Maven plugin help support
Update `MavenPluginPlugin` to fix HelpMojo support.

Closes gh-21556
2020-06-01 21:20:45 -07:00
Andy Wilkinson
d3ef6f2382 Prepare 2.3.x branch 2020-05-28 09:56:01 +01:00
Andy Wilkinson
2ff2d52509 Ignore irrelevant changes to StarterMetadata's dependencies
Closes gh-21594
2020-05-27 20:21:08 +01:00
Andy Wilkinson
b50b00d629 Use sorted properties to ensure output is repeatable
Closes gh-21593
2020-05-27 20:14:36 +01:00
Andy Wilkinson
343e4d4318 Use a separate task to extract legal files to be included in jars
Previously, the files were extracted on the fly and written into the
jars. This didn't work well with Gradle's up-to-date checks as the
inputs of the jar task were not well-defined.

This commit moves the extraction of the notice and license files into
a separate task, the outputs of which are then copied into the jar's
META-INF.

Closes gh-21592
2020-05-27 20:08:54 +01:00
Andy Wilkinson
ee758fa670 Use HTTPS for license links
This commit updates the MavenPublishingConventions to use HTTPS to
link to the Apache license. The configuration of NoHTTP has also
been reworked so that it will correctly find usch uses of http://
URLs.

Closes gh-21459
2020-05-15 16:33:11 +01:00
Brian Clozel
42d07a7acd Fix published Maven POMs
Prior to this commit, the published Maven POMs would not pass the Maven
Central mandatory checks.

This commit adds the missing project name and description metadata for
most artifacts. The Spring Boot Gradle plugin artifact was also missing
this information and this is now added in the plugin metadata itself.
This is also updating the project page URL which is now hosted directly
on spring.io.

Fixes gh-21457
2020-05-14 23:59:11 +02:00
Phillip Webb
9a1a2ca613 Merge branch '2.2.x'
Closes gh-21448
2020-05-13 23:28:29 -07:00
Andy Wilkinson
a03426af57 Configure the Asciidoctor revnumber in a central location
See gh-20934
2020-05-13 08:16:59 +01:00
Andy Wilkinson
0bb687717c Auto-configure a lifecycle processor with configurable timeout
Closes gh-21347
2020-05-12 19:59:52 +01:00
Phillip Webb
d52bf83ab2 Polish 2020-04-30 16:40:05 -07:00
Scott Frederick
aa63070fb9 Apply test conventions unconditionally
See gh-21272
2020-04-30 16:32:48 -05:00
Andy Wilkinson
080123ebeb Only enable flaky test support on CI
Closes gh-21272
2020-04-30 20:30:18 +01:00
Brian Clozel
4c9c9ccd91 Upgrade to Spring Doc Resources 0.2.2.RELEASE
Closes gh-21057
2020-04-28 11:41:44 +02:00
dreis2211
5eb5bf0a2d Polish
See gh-21009
2020-04-25 08:54:47 +02:00
Johnny Lim
29717423a3 Remove this keyword on member method invocations
See gh-21007
2020-04-25 08:49:44 +02:00
Andy Wilkinson
564aec93fc Use consistent logic to determine Artifactory repo from version
Fixes gh-21034
2020-04-20 15:08:03 +01:00
dreis2211
1809acc482 Fix links to CLI binaries in non-snapshot builds
See gh-21030
2020-04-20 13:49:09 +01:00
Brian Clozel
7a4fa7ee3e Upgrade to Spring Doc Resources 0.2.1.RELEASE
Closes gh-20958
2020-04-14 14:47:42 +02:00
Andy Wilkinson
ba1d4ab458 Polish "Split ConventionsPlugin into separate, more focussed classes"
See gh-20805
2020-04-09 13:05:05 +01:00
Mike Smithson
65f325cfd8 Split ConventionsPlugin into separate, more focussed classes
See gh-20805
2020-04-09 13:04:34 +01:00
Phillip Webb
5d8d0bb159 Update copyright year of changed files 2020-04-01 11:51:29 -07:00
Andy Wilkinson
9bdf4a75e8 Configure Gradle's Test Retry plugin
Closes gh-20144
2020-03-31 15:59:21 +01:00
Andy Wilkinson
6eb08ad9bb Merge branch '2.2.x'
Closes gh-20744
2020-03-31 13:04:16 +01:00
Andy Wilkinson
c282f01d72 Enhance bomr to handle libraries that use a version property
Closes gh-20478
2020-03-27 10:29:30 +00:00
Brian Clozel
9e67868694 Upgrade to spring-doc-resources 0.2.0.RELEASE 2020-03-21 11:35:05 +01:00
dreis2211
589213daab Improve unused exclusion detection and remove those that are unused
See gh-20472
2020-03-10 20:36:00 +00:00
Andy Wilkinson
f083aefba6 Consider plugins and imported boms when finding possible dependency upgrades
Closes gh-20483
2020-03-10 20:07:22 +00:00
Andy Wilkinson
47a68650c9 Enable generation of Gradle's module metadata
Changes in Gradle 6.2 should address the problems described in
4f75ab5f.

Closes gh-19609
2020-03-10 14:13:10 +00:00
dreis2211
9588188800 Use isEmpty() where possible
See gh-20370
2020-03-03 18:33:26 -05:00
dreis2211
fcaede70a9 Remove unused parameter in AsciidoctorConventions
See gh-20380
2020-03-03 18:31:37 -05:00
Johnny Lim
98738d22f4 Polish tests
See gh-20318
2020-02-28 09:36:19 -05:00
Andy Wilkinson
8f44bd89f4 Polish "Allow Gradle tasks to be executed with a custom Java home"
See gh-20179
2020-02-25 15:53:45 +00:00
dreis2211
e599ed01c9 Allow Gradle tasks to be executed with a custom Java home
See gh-20179
2020-02-25 15:53:45 +00:00
Stephane Nicoll
5c174feb65 Add auto-configuration for R2DBC's ConnectionFactory
This commit adds auto-configuration for R2DBC. If R2DBC is on the
classpath, a `ConnectionFactory` is created similarly to the algorithm
used to create a `DataSource`.

If an url is specified, it is used to determine the R2DBC driver and
database location. If not, an embedded database is started (with only
support of H2 via r2dbc-h2). If none of those succeed, an exception is
thrown that is handled by a dedicated FailureAnalyzer.

To clearly separate reactive from imperative access, a `DataSource` is
not auto-configured if a `ConnectionFactory` is present. This makes sure
that any auto-configuration that relies on the presence of a
`DataSource` backs off.

There is no dedicated database initialization at the moment but it is
possible to configure flyway or liquibase to create a local `DataSource`
for the duration of the migration. Alternatively, if Spring Data R2DBC
is on the classpath, a `ResourceDatabasePopulator` bean can be defined
with the scripts to execute on startup.

See gh-19988

Co-authored-by: Mark Paluch <mpaluch@pivotal.io>
2020-02-25 09:12:28 -05:00
Andy Wilkinson
8128f3090a Polish "Include LICENCE and NOTICE files in shipped jars"
See gh-20058
2020-02-19 10:11:02 +00:00
dreis2211
e34cf8955c Include LICENCE and NOTICE files in shipped jars
See gh-20058
2020-02-19 09:22:59 +00:00