Commit Graph

21208 Commits

Author SHA1 Message Date
dreis2211
0f92b139f3 Remove Mockito 1 leftover
Closes gh-15422
2018-12-11 08:52:15 +01:00
Madhura Bhave
d77b52ca15 Merge branch '2.1.x' 2018-12-10 19:29:21 -08:00
Madhura Bhave
f1f26468bc Set start and stop for time resource
See gh-15164
2018-12-10 19:27:19 -08:00
Madhura Bhave
8c950e809e Merge branch '2.1.x' 2018-12-10 19:24:03 -08:00
Madhura Bhave
edc1a4fb86 Automate JDK CI upgrades using AdoptOpenJDK API
An issue is created if a new release is detected.

Closes gh-15164
2018-12-10 19:20:11 -08:00
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
Andy Wilkinson
9a97e1b0f7 Drop use of OutputCapture in SampleKafkaApplicationTests
Closes gh-15432
2018-12-10 10:11:50 +00:00
Stephane Nicoll
83de570f33 Merge pull request #15427 from igor-suhorukov
* pr/15427:
  Simplify code by using try-with-resources statement
2018-12-10 09:06:13 +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
075a2b10bb Merge pull request #15424 from igor-suhorukov
* pr/15424:
  Polish "Replace explicit generic type with diamond operator"
  Replace explicit generic type with diamond operator
2018-12-09 11:46:32 +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
6d7b68ce3b Merge branch '2.1.x' 2018-12-07 15:18:57 +00:00
Andy Wilkinson
d3b72d50d2 Merge branch '2.0.x' into 2.1.x 2018-12-07 15:18:50 +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
Andy Wilkinson
5c39c4bafa Merge branch '2.1.x' 2018-12-07 15:11:56 +00:00
Andy Wilkinson
e283afb9fe Merge branch '2.0.x' into 2.1.x 2018-12-07 15:11:31 +00:00
Andy Wilkinson
474a597464 Merge branch '1.5.x' into 2.0.x 2018-12-07 15:11:19 +00:00
Andy Wilkinson
67c7434237 Start building against Spring Data Ingalls SR18 snapshots
See gh-15408
2018-12-07 15:09:11 +00:00
Andy Wilkinson
e2d1a433c7 Start building against Spring Integration 4.3.19 snapshots
See gh-15411
2018-12-07 15:08:25 +00:00
Andy Wilkinson
b60629d5c5 Start building against Spring Session 1.3.5 snapshots
See gh-15418
2018-12-07 15:07:40 +00:00