Commit Graph

164 Commits

Author SHA1 Message Date
Andy Wilkinson
73aa8f1434 Enforce spring-boot-parent's platform dependencies
Closes gh-22047
2020-06-22 09:59:21 +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
d347346a93 Upgrade to Spring Asciidoctor Extensions 0.4.3.RELEASE
Pick up the workaround for the AsciidoctorJ bug that prevents the
configprops macro's attributes from being parsed. The lack of parsing
meant that the envvar format was being lost and properties were being
written in the canonical form instead.

Closes gh-21794
2020-06-11 17:36:25 +01:00
dreis2211
b498d3903f Upgrade to Testcontainers 1.14.2
See gh-21581
2020-05-27 14:49:09 +02:00
Andy Wilkinson
c35ed9100b Only enforce spring-boot-parent's constraints internally
See gh-21350
2020-05-14 12:52:44 +01:00
dreis2211
1c7f2d6ea6 Upgrade to Testcontainers 1.14.1
See gh-21378
2020-05-13 17:43:46 +02:00
Phillip Webb
3325709a78 Upgrade to JNA 5.5.0
Upgrade JNA to 5.5.0 and only use the jna-platform dependency.

Closes gh-21313
2020-05-05 12:50:33 -07:00
dreis2211
5b9d8bfc17 Upgrade to Testcontainers 1.14.0
See gh-20936
2020-04-15 09:20:31 +02:00
dreis2211
361739ea3c Upgrade to Testcontainers 1.13.0
See gh-20416
2020-03-08 11:38:16 +01:00
Andy Wilkinson
68f59a0d40 Move dependency management for JNA into spring-boot-parent
Previously, dependency management for JNA was provided by
spring-boot-dependencies so it affected users' applications. It was
original added for Elasticsearch but is no longer needed for that
purpose. We use JNA in spring-boot-buildpack-platform which is used
by our Gradle and Maven plugins and should not affect an application's
use of JNA.

This commit moves management of JNA from spring-boot-dependencies into
spring-boot-parent. This means that users' applications will now be
free to use whatever version of JNA meets their needs while still
controlling the version used for image building via Gradle or Maven.

Closes gh-20156
2020-02-13 12:26:40 +00:00
Andy Wilkinson
8577a39a96 Upgrade to Spring Asciidoctor Extensions 0.4.1.RELEASE
Closes gh-20158
2020-02-13 11:45:29 +00:00
Stephane Nicoll
d1867c1b8b Merge branch '2.2.x'
Closes gh-19930
2020-01-26 08:44:01 +01:00
dreis2211
56ab129077 Upgrade to Testcontainers 1.12.5
See gh-19902
2020-01-26 08:42:28 +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
Andy Wilkinson
724597d45f Use a centrally managed version for commons-compress 2020-01-17 10:34:55 +00:00
Andy Wilkinson
ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Andy Wilkinson
6009baa71b Remove plugin management for Maven's site plugin
Closes gh-19085
2019-12-20 14:50:50 +00:00
Andy Wilkinson
4dc74793e1 Merge branch '2.2.x'
Closes gh-19297
2019-12-05 11:38:40 +00:00
dreis2211
f190affa6b Upgrade to Testcontainers 1.12.4
See gh-19292
2019-12-05 11:37:46 +00:00
Andy Wilkinson
3e2454f8c4 Replace the Maven Plugin's site with Asciidoctor documentation
Closes gh-19080

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-11-21 10:50:05 +00:00
Andy Wilkinson
b5069a4f8a Upgrade to Spring Asciidoctor Extensions 0.3.0.RELEASE
Closes gh-18474
2019-10-02 11:07:28 +01:00
Andy Wilkinson
46c30d6bb0 Merge branch '2.1.x'
Closes gh-18476
2019-10-02 10:48:57 +01:00
Andy Wilkinson
3d4157ad6d Correct SCM URLs in published poms
Previously, Maven's default behaviour was relied up which resulted
in the artifact ID being appended to each URL as it was inherited.
This behaviour can only be disabled in Maven 3.6 and later, a version
that we cannot use due to an incompatibility with the Flatten Plugin.

This commit works around Maven's default behaviour by defining
properties for the SCM URL, connection, and developer connection and
then explicitly defining the settings in each pom using these
properties. The explicit definition of the properties in each pom
prevents them being inherited from the parent, thereby disabling the
unwanted appending of the artifact ID to the URL.

