Commit Graph

320 Commits

Author SHA1 Message Date
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