6540 Commits

Author SHA1 Message Date
Phillip Webb
c94a7dfa04 Allow binding to package private methods
Closes gh-17394
2019-07-01 18:44:35 -07:00
Phillip Webb
27cce996fb Fix rsocket reference
See gh-12005
2019-07-01 12:00:04 -07:00
Phillip Webb
8d03214389 Import attributes from appendix files
See gh-12005
2019-07-01 11:59:59 -07:00
Phillip Webb
8fb181f31a Escape new '{reference}' elements in asciidoc
See gh-17387
2019-07-01 11:43:27 -07:00
Phillip Webb
f20b100a25 Merge branch '2.1.x'
Closes gh-17387
2019-07-01 11:42:07 -07:00
Phillip Webb
88b6a3308c Escape additional '{reference}' elements in asciidoc
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:39:49 -07:00
Phillip Webb
61b771042d Restore version asciidoc variables
See gh-12005
2019-07-01 11:26:04 -07:00
Phillip Webb
c2e3354be0 Drop asciidoc partintro formatting
Since to no longer use docbook, we can't use `partintro`.

See gh-12005
2019-07-01 11:19:37 -07:00
Phillip Webb
fcbcc9d309 Merge branch '2.1.x'
Closes gh-17387
2019-07-01 11:04:54 -07:00
Phillip Webb
a81f37dd68 Escape '{reference}' elements in asciidoc files
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:02:05 -07:00
dreis2211
15d4764185 Avoid bindable properties check when target has null value
See gh-16447
2019-07-01 17:11:58 +01:00
陈其苗
f86cfff77f Remove redundant invocation of getActiveProfiles
See gh-17271
2019-07-01 17:06:12 +01:00
Andy Wilkinson
cca005f756 Merge branch '2.1.x'
Closes gh-17383
2019-07-01 15:57:41 +01:00
Andy Wilkinson
34e0db2c25 Merge branch '2.0.x' into 2.1.x
Closes gh-17382
2019-07-01 15:57:21 +01:00
Andy Wilkinson
0c44584b44 Merge branch '1.5.x' into 2.0.x 2019-07-01 15:57:00 +01:00
Andy Wilkinson
6791dbb786 Merge branch '2.1.x'
Closes gh-17381
2019-07-01 15:47:48 +01:00
Andy Wilkinson
4083c721f2 Fix URL normalization when replacing /./ with /
Previously, a regular expression of /./ was used to replace /./ with
/.  The '.'' in the expression matches any single character so the
replacement was more broadly applicable than it should have been. For
example, /a/ would be replaced with /.

This commit uses Pattern.LITERAL to compile the regular expression
from the CURRENT_DIR (/./) contant. This allows the constant to be
used to check for occurances of /./ in the string before attempting
replacement, while also ensuring that the '.' is treated literally.

Closes gh-17341
2019-07-01 15:42:54 +01:00
Andy Wilkinson
df5d23ff6c Polish "Migrate LogbackLoggingSystemTests to JUnit 5"
See gh-17107
2019-06-29 23:20:47 +01:00
Ilya Lukyanovich
569830cdca Migrate LogbackLoggingSystemTests to JUnit 5
See gh-17107
2019-06-29 23:20:40 +01:00
Dmytro Nosan
011fea137e Allow multiple values to be specified when configuring a default header
See gh-17286
2019-06-29 23:06:39 +01:00
Dmytro Nosan
1d9aae8282 Introduce RedisCacheManagerBuilderCustomizer
See gh-17287
2019-06-29 22:56:21 +01:00
Andy Wilkinson
71b09e39ae Merge branch '2.1.x'
Closes gh-17370
2019-06-29 22:36:14 +01:00
Dmytro Nosan
ae184874e9 Polish WebServiceTemplateBuilder
See gh-17289
2019-06-29 22:19:03 +01:00
Andy Wilkinson
4c812b065d Merge pull request #17322 from garyrussell
* gh-17322:
  Auto-configure KLC with user-provided RecordInterceptor

Closes gh-17322
2019-06-29 22:06:25 +01:00
Gary Russell
eeda12bd58 Auto-configure KLC with user-provided RecordInterceptor
spring-kafka.2.3.0.M3 introduced a new property `RecordInterceptor` to
the container factory.

Auto-configure the property if a single instance is present.

See gh-17322
2019-06-29 22:05:33 +01:00
Andy Wilkinson
13bbfb7ede Polish "Polish TomcatReactiveWebServerFactoryTests"
See gh-17336
2019-06-29 21:57:55 +01:00
Johnny Lim
0e7824cec1 Polish TomcatReactiveWebServerFactoryTests
See gh-17336
2019-06-29 21:56:19 +01:00
Andy Wilkinson
9f521430fa Polish "Use @EmbeddedKafka for Integration Tests"
See gh-17355
2019-06-29 21:47:11 +01:00
Gary Russell
815834ab6e Use @EmbeddedKafka for Integration Tests
`@EmbeddedKafka` now supports JUnit 5 without the need for a Spring
test application context. Remove the previous workaround that replaced
the JUnit4 `@ClassRule` and use `TopicBuilder` to build the
topic bean.

See gh-17355
2019-06-29 21:36:36 +01:00
Andy Wilkinson
6212901bc1 Polish "Add 'client-name' property to specify a Redis client name"
See gh-17330
2019-06-29 21:24:57 +01:00
Dmytro Nosan
f877caf118 Add 'client-name' property to specify a Redis client name
See gh-17330
2019-06-29 21:23:25 +01:00
Andy Wilkinson
e496203740 Merge branch '2.1.x'
Closes gh-17368
2019-06-29 21:19:13 +01:00
Johnny Lim
408035fb3f Remove System.out.println() in a test
See gh-17358
2019-06-29 21:18:44 +01:00
Andy Wilkinson
ea7443bf01 Merge branch '2.1.x'
Closes gh-17367
2019-06-29 21:15:29 +01:00
Johnny Lim
8dea74a2e9 Add a missing quote in DebugLogbackConfigurator
See gh-17357
2019-06-29 21:14:42 +01:00
Andy Wilkinson
8f668610f7 Align RSocket auto-configuration latest Framework changes
Closes gh-17366
2019-06-29 21:09:54 +01:00
Andy Wilkinson
1fa48882bb Merge branch '2.1.x'
See gh-17362
2019-06-29 20:39:19 +01:00
Andy Wilkinson
f4e7b80651 Merge branch '2.0.x' into 2.1.x
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson
761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Phillip Webb
605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb
92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb
a417e136a3 Merge branch '2.1.x' 2019-06-28 14:15:17 -07:00
Phillip Webb
9aa4887376 Merge branch '2.0.x' into 2.1.x 2019-06-28 14:14:52 -07:00
Phillip Webb
ed3e1e076d Fix AbstractFilterRegistrationBean merge error
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb
c62b6b4ccd Merge branch '2.1.x' 2019-06-28 12:22:45 -07:00
Phillip Webb
de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb
bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Madhura Bhave
7e22901bb2 Fail build on unresolved documentation links
Closes gh-12005
2019-06-28 12:04:30 -07:00
rossdrew
d6977ea89f Remove hyphenation of opaquetoken in OAuth2 property names
See gh-17290
2019-06-28 14:48:56 +01:00