Commit Graph

24140 Commits

Author SHA1 Message Date
Stephane Nicoll
b515d6ba9a Merge pull request #19397 from aklish
* pr/19397:
  Add Elide as 3rd party Spring Boot Starter

Closes gh-19397
2019-12-19 13:45:08 +09:00
Aaron Klish
8b149dcea9 Add Elide as 3rd party Spring Boot Starter
See gh-19397
2019-12-19 13:44:50 +09:00
Stephane Nicoll
e95c2b215b Merge branch '2.1.x' into 2.2.x 2019-12-17 09:44:44 +09:00
Stephane Nicoll
57e838e526 Merge pull request #19377 from izeye
* pr/19377:
  Remove duplicate entry for Neo4jHealthIndicator

Closes gh-19377
2019-12-17 09:44:28 +09:00
Johnny Lim
8bbc7f7b67 Remove duplicate entry for Neo4jHealthIndicator
See gh-19377
2019-12-17 09:43:09 +09:00
Stephane Nicoll
c076b625da Merge pull request #19369 from dreis2211
* pr/19369:
  Add group property to DynatraceProperties

Closes gh-19369
2019-12-15 09:04:51 +09:00
dreis2211
b6e4c0f012 Add group property to DynatraceProperties
See gh-19369
2019-12-15 08:54:42 +09:00
Phillip Webb
6d372f60d9 Merge branch '2.1.x' into 2.2.x 2019-12-13 11:46:25 -08:00
Phillip Webb
8e03982bca Fix checkstyle violation 2019-12-13 11:45:56 -08:00
Phillip Webb
26ff18f37d Merge branch '2.1.x' into 2.2.x 2019-12-13 11:29:51 -08:00
Phillip Webb
accd830dd5 Update copyright header of changed files 2019-12-13 11:23:24 -08:00
Phillip Webb
9bdad06c10 Polish Netty SSL key alias support
See gh-19197
2019-12-13 11:21:42 -08:00
Stephane Nicoll
c3ae8bcfdc Merge branch '2.1.x' into 2.2.x
Closes gh-19362
2019-12-12 16:59:21 +01:00
Stephane Nicoll
d93206f5c6 Merge pull request #19340 from dreis2211
* pr/19340:
  Link consistently to Tomcat 9.0 docs

Closes gh-19340
2019-12-12 16:59:01 +01:00
dreis2211
207a5c5022 Link consistently to Tomcat 9.0 docs
See gh-19340
2019-12-12 16:58:37 +01:00
Stephane Nicoll
fc35384b03 Merge branch '2.1.x' into 2.2.x
Closes gh-19360
2019-12-12 16:54:04 +01:00
Stephane Nicoll
283b60d24b Merge pull request #19338 from dreis2211
* pr/19338:
  Fix link to Vaadin Spring Boot starter

Closes gh-19338
2019-12-12 16:53:50 +01:00
dreis2211
29b602d6a0 Fix link to Vaadin Spring Boot starter
See gh-19338
2019-12-12 16:53:21 +01:00
Stephane Nicoll
01753ab5a0 Merge branch '2.1.x' into 2.2.x
Closes gh-19358
2019-12-12 16:50:27 +01:00
Stephane Nicoll
bf397412e6 Merge pull request #19326 from jcordoba95
* pr/19326:
  Polish contribution
  Add missing assertion to SampleTestApplicationWebIntegrationTests.test()

Closes gh-19326
2019-12-12 16:47:09 +01:00
Stephane Nicoll
cd085e0641 Polish contribution
See gh-19326
2019-12-12 16:46:28 +01:00
Jorge Cordoba
f22d0c7d8e Add missing assertion to SampleTestApplicationWebIntegrationTests.test()
See gh-19326
2019-12-12 16:45:03 +01:00
Stephane Nicoll
9136f54a5c Merge pull request #19291 from dreis2211
* pr/19291:
  Simplify some Stream API usages

