Commit Graph

338 Commits

Author SHA1 Message Date
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
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
Andy Wilkinson b6d9c6ee6c Merge branch '2.0.x' into 2.1.x
Closes gh-17150
2019-06-14 12:01:43 +01:00
Andy Wilkinson 4828c19f8f Merge branch '1.5.x' into 2.0.x 2019-06-14 12:00:45 +01:00
Andy Wilkinson 23f803c6b6 Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library
Closes gh-15555
2019-05-22 14:50:15 +01:00
Brian Clozel 22ae160faa Upgrade to Spring-Doc-Resources 0.1.2.RELEASE
Closes gh-16690
2019-05-13 16:37:56 +02:00
Madhura Bhave 1db1c8b03c Validate our own tests work with JUnit5 and the vintage engine
Closes gh-14737

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-05-08 16:05:44 +02:00
Brian Clozel c4938055b4 Polish "Separate compound properties in appendices"
Closes gh-16480
2019-04-30 15:32:26 +02:00
Stephane Nicoll 81543873d4 Merge branch '2.1.x' 2019-04-30 14:33:12 +02:00
ielatif 3ffbe256f1 Exclude HikariCP specific dependency from Quartz
Closes gh-16628
2019-04-30 14:31:17 +02:00
Madhura Bhave 3ecefdbcdc Add dependency management for okhttp3
Closes gh-6385
2019-04-18 14:14:14 -07:00
Brian Clozel 687c58d62c Revert "Upgrade to asciidoctor-maven-plugin 1.6.0"
This commit introduced an incompatible change in the asciidoct
API: both asciidoctorj-pdf and spring-asciidoctor-extensions
expect `org.asciidoctor.extension.JavaExtensionRegistry` to be
a class, not an interface.

This reverts commit 120ffb1ed0.
2019-04-15 23:05:22 +02:00
Stephane Nicoll 120ffb1ed0 Upgrade to asciidoctor-maven-plugin 1.6.0 2019-04-15 16:52:57 +02:00
Stephane Nicoll 604b0891d0 Use asciidoctor 1.5.8
This commit uses asciidoctor 1.5.8 for the time being. Once a new
version of the plugin is released, this override will be unnecessary.
2019-03-29 15:35:45 +01: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
Stephane Nicoll b34b217d1e Upgrade to Kotlin 1.3.21
Closes gh-16195
2019-03-11 15:56:13 +01: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
Stephane Nicoll 0c45019200 Upgrade to Spring Doc Resources 0.1.0.RELEASE
Closes gh-15805
2019-02-19 14:24:20 +01:00
Sebastien Deleuze cca79b8d4d Migrate Kotlin tests to Mockk
See gh-15993
2019-02-19 13:35:43 +01:00
Andy Wilkinson 6519e85b5a Merge branch '2.1.x' 2019-02-14 08:23:38 +00:00
Andy Wilkinson 027f9182a8 Generate Javadoc with same source level as used for compilation
This works around a change in javadoc generation in JDK 11.0.2. See
https://bugs.openjdk.java.net/browse/JDK-8212233 for details.
2019-02-14 08:23:20 +00:00
Andy Wilkinson c04eba7ebc Polish "Add TestNG support in TestTypeExcludeFilter"
See gh-7630
2019-02-12 15:28:19 +00:00
Andy Wilkinson 1c90a89acd Merge branch '2.1.x' 2019-02-12 09:47:42 +00:00
Andy Wilkinson 8426d8854f Import Testcontainers' bom rather than managing modules individually
Closes gh-15900
2019-02-12 09:46:20 +00:00
Andy Wilkinson 7e51e1a076 Merge branch '2.1.x' 2019-02-12 09:26:59 +00:00
Andy Wilkinson 01b8e2c834 Polish “Replace custom Neo4j container with Testcontainers version”
See gh-15638
2019-02-12 09:25:07 +00:00
Michael Simons 316126e8f0 Replace custom Neo4j container with Testcontainers version
See gh-15638
2019-02-12 09:24:44 +00:00
Andy Wilkinson 8e0cc278b2 Merge branch '2.1.x' 2019-02-11 20:00:09 +00:00
Andy Wilkinson a5aceb35d7 Upgrade to Testcontainers 1.10.6
Closes gh-15893
2019-02-11 19:59:32 +00:00
Stephane Nicoll 5e2d5959f3 Polish 2019-01-29 15:56:48 +01:00
Andy Wilkinson 064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Madhura Bhave e16511279a Add junit-jupiter-engine for running Junit5 tests 2018-12-11 15:08:28 -08:00
Madhura Bhave 59d2b0a3fb Upgrade tests to Junit5
See gh-14737
2018-12-05 17:49:09 -08:00
Brian Clozel ed3347f00d Configure Asciidoctor toolchain for ref docs
This commit replaces the Docbook+Asciidoctor documentation toolchain by
a single Asciidoctor generation process.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