Fixes gh-18328
2019-10-02 10:48:30 +01:00
Stephane Nicoll
91afd289bf Upgrade to Download Maven Plugin 1.4.2
Closes gh-18459
2019-10-01 15:00:11 +02:00
Stephane Nicoll
fc7c0ba32e Upgrade to Commons FileUpload 1.4
Closes gh-18450
2019-10-01 14:27:43 +02:00
Stephane Nicoll
b2334dd871 Upgrade to gmavenplus-plugin 1.8.0
Closes gh-18462
2019-10-01 14:24:16 +02:00
Stephane Nicoll
94de7ee97e Upgrade to Cargo Maven Plugin 1.7.7
Closes gh-18461
2019-10-01 14:18:33 +02:00
Stephane Nicoll
9f2201c5e5 Upgrade to Maven Maven Plugin 3.6.0
Closes gh-18460
2019-10-01 14:09:58 +02:00
Stephane Nicoll
9133d52416 Upgrade to plexus-archiver to 3.7.0
Closes gh-18457
2019-10-01 14:02:51 +02:00
Stephane Nicoll
67bb90ee5a Upgrade to maven-plugin-annotations 3.6.0
Closes gh-18456
2019-10-01 14:02:51 +02:00
Stephane Nicoll
4008d70248 Upgrade to maven-common-artifact-filters 3.1.0
Closes gh-18455
2019-10-01 14:02:51 +02:00
Stephane Nicoll
a1e83558c2 Upgrade to maven-archiver 3.4.0
Closes gh-18453
2019-10-01 14:02:51 +02:00
Stephane Nicoll
b66288219a Upgrade to Spock 1.3-groovy-2.5
Closes gh-18458
2019-10-01 14:02:43 +02:00
Stephane Nicoll
9330760e22 Upgrade to MockK 1.9.3
Closes gh-18452
2019-10-01 13:58:49 +02:00
Stephane Nicoll
112cbd216b Remove plugin dependency management for the Sonar plugin 2019-10-01 13:58:49 +02:00
Stephane Nicoll
6cf1b158f8 Remove duplicate maven-resources-plugin dependency management 2019-10-01 13:58:49 +02:00
Andy Wilkinson
a6f1619971 Use Asciidoctor extension to verify documented configuration properties
Closes gh-18451
2019-10-01 10:39:06 +01:00
dreis2211
3ae3439054 Upgrade to Testcontainers 1.12.2
See gh-18446
2019-10-01 08:23:22 +02:00
Brian Clozel
b15e26662a Upgrade to Spring Doc Resources 0.1.3
Closes gh-18293
2019-09-26 15:04:57 +02:00
Andy Wilkinson
f027139743 Upgrade to Commons Compress 1.19
Closes gh-18311
2019-09-23 14:18:01 +01:00
Phillip Webb
838e7eb605 Extract spring-doc-resources URL property
Update the build to use a shared spring-doc-resources URL
rather than repeating it multiple times.

See gh-18293
2019-09-20 21:38:56 -07:00
Brian Clozel
3b0c4b1837 Upgrade Spring Doc Resources and switch to light theme
See gh-18293
2019-09-20 20:52:13 +02:00
Andy Wilkinson
d5fc324537 Upgrade to Asciidoctor Maven Plugin 1.6.0
Closes gh-17234
2019-09-20 11:59:16 +01:00
dreis2211
594e2084c7 Upgrade to Testcontainers 1.12.0
See gh-18095
2019-09-03 09:51:47 +02:00
Stephane Nicoll
ccf9b1b934 Merge branch '2.1.x'
Closes gh-17854
2019-08-13 17:23:07 +02:00
Stephane Nicoll
7aea432e3e Promote dependency management plugin version to the bom
Closes gh-17842
2019-08-13 17:21:32 +02:00
Phillip Webb
8edf88a08b Polish M2Eclipse ignore configuration
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
2019-06-27 09:42:14 -07:00
Phillip Webb
1e0cf960f0 Reinstate single page HTML and PDF docs
Closes gh-16854
2019-06-17 20:44:01 -07:00
Andy Wilkinson
e124269e15 Merge branch '2.1.x'
Closes gh-17151
2019-06-14 12:02:40 +01:00