Closes gh-19291
2019-12-09 11:56:03 +01:00
dreis2211
b1158bf35d Simplify some Stream API usages
See gh-19291
2019-12-09 11:52:46 +01:00
Spring Buildmaster
5b92cd841d Next development version (v2.2.3.BUILD-SNAPSHOT) 2019-12-06 07:13:57 +00:00
Phillip Webb
f1c2d36793 Upgrade to Spring Batch 4.2.1
Closes gh-19073
2019-12-05 20:16:37 -08:00
Spring Buildmaster
e5303ab755 Next development version (v2.1.12.BUILD-SNAPSHOT) 2019-12-06 00:19:31 +00:00
Madhura Bhave
37d5f1dba9 Merge pull request #19196 from FunThomas424242
* pr/19196:
  Document Nitrite starter in README

Closes gh-19196
2019-12-05 13:31:56 -08:00
Huluvu424242
95d6dff56f Document Nitrite starter in README
See gh-19196
2019-12-05 13:30:54 -08:00
Madhura Bhave
ed571bab24 Merge branch '2.1.x' into 2.2.x
Closes gh-19313
2019-12-05 12:03:50 -08:00
Madhura Bhave
a5b9c0f3e8 Merge pull request #19193 from dreis2211
* pr/19193:
  Increase cache ttl in CachingOperationInvokerTests

Closes gh-19193
2019-12-05 12:02:28 -08:00
dreis2211
20ff764756 Increase cache ttl in CachingOperationInvokerTests
See gh-19193
2019-12-05 11:58:23 -08:00
Andy Wilkinson
9b0569cf81 Merge branch '2.1.x' into 2.2.x
Closes gh-19309
2019-12-05 16:15:15 +00:00
Andy Wilkinson
bc53fe0344 Recommend mockito-inline for mocking and spying of CGLib proxies
This reverts commit 52050c173c.

See gh-17817
Closes gh-19020
2019-12-05 16:13:02 +00:00
Andy Wilkinson
3c0e7ccba6 Merge branch '2.1.x' into 2.2.x
Closes gh-19304
2019-12-05 12:53:36 +00:00
Andy Wilkinson
3e2b466c28 Merge pull request #19197 from bono007
* gh-19197:
  Polish "Honour SSL key alias when using Netty"
  Honour SSL key alias when using Netty

Closes gh-19197
2019-12-05 12:48:23 +00:00
Andy Wilkinson
effdc8f359 Polish "Honour SSL key alias when using Netty"
See gh-19197
2019-12-05 12:48:13 +00:00
cbono
eda7b7c3e6 Honour SSL key alias when using Netty
See gh-19197
2019-12-05 12:10:04 +00:00
Andy Wilkinson
758b80a0fe Merge branch '2.1.x' into 2.2.x
Closes gh-19299
2019-12-05 11:53:55 +00:00
Andy Wilkinson
c6d4ff6ed5 Merge pull request #19290 from lyyprean
* gh-19290:
  Remove redundant hasText check as query always has text

Closes gh-19290
2019-12-05 11:52:47 +00:00
luoyuan
c6a184474c Remove redundant hasText check as query always has text
See gh-19290
2019-12-05 11:51:35 +00:00
Andy Wilkinson
fec61b5b1c Merge pull request #19218 from tongluyang
* gh-19218:
  Add missing closing parenthesis to the document

Closes gh-19218
2019-12-05 11:45:43 +00:00
tongluyang
95aad5b556 Add missing closing parenthesis to the document
See gh-19218
2019-12-05 11:45:22 +00:00
Andy Wilkinson
305616713a Merge pull request #19292 from dreis2211
* gh-19292:
  Upgrade to Testcontainers 1.12.4

Closes gh-19292
2019-12-05 11:38:10 +00:00
dreis2211
f190affa6b Upgrade to Testcontainers 1.12.4
See gh-19292
2019-12-05 11:37:46 +00:00
Andy Wilkinson
264d4f54ec Merge branch '2.1.x' into 2.2.x 2019-12-05 11:34:36 +00:00
Andy Wilkinson
38340522de Fix Asciidoc syntax 2019-12-05 11:33:58 +00:00
Andy Wilkinson
dc8edde0fc Merge pull request #19294
* gh-19294:
  Reduce visibility of test methods

Closes gh-19294
See gh-19287
2019-12-05 11:29:58 +00:00
dreis2211
ded476b5ec Reduce visibility of test methods
See gh-19294
See gh-19287
2019-12-05 11:29:17 +00:00
Andy Wilkinson
47b47c28a0 Reduce visibility of the Gradle plugin's test methods
See gh-19287
2019-12-05 10:24:48 +00:00