Closes gh-12611
2018-12-05 14:20:07 +01:00
jnizet 5ed6c0d1ab Add Kotlin DSL examples to Gradle Plugin's documentation
See gh-14585
2018-10-05 10:41:13 +01:00
Stephane Nicoll 42e6126066 Merge branch '2.0.x' 2018-10-03 10:34:02 +02:00
Stephane Nicoll 135797c347 Remove useless prerequisites section
Closes gh-14668
2018-10-03 10:33:24 +02:00
Phillip Webb f99df98588 Unify maven-shade-plugin version in parent POM
Closes gh-14440
2018-09-11 22:49:36 -07:00
Phillip Webb b41e135713 Upgrade to mockito-kotlin 1.6.0
Closes gh-14426
2018-09-11 22:49:35 -07:00
Phillip Webb f0bfcd8947 Drop okhttp 2.x managed dependency
Closes gh-14442
2018-09-11 22:49:35 -07:00
Phillip Webb 9beab013f9 Upgrade to okhttp 3.11.0
Closes gh-14427
2018-09-11 22:49:35 -07:00
Phillip Webb 372fee11f5 Upgrade to JOpt Simple 5.0.4
Closes gh-14430
2018-09-11 22:49:34 -07:00
Phillip Webb 83a2031934 Upgrade to Commons Compress 1.18
Closes gh-14431
2018-09-11 22:36:13 -07:00
Phillip Webb 4adceec45f Upgrade to Ivy 2.4.0
Closes gh-14432
2018-09-11 22:36:13 -07:00
Phillip Webb 6e64ae0921 Upgrade to maven-archiver 3.2.0
Closes gh-14433
2018-09-11 22:36:12 -07:00
Phillip Webb e00a254729 Upgrade to maven-plugin-annotations 3.5.2
Closes gh-14434
2018-09-11 22:36:11 -07:00
Phillip Webb 8b16630a49 Upgrade to sisu-inject-plexus 2.6.0
Closes gh-14435
2018-09-11 22:36:11 -07:00
Phillip Webb abd08418c0 Upgrade to testcontainers 1.8.3
Closes gh-14436
2018-09-11 22:36:11 -07:00
Phillip Webb 3f8a5fd2e3 Upgrade to zt-zip 1.13
Closes gh-14437
2018-09-11 22:36:10 -07:00
Phillip Webb d5ba03c2ae Upgrade to maven-common-artifact-filters 3.0.1
Closes gh-14441
2018-09-11 22:36:10 -07:00
Phillip Webb 894e0e11d4 Switch from Aether to Maven Resolver
Replace Aether dependencies with Maven Resolver following the Eclipse
EOL announcement for Aether.

