Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,290 Commits 23 Branches 0 Tags
2fc12bc36c42e2a6bcb2d7117d905dae7f6b33b2
Commit Graph

24290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
2fc12bc36c Merge branch '2.2.x' 2019-12-13 11:30:13 -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
Madhura Bhave
51e558b08d Merge pull request #19364 from dreis2211 
* pr/19364:
  Fix unknown tag in javadoc

Closes gh-19364
 2019-12-12 17:05:09 -08:00
dreis2211
3be05f61e1 Fix unknown tag in javadoc 
See gh-19364
 2019-12-12 17:04:25 -08:00
Madhura Bhave
8dcf1e4033 Provide end-to-end traceability for config properties 
Closes gh-14880

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
 2019-12-12 17:02:46 -08:00
Madhura Bhave
8f5777cf9e Optimize JarLauncher when used with exploded jar 
- Previously, we would create a JarFileArchive for all nested jars.
This was an additional overhead. We only need to create a JarFileArchive
for jars that can have nested jars in them. For all other jars we only need
the URL to build the classpath.
- While iterating over nested entries in the exploded jar, we only need to
look at BOOT-INF and we can skip any entry that does not match that.

Closes gh-16655

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
 2019-12-12 14:33:48 -08:00
Stephane Nicoll
58022d72f5 Merge branch '2.2.x' 
Closes gh-19363
 2019-12-12 16:59:46 +01: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
1d3554de06 Merge branch '2.2.x' 
Closes gh-19361
 2019-12-12 16:54:31 +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
2c38f09911 Merge branch '2.2.x' 
Closes gh-19359
 2019-12-12 16:51:08 +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
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