Madhura Bhave
f863ce32ee
Merge branch '2.1.x'
2018-12-10 16:44:42 -08:00
Madhura Bhave
3cc441c83e
Do not remove trailing slash from OAuth2 Issuer URI
...
Fixes gh-15324
2018-12-10 16:35:52 -08:00
Andy Wilkinson
55d7c19c06
Merge branch '2.1.x'
2018-12-10 17:59:50 +00:00
Andy Wilkinson
d05ae40c99
Remove redundant field type and optional configuration
...
See gh-15435
2018-12-10 17:59:26 +00:00
Andy Wilkinson
393decff35
Merge branch '2.1.x'
2018-12-10 17:58:00 +00:00
Andy Wilkinson
ef4ea591b3
Mark nested optional fields as optional
...
See gh-15435
2018-12-10 17:49:41 +00:00
Andy Wilkinson
c9c5cd18a2
Merge branch '2.1.x'
2018-12-10 15:40:17 +00:00
Andy Wilkinson
6752be9333
Exclude logback-classic from liquibase-core
...
Closes gh-15436
2018-12-10 15:39:51 +00:00
Andy Wilkinson
beffc4da9f
Remove ordering dependence from tests that create embedded databases
...
Closes gh-15423
2018-12-10 14:57:39 +00:00
Andy Wilkinson
05cb4cb379
Merge branch '2.1.x'
2018-12-10 14:36:30 +00:00
Andy Wilkinson
9dc2116351
Merge branch '2.0.x' into 2.1.x
2018-12-10 14:36:21 +00:00
Andy Wilkinson
554e7061ce
Upgrade to Spring Restdocs 2.0.3.RELEASE
...
Closes gh-15435
2018-12-10 14:36:03 +00:00
Brian Clozel
b2c5fd84b9
Use spring-doc-resources 0.1.0.BUILD-SNAPSHOT
2018-12-10 12:53:24 +01:00
igor-suhorukov
2b1653d009
Simplify code by using try-with-resources statement
...
Closes gh-15427
2018-12-10 09:05:33 +01:00
Stephane Nicoll
ba29788482
Polish "Replace explicit generic type with diamond operator"
...
Closes gh-15424
2018-12-09 11:43:28 +01:00
igor-suhorukov
a2ebba8db1
Replace explicit generic type with diamond operator
...
See gh-15424
2018-12-09 11:42:27 +01:00
Madhura Bhave
f040459ae5
Merge branch '2.1.x'
2018-12-07 14:32:07 -08:00
Madhura Bhave
a11dea46d7
Use the right class in @ConditionalOnClass
...
See gh-15372
2018-12-07 14:15:59 -08:00
Madhura Bhave
e0b55d36de
Merge branch '2.1.x'
2018-12-07 13:51:11 -08:00
Madhura Bhave
f13697b278
Make Resource Server auto-config conditional on JwtDecoder class
...
Fixes gh-15372
2018-12-07 13:48:32 -08:00
Andy Wilkinson
d3e5c5688f
Polish
2018-12-07 19:58:13 +00:00
Madhura Bhave
e367b54928
Merge branch '2.1.x'
2018-12-07 11:57:19 -08:00
Madhura Bhave
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
2018-12-07 11:45:04 -08:00
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
Andy Wilkinson
2cd3cff608
Merge branch '2.1.x'
2018-12-07 15:25:35 +00:00
Andy Wilkinson
4c6c07ddbb
Start building against Spring AMQP 2.1.3 snapshots
...
See gh-15407
2018-12-07 15:22:35 +00:00
Andy Wilkinson
f04f74870a
Start building against Spring Data Lovelace SR4 snapshots
...
See gh-15410
2018-12-07 15:22:06 +00:00
Andy Wilkinson
96f1a394b8
Start building against Spring Integration 5.1.2 snapshots
...
See gh-15413
2018-12-07 15:21:28 +00:00
Andy Wilkinson
e27d3d0d5e
Start building against Spring Kafka 2.2.3
...
See gh-15414
2018-12-07 15:20:40 +00:00
Andy Wilkinson
b01d5f62a4
Start building against Spring Security 5.1.3 snapshots
...
See gh-15417
2018-12-07 15:20:05 +00:00
Andy Wilkinson
a5f5ead520
Start building against Spring AMQP 2.0.11 snapshots
...
See gh-15406
2018-12-07 15:15:01 +00:00
Andy Wilkinson
5e640877c9
Start building against Spring Data Kay SR13 snapshots
...
See gh-15409
2018-12-07 15:14:15 +00:00
Andy Wilkinson
12a844d7da
Start building against Spring Integration 5.0.11 snapshots
...
See gh-15412
2018-12-07 15:13:36 +00:00
Andy Wilkinson
5336c8ccde
Start building against Spring Security 5.0.11 snapshots
...
See gh-15416
2018-12-07 15:13:01 +00:00
Stephane Nicoll
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
2018-12-07 11:10:10 +01:00
igor-suhorukov
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
2018-12-07 11:01:42 +01:00
Stephane Nicoll
71173f2db5
Merge branch '2.1.x'
2018-12-07 09:57:20 +01:00
Stephane Nicoll
c84d199cb7
Upgrade to Flyway 5.2.4
...
Closes gh-15402
2018-12-07 09:56:18 +01:00
Andy Wilkinson
95a14e7ba5
Remove duplicate dependency management for spring-core
...
Closes gh-15380
2018-12-06 12:07:25 +00:00
Stephane Nicoll
6f6e712a7b
Merge branch '2.1.x'
2018-12-06 09:08:12 +01:00
Stephane Nicoll
bd21113e9f
Fix indent of WebServiceTemplate section
...
Closes gh-15389
2018-12-06 09:06:02 +01:00
Madhura Bhave
5a18df2d69
Fix tests
2018-12-05 18:33:50 -08:00
Madhura Bhave
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
Madhura Bhave
4c96c76f11
Include Junit5 dependencies in Spring Boot Starter Test
...
See gh-14736
2018-12-05 17:48:52 -08:00
Madhura Bhave
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
2018-12-05 17:48:27 -08:00
Stephane Nicoll
fb1c7c82b4
Merge branch '2.1.x'
2018-12-05 15:56:18 +01:00
Stephane Nicoll
ef40241bf6
Merge branch '2.0.x' into 2.1.x
2018-12-05 15:56:04 +01:00
dreis2211
d864b427eb
Remove unused ByteArrayStartsWith matcher
...
Closes gh-15386
2018-12-05 15:52:42 +01: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
Jay Bryant
a7d22aaf4b
Reorganize asciidoc content
...
This commit adds an index page for the multi-file HTML version, and
fixed a couple of casing issues (significant words starting with lower
case in headings).
While researching how to get the content from index-docinfo.xml into
the output, I came across the notion of a colophon, which is a good name
for the information in that file. I have consequently changed "Legal"
(which I never liked but couldn't think of a better term for at the
time) to "Colophon".
See gh-12611
2018-12-05 10:32:37 +01:00