Closes gh-7627
2018-09-11 18:08:59 -07:00
Phillip Webb 1f9754fc81 Upgrade to plexus-archiver to 3.6.0
Closes gh-14411
2018-09-11 18:08:59 -07:00
Phillip Webb 59e210642b Upgrade plexus-utils to 3.1.0
Closes gh-14422
2018-09-11 18:08:59 -07:00
Stephane Nicoll d1ac774af2 Configure build to be compatible with Java 11
See gh-14028
2018-08-17 15:16:02 +02:00
Stephane Nicoll 8ffd44077d Upgrade to gmavenplus-plugin 1.6.1 2018-08-16 17:25:28 +02:00
Stephane Nicoll 295995829f Remove outdated Java10 profile 2018-08-09 13:33:03 +02:00
Andy Wilkinson b58314f214 Merge branch '2.0.x' 2018-07-18 14:17:35 +01:00
Andy Wilkinson 681717d07a Merge branch '1.5.x' into 2.0.x 2018-07-18 14:17:15 +01:00
Andy Wilkinson c90f589906 Merge branch '2.0.x' 2018-06-20 13:57:05 +01:00
Andy Wilkinson e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
Brian Clozel 751a2b438e Upgrade duplicate finder maven plugin to 1.3.0
Closes gh-13411
2018-06-07 15:24:32 +02:00
Phillip Webb 2274ac5214 Move spring-javaformat plugins to root POM
Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
2018-06-04 17:25:19 -07:00
Phillip Webb 401fcbeaa4 Merge branch '1.5.x' into 2.0.x 2018-05-30 13:29:10 -07:00
Phillip Webb e38d5f910b Merge branch '1.5.x' into 2.0.x 2018-05-30 12:18:38 -07:00
hengyunabc b75e58b70f Add enforce-rule to ensure maven version >= 3.5.0
Closes gh-13271
2018-05-27 18:03:52 +02:00
Phillip Webb dba73d76b8 Merge branch '1.5.x' into 2.0.x 2018-05-26 08:43:27 -07:00
Phillip Webb e544922dd7 Merge branch '1.5.x' into 2.0.x 2018-05-25 23:02:08 -07:00
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Andy Wilkinson d5841982d9 Upgrade to Testcontainers 1.7.2
See gh-12821
2018-05-01 09:25:04 +01:00
Madhura Bhave 4fab679829 Upgrade testcontainers to 1.7.0
Closes gh-12821
2018-04-11 10:40:54 -07:00
Andy Wilkinson a8bbf7120e Merge branch '1.5.x' 2018-04-05 07:11:34 +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
Rui Figueira 5e2726f896 Configure Kotlin compiler to use -java-parameters by default
See gh-12641
2018-03-28 12:24:17 +01:00
igor-suhorukov aebb475bc5 Reorder modifiers to comply with the JLS
See gh-12432
2018-03-12 15:17:05 +01:00
Andy Wilkinson 63a7a9bf42 Merge branch '1.5.x' 2018-03-08 15:52:47 +00:00
Andy Wilkinson d08b228813 Merge branch '1.5.x' 2018-03-08 15:46:59 +00:00
Andy Wilkinson 43d05315b3 Use Surefire and Failsafe 2.21.0 when building with JDK 10
Closes gh-12332
2018-03-08 13:11:27 +00:00
Andy Wilkinson 1f5143de70 Avoid problems with Failsafe when building with JDK 10
See gh-12028
2018-03-03 17:52:41 +00:00
Andy Wilkinson d30c1fd9f8 Make javadoc plugin use Java 10-compatible version of Commons Lang 3
See gh-12028
2018-03-03 17:52:41 +00:00
Andy Wilkinson 4aa947c227 Use a Java 10-compatibile version of Maven’s site plugin
See gh-12028
2018-03-03 17:52:41 +00:00
Andy Wilkinson 20654b9bc9 Remove no longer needed AspectJ version override with JDK 9+
See gh-12028
2018-03-02 16:04:10 +00:00
Andy Wilkinson f7c8be1877 Apply java9 profile to JDK 10 (and later) as well as JDK 9
See gh-12028
2018-03-02 15:28:03 +00:00
Andy Wilkinson a7d05d4276 Avoid SUREFIRE-1439 by using 2.21.0-SNAPSHOT when building with JDK 10
See gh-12028
2018-03-02 15:14:45 +00:00
Andy Wilkinson 48656d0d53 Fix build warnings about use of ${artifactId}
See gh-11994
2018-02-23 13:33:53 +00:00
Phillip Webb 5917a58bf1 Add Automatic-Module-Name to manifest file
Update build to add `Automatic-Module-Name` entry to the manifest file.
Also refined a few of the other entries that appear.

Fixes gh-11994
2018-02-21 16:03:13 -08:00
Phillip Webb 46021928ba Rework common server customization
Update the configurable embedded web server factory interfaces to
extend `ConfigurableWebServerFactory` so that the can be used in a
`WebServerFactoryCustomizer`.

Extract server specific customization to their own auto-configuration
and align reactive/servlet server auto-configuration.

Closes gh-8573
2018-02-20 16:27:15 -08:00
Andy Wilkinson a8899feea3 Merge branch '1.5.x' 2018-02-15 16:23:17 +00:00
Raja Kolli f9f9e84f96 Upgrade to Maven Checkstyle Plugin 3.0.0
Closes gh-11775
2018-01-25 21:16:35 +01:00
Phillip Webb 66d5c03c39 Add checkstyle to prevent reactor Assert import 2018-01-22 15:57:02 -08:00
Phillip Webb bda9b892b3 Add direct WebFlux and WebMvc endpoint support
Add `@ControllerEndpoint` and `@RestControllerEndpoint` annotations that
can be used to develop a Spring-only request mapped endpoint. Both
Spring MVC and Spring WebFlux are supported.

This feature is primarily for use when deeper Spring integration is
required or when existing Spring Boot 1.5 projects want to migrate to
Spring Boot 2.0 without re-writing existing endpoints. It comes at the
expense of portability, since such endpoints will be missing from
Jersey.

Fixes gh-10257
2018-01-19 21:06:32 -08:00
Brian Clozel 98ac2218db Apply server.undertow.* config to reactive servers
This commit applies `server.undertow.*` configuration properties
to Undertow when configured as a reactive web server.

See gh-11500
2018-01-11 11:15:23 +01:00
Brian Clozel 15bc718248 Apply server.jetty.* config to reactive servers
This commit applies `server.jetty.*` configuration properties
to Jetty when configured as a reactive web server.

It also removes some infrastructure support for Jetty 8, which
is not supported anymore in Spring Boot 2.0 (partial fix for
gh-11504).

See gh-11500
2018-01-11 11:15:17 +01:00
Brian Clozel d264af8142 Apply server.tomcat.* config to reactive servers
This commit applies most `server.tomcat.*` configuration
properties to Tomcat when set up as a reactive web server.

Some Servlet-specific properties are not applied:

* server.tomcat.additional-tld-skip-patterns
* server.tomcat.redirect-context-root
* server.tomcat.use-relative-redirects

Fixes gh-11334
2018-01-11 11:15:02 +01:00
Roman Zaynetdinov ab7c47d340 Add auto-configuration for using REST Docs with WebTestClient
See gh-10969
2018-01-09 11:37:14 +00:00
Madhura Bhave e28915bd4b Make integration tests self-contained
Fixes gh-10516
2018-01-04 11:26:40 -08:00
Stephane Nicoll e3bfd797a3 Merge branch '1.5.x' 2018-01-04 10:11:32 +01:00
sdeleuze 945ca00b5b Upgrade to Kotlin 1.2
apiVersion and languageVersion options are set to 1.1
in order to avoid incompatibilities with Kotlin 1.1
based projects.

Closes gh-11235
2017-12-28 13:44:22 +01:00
Johnny Lim 38a188f557 Add a Checkstyle rule to prevent Commons Lang/Lang 3 imports
Closes gh-11432
2017-12-27 16:46:34 +01:00
Stephane Nicoll a8f5e1a361 Merge branch '1.5.x' 2017-12-24 12:19:40 +01:00
Andy Wilkinson d0981a1f6d Merge branch '1.5.x' 2017-12-12 12:47:38 +00:00
Andy Wilkinson adeca6ea01 Merge branch '1.5.x' 2017-12-06 14:05:25 +00:00
Andy Wilkinson eb6182f587 Remove redundant commons-logging exclusions
Closes gh-11148
2017-11-29 13:17:01 +00:00
sdeleuze cd98da5ee9 Introduce TestRestTemplate Kotlin extensions
This commit introduces Kotlin extensions similar to the RestOperations
ones in order to be able to take advantage of Kotlin reified type
parameters for example.

See gh-11039
2017-11-24 09:44:34 +01:00
Johnny Lim 01a48412d2 Polish
Closes gh-11126
2017-11-23 16:00:55 +00:00
Andy Wilkinson 4de208bc94 Provide reference documentation for Actuator web endpoints
Closes gh-8042
2017-11-17 11:27:16 +00:00
Madhura Bhave d50fe8874f Add CF support for reactive actuators
Closes gh-10780
2017-11-02 18:00:55 -07:00
Stephane Nicoll 3d820adb4d Remove outdated Kotlin internal dependency management 2017-10-30 16:12:41 +01:00
Stephane Nicoll fd07bfd816 Polish "Add runApplication() Kotlin top level function"
Closes gh-10511
2017-10-27 14:22:15 +02:00
Stephane Nicoll 59a906bd58 Upgrade Java9 build to AspectJ 1.9.0.RC1 2017-10-24 09:32:34 +02:00
Phillip Webb 4df84c53bc Upgrade Maven plugins
Upgrade the Maven plugins used in the builds.

See gh-9316
2017-10-04 16:34:43 -07:00
Phillip Webb b87f9c11f1 Fix POMs for the updated build/release process
Fix POMs following project relocations and apply CI friendly Maven
conventions.

See gh-9316
2017-10-04 16:34:38 -07:00
Phillip Webb 0ba4830b4f Relocate projects to spring-boot-project
Move projects to better reflect the way that Spring Boot is released.

The following projects are under `spring-boot-project`:

  - `spring-boot`
  - `spring-boot-autoconfigure`
  - `spring-boot-tools`
  - `spring-boot-starters`
  - `spring-boot-actuator`
  - `spring-boot-actuator-autoconfigure`
  - `spring-boot-test`
  - `spring-boot-test-autoconfigure`
  - `spring-boot-devtools`
  - `spring-boot-cli`
  - `spring-boot-docs`

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