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

24622 Commits

Author SHA1 Message Date
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 e2a8017aff Merge pull request #19328 from filiphr 
* pr/19328:
  Polish "Detect DirContextAuthenticationStrategy bean"
  Detect DirContextAuthenticationStrategy bean

Closes gh-19328
 2019-12-09 16:00:52 +01:00
Stephane Nicoll aa821151bb Polish "Detect DirContextAuthenticationStrategy bean" 
See gh-19328
 2019-12-09 15:58:44 +01:00
Filip Hrisafov c108d2d011 Detect DirContextAuthenticationStrategy bean 
This commit improves the LDAP auto-configuration to detect if a
DirContextAuthenticationStrategy bean is defined and, if so, associates
it with the auto-configured `LdapContextSource`.

See gh-19328
 2019-12-09 15:58:25 +01:00
Stephane Nicoll 20bebdc07d Merge branch '2.2.x' 
Closes gh-19331
 2019-12-09 11:58:58 +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 eb0eb492b4 Don't ignore `build` folders 
Closes gh-19318
 2019-12-05 21:52:31 -08:00
Phillip Webb d2ebf5de0e Merge branch '2.2.x' 
Closes gh-19317
 2019-12-05 20:17:47 -08: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 1071f969bf Merge branch '2.2.x' 
Closes gh-19315
 2019-12-05 13:32:26 -08: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 b42bc1b23d Merge branch '2.2.x' 
Closes gh-19314
 2019-12-05 12:04:46 -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 6a8d7218b6 Merge branch '2.2.x' 
Closes gh-19310
 2019-12-05 16:15:38 +00: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 4957994def Merge branch '2.2.x' 
Closes gh-19305
 2019-12-05 12:54:21 +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 ae5ec4e41a Merge branch '2.2.x' 
Closes gh-19300
 2019-12-05 11:54:18 +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 9f1e760054 Merge branch '2.2.x' 
Closes gh-19298
 2019-12-05 11:46:02 +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 4dc74793e1 Merge branch '2.2.x' 
Closes gh-19297
 2019-12-05 11:38:40 +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 10d593eeee Merge branch '2.2.x' 2019-12-05 11:34:44 +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 a5f8975f4c Merge branch '2.2.x' 
Closes gh-19296
 2019-12-05 11:30:27 +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 ab4e1c465f Merge branch '2.2.x' 
See gh-19288
 2019-12-05 10:25:12 +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
Andy Wilkinson 9b88edbcf9 Merge branch '2.2.x' 
Closes gh-19153
 2019-12-05 10:07:00 +00:00
Andy Wilkinson a2451a4f29 Merge branch '2.1.x' into 2.2.x 
Closes gh-19152
 2019-12-05 10:06:32 +00:00
Andy Wilkinson b46bb726ca Clarify limitations of @PropertySource 
Closes gh-18900
 2019-12-05 10:05:50 +00:00