Commit Graph

276 Commits

Author SHA1 Message Date
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x'
Closes gh-28607
2021-11-11 09:55:42 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28606
2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI
Closes gh-28594
2021-11-11 09:54:50 +00:00
Andy Wilkinson 24ef4e6fb9 Merge branch '2.5.x'
Closes gh-28471
2021-10-28 13:07:22 +01:00
Andy Wilkinson 7fbbb4e08a Merge branch '2.4.x' into 2.5.x
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson 72f80f3ae6 Upgrade to Testcontainers 1.16.1
Closes gh-28468
2021-10-28 13:06:41 +01:00
Stephane Nicoll 1edd1e8c20 Merge branch '2.4.x' into 2.5.x
Closes gh-28433
2021-10-22 11:26:54 +02:00
Stephane Nicoll 773b0f93b7 Upgrade to Commons Compress 1.21
Closes gh-28429
2021-10-22 11:26:22 +02:00
Andy Wilkinson fd8f44d1ae Merge branch '2.5.x'
Closes gh-27884
2021-09-07 09:46:58 +01:00
Andy Wilkinson 4c8cafe731 Merge branch '2.4.x' into 2.5.x
Closes gh-27883
2021-09-07 09:46:33 +01:00
Andy Wilkinson 6e6a6c059c Upgrade to Testcontainers 1.16
Closes gh-27882
2021-09-07 09:46:05 +01:00
Scott Frederick 9f001efa29 Adjust fat jar central directory to account for launch script
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.

Fixes gh-22336
2021-07-19 15:02:42 -05:00
Andy Wilkinson c00e885ac4 Work around compile warnings from Data Neo4j's use of API Guardian
See gh-27170
2021-07-14 18:28:24 +01:00
Andy Wilkinson abd809366b Upgrade to Spring Asciidoctor Extensions 0.6.0
Closes gh-26306
2021-05-18 21:44:24 +01:00
dreis2211 5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release
See gh-26586
2021-05-18 09:59:29 +01:00
Andy Wilkinson 5d8a64e186 Validate section IDs in the reference documentation
See gh-26307
2021-04-29 15:40:54 +01:00
Stephane Nicoll d403103aac Merge branch '2.4.x'
Closes gh-26182
2021-04-20 17:58:30 +02:00
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x
Closes gh-26181
2021-04-20 17:58:14 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson dee0df5c53 Merge branch '2.4.x'
Closes gh-25703
2021-03-16 20:25:41 +00:00
Andy Wilkinson 3e69522e2d Merge branch '2.3.x' into 2.4.x
Closes gh-25702
2021-03-16 20:25:25 +00:00
Andy Wilkinson f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1
Closes gh-25558
2021-03-16 20:24:45 +00:00
Andy Wilkinson 99b7d29c2c Merge branch '2.4.x' 2021-03-09 11:12:07 +00:00
Andy Wilkinson 9be36f3a72 Merge branch '2.3.x' into 2.4.x 2021-03-09 11:11:46 +00:00
Andy Wilkinson 3e9341fbb4 Start using Spring Asciidoctor 0.5.1 snapshots
See gh-25558
2021-03-09 10:59:26 +00: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 10109e75b3 Upgrade to Testcontainers 1.15.2
Closes gh-25429
2021-02-25 13:53:29 +00:00
Andy Wilkinson d822604ed2 Upgrade to MockK 1.10.6
Closes gh-25428
2021-02-25 13:53:27 +00:00
Andy Wilkinson f411bcd1a5 Upgrade to Maven Resolver 1.6.1
Closes gh-25427
2021-02-25 13:53:26 +00:00
Andy Wilkinson f876f413c9 Upgrade to Maven Invoker 3.1.0
Closes gh-25426
2021-02-25 13:53:25 +00:00
Andy Wilkinson bc9637c8b3 Upgrade to Maven Common Artifact Filters 3.2.0
Closes gh-25425
2021-02-25 13:53:24 +00:00
Andy Wilkinson e99184bb7f Upgrade to JNA 5.7.0
Closes gh-25424
2021-02-25 13:53:22 +00:00
Andy Wilkinson b477312100 Upgrade to Testcontainers 1.15.2
Closes gh-25423
2021-02-25 13:51:44 +00:00
Andy Wilkinson 9af8ad432a Upgrade to MockK 1.10.6
Closes gh-25422
2021-02-25 13:51:43 +00:00
Andy Wilkinson 070d3d434c Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25421
2021-02-25 13:51:41 +00:00
Andy Wilkinson 5f0d72487e Upgrade to Testcontainers 1.15.2
Closes gh-25420
2021-02-25 13:50:16 +00:00
Andy Wilkinson ac78f55ba8 Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25419
2021-02-25 13:48:53 +00:00
dreis2211 d4eccb7715 Upgrade to Groovy 3.0.7
See gh-24946
2021-01-21 14:32:42 +00:00
Andy Wilkinson a52fee83f9 Pick up new minor releases when upgrading dependencies
See gh-24491
2020-12-15 14:23:32 +00:00
Stephane Nicoll b6fc0913cf Merge branch '2.3.x'
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll 45f1133e1e Merge branch '2.3.x' 2020-11-10 09:49:49 +01:00
Stephane Nicoll 339c8d0a26 Revert "Upgrade to Testcontainers 1.15.0" 2020-11-10 09:47:46 +01:00
Stephane Nicoll 7fb21fbff3 Merge branch '2.3.x'
Closes gh-24104
2020-11-10 08:47:51 +01:00
Stephane Nicoll c1a1b5fe71 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 08:46:15 +01:00
Andy Wilkinson dfe3058dff Only pick up new maintenance releases when upgrading dependencies
Closes gh-24069
2020-11-06 15:55:15 +00:00
Andy Wilkinson 16b26cc9da Align versions of scala-library and scala-reflect
Closes gh-23887
2020-10-26 12:58:37 +00:00
Johnny Lim 915e470510 Upgrade to spring-asciidoctor-extensions 0.5.0
See gh-23694
2020-10-15 09:08:15 +02:00
Phillip Webb f369b9f58f Upgrade to spring-asciidoctor-extensions 0.5.0
Closes gh-23605
2020-10-06 19:24:58 -07:00
Andy Wilkinson 360d44ac04 Restrict JLine version to 2.11 to avoid breaking changes in 2.12+
Closes gh-22072
2020-06-24 11:02:23 +01:00
Andy Wilkinson 63e1e7365e Upgrade to Testcontainers 1.14.3
Closes gh-22076
2020-06-23 12:20:54 +01:00
Andy Wilkinson 549f6abc9a Upgrade to MockK 1.10.0
Closes gh-22075
2020-06-23 12:20:53 +01:00
Andy Wilkinson 5e7917e33a Upgrade to Maven Shade Plugin 3.2.4
Closes gh-22074
2020-06-23 12:20:53 +01:00
Andy Wilkinson 66b84ac7e6 Upgrade to Maven Resolver 1.4.2
Closes gh-22073
2020-06-23 12:00:17 +01:00
Andy Wilkinson ae4ebbe685 Upgrade to Commons Compress 1.20
Closes gh-22071
2020-06-23 11:32:43 +01:00
Andy Wilkinson 6215336602 Upgrade to Testcontainers 1.14.3
Closes gh-22069
2020-06-23 10:50:18 +01:00
Andy Wilkinson 345d33c6a1 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-22068
2020-06-23 10:50:17 +01:00
Andy Wilkinson 2d779adca6 Upgrade to Maven Resolver 1.4.2
Closes gh-22067
2020-06-23 10:50:15 +01:00
Andy Wilkinson 4c0d2686ad Merge branch '2.3.x'
Closes gh-22066
2020-06-23 10:45:43 +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 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