root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
22,398 Commits 23 Branches 348 Tags 291 MiB
Commit Graph

22398 Commits

Author SHA1 Message Date
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
Andy Wilkinson 35a178abab Merge pull request #16447 from dreis2211 
* gh-16447:
  Avoid bindable properties check when target has null value

Closes gh-16447
 2019-07-01 17:13:14 +01:00
dreis2211 15d4764185 Avoid bindable properties check when target has null value 
See gh-16447
 2019-07-01 17:11:58 +01:00
Andy Wilkinson 38f21a13cc Merge pull request #17271 from chenqimiao 
* gh-17271:
  Remove redundant invocation of getActiveProfiles

Closes gh-17271
 2019-07-01 17:06:55 +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 b7884b50f6 Merge pull request #16894 from gavvvr 
* gh-16894:
  Fix persistent session property name in reference docs

Closes gh-16894
 2019-07-01 15:54:43 +01:00
Kirill Gavrilov c1bf04c66f Fix persistent session property name in reference docs 
See gh-16894
 2019-07-01 15:54:13 +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 d6d2b591e3 Merge branch '2.1.x' 
Closes gh-17379
 2019-07-01 14:09:44 +01:00
Andy Wilkinson 3bbe723718 Merge branch '2.0.x' into 2.1.x 
Closes gh-17378
 2019-07-01 14:09:10 +01:00
Andy Wilkinson 1823f38203 Merge branch '1.5.x' into 2.0.x 2019-07-01 14:08:49 +01:00
Andy Wilkinson bf271e415a Align print margin column with Java Format's line wrapping 
Closes gh-17377
 2019-07-01 14:08:14 +01:00
Andy Wilkinson a5f4302649 Merge pull request #17107 from L00kian 
* gh-17107:
  Polish "Migrate LogbackLoggingSystemTests to JUnit 5"
  Migrate LogbackLoggingSystemTests to JUnit 5

Closes gh-17107
 2019-06-29 23:53:56 +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
Andy Wilkinson f4202d2be2 Merge pull request #17286 from nosan 
* gh-17286:
  Allow multiple values to be specified when configuring a default header

Closes gh-17286
 2019-06-29 23:10:16 +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
Andy Wilkinson 2f49d6d1e3 Merge pull request #17287 from nosan 
* gh-17287:
  Introduce RedisCacheManagerBuilderCustomizer

Closes gh-17287
 2019-06-29 23:02:57 +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
Andy Wilkinson c982289431 Merge pull request #17289 from nosan 
* gh-17289:
  Polish WebServiceTemplateBuilder

Closes gh-17289
 2019-06-29 22:21:54 +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 f3ed0aa5bc Merge pull request #17336 from izeye 
* gh-17336:
  Polish "Polish TomcatReactiveWebServerFactoryTests"

Closes gh-17336
 2019-06-29 22:01:25 +01:00
Andy Wilkinson 13bbfb7ede Polish "Polish TomcatReactiveWebServerFactoryTests" 
See gh-17336
 2019-06-29 21:57:55 +01:00
Andy Wilkinson a8b7eecaa8 Merge pull request #17336 from izeye 
* gh-17336:
  Polish TomcatReactiveWebServerFactoryTests

Closes gh-17336
 2019-06-29 21:56:34 +01:00
Johnny Lim 0e7824cec1 Polish TomcatReactiveWebServerFactoryTests 
See gh-17336
 2019-06-29 21:56:19 +01:00
Andy Wilkinson e1394d4b12 Merge branch '2.1.x' 
Closes gh-17369
 2019-06-29 21:52:30 +01:00
Andy Wilkinson 65b95f0d7b Merge pull request #17342 from izeye 
* gh-17342:
  Fix typo in bomr.yaml

Closes gh-17342
 2019-06-29 21:52:05 +01:00
Johnny Lim 4e1cc943f9 Fix typo in bomr.yaml 
See gh-17342
 2019-06-29 21:51:53 +01:00
Andy Wilkinson 6441cdc49d Merge pull request #17355 from garyrussell 
* gh-17355:
  Polish "Use @EmbeddedKafka for Integration Tests"
  Use @EmbeddedKafka for Integration Tests

Closes gh-17355
 2019-06-29 21:47:39 +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 244c8f7325 Merge pull request #17330 from nosan 
* gh-17330:
  Polish "Add 'client-name' property to specify a Redis client name"
  Add 'client-name' property to specify a Redis client name

Closes gh-17330
 2019-06-29 21:33:42 +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
Andy Wilkinson 8b4b6a32fa Merge pull request #17358 from izeye 
* gh-17358:
  Remove System.out.println() in a test

Closes gh-17358
 2019-06-29 21:19:02 +01:00