Commit Graph

50 Commits

Author SHA1 Message Date
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
dreis2211 b498d3903f Upgrade to Testcontainers 1.14.2
See gh-21581
2020-05-27 14:49:09 +02:00
Madhura Bhave 1342e4970a Provide a condition for detecting war deployments
Closes gh-19421
2020-04-09 18:52:06 -07:00
Scott Frederick 5afcaa7455 Revert "Add jetty-server to classpath for integration test"
This reverts commit 4e55f2aab4.

This workaround is no longer required with the latest Micrometer
snapshot.
2020-04-08 08:48:39 -05:00
Scott Frederick 4e55f2aab4 Add jetty-server to classpath for integration test
This commit works around a problem with deploying Boot apps to Wildfly
for integration testing while we investigate the root cause.

See gh-20876
2020-04-07 17:10:45 -05:00
Scott Frederick 257703f546 Polish integration test 2020-04-07 17:08:51 -05: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 fd792cedaf Polish DisabledIfDockerUnavailable
Convert `DisabledIfDockerUnavailable` to be an annotation and make
it slightly less noisy.
2020-01-16 16:54:43 -08:00
Phillip Webb 862462b791 Update copyright year of changed files 2020-01-13 17:04:19 -08:00
Andy Wilkinson b5ae8b0af5 Disable tests that use Docker when Docker is unavailable
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Phillip Webb de393aba8b Upgrade deployment test to TomEE 8.0.0
Closes gh-18395
2019-09-28 22:04:16 -07:00
Phillip Webb 8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Issam El-atif 35dc7982d2 Fix deployment tests JUnit 5 checkstyle issues
See gh-17106
2019-06-11 09:02:04 -07:00
Andy Wilkinson b18fffaf14 Move tests to JUnit 5 wherever possible 2019-06-07 12:25:54 +01:00
Andy Wilkinson 36f56d034a Merge branch '2.1.x' 2019-06-07 12:25:19 +01:00
Andy Wilkinson 612a929c19 Merge branch '2.0.x' into 2.1.x 2019-06-07 12:24:18 +01:00
Andy Wilkinson 5c21c68146 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:23:34 +01:00
Phillip Webb db75347eb6 Merge branch '2.1.x' 2019-06-04 14:41:20 -07:00
Phillip Webb 0ef331018e Merge branch '2.0.x' into 2.1.x 2019-06-04 14:30:52 -07:00
Phillip Webb 7fc01971ed Merge branch '1.5.x' into 2.0.x 2019-06-04 14:20:25 -07:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson 28cf63354a Merge pull request #16106 from Spring Operator
* gh-16106:
  Drop AnyEdit from Eclipse setup as it is not available over HTTPS
  Update build and setup configuration to use HTTPS

Closes gh-16106
2019-03-12 10:05:06 +00:00
Spring Operator c9c554b834 Update build and setup configuration to use HTTPS
See gh-16106
2019-03-12 10:02:44 +00:00
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Andy Wilkinson eafee8be58 Merge branch '2.0.x' 2018-10-29 11:00:30 +00:00
Andy Wilkinson 974f90cefe Merge branch '1.5.x' into 2.0.x 2018-10-29 11:00:20 +00:00
Stephane Nicoll 13f08e4c89 Polish 2018-08-16 17:38:26 +02:00
Johnny Lim 6b0ce46491 Polish
Closes gh-13320
2018-06-01 09:22:20 +02:00
Andy Wilkinson 7a27882d62 Restrict Liberty deployment tests to Java 8
OpenLiberty does not yet support Java 9 or 10 and stopping the server
currently hangs when using Java 10.

Closes gh-13141
2018-05-11 10:02:50 +01:00
Andy Wilkinson 8b1a101cb6 Merge branch '1.5.x' 2018-04-09 17:39:26 +01:00
Andy Wilkinson aa27334671 Run deployment tests on JDK 9 and 10 where possible
Closes gh-10414
2018-04-04 14:48:58 +01:00
Andy Wilkinson 5cb38804b4 Polish "Update deployment tests to include Actuator"
Closes gh-11886
2018-02-07 11:51:31 +00:00
Vedran Pavic fc9036a3d9 Update deployment tests to include Actuator
See gh-11886
2018-02-07 11:51:22 +00:00
Stephane Nicoll 9965221378 Merge branch '1.5.x' 2017-11-29 14:21:45 +01:00
Stephane Nicoll 671bff2d6f Polish 2017-10-19 09:01:42 +02:00
Phillip Webb 748e0779b6 Update copyright year for changed files 2017-10-10 11:56:13 -07:00
Phillip Webb b51e93962a Increase cargo timeout for deployment tests 2017-10-08 16:56:45 -07:00
Andy Wilkinson 503520bdc9 Correct the Java version for spring-boot-deployment-tests 2017-10-05 10:48:31 +01:00
Phillip Webb 80562247fe Increase deployment test timeouts
Update deployment tests to allow more time for servers to start.

See gh-9316
2017-10-04 16:34:41 -07:00
Phillip Webb 87b2f68c0f Update deployment tests POMs
Update the `spring-boot-deployment-tests` projects to use CI friendly
Maven files.

See gh-9316
2017-10-04 16:34:41 -07:00
Phillip Webb 89b0ba2c14 Relocate test projects under `spring-boot-tests`
Move integration and deployment tests under a single `spring-boot-tests`
module.

See gh-9316
2017-10-04 16:34:38 -07:00