Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,490 Commits 23 Branches 0 Tags
38891f7594debeef320ebcfc7050e9234f407dcf
Commit Graph

27490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
f9bd472192 Polish upgrade to spring-javaformat 0.0.15 
See gh-17359
 2019-06-29 20:27:47 +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
d91f27e11f Fix Javadoc @Since checkstle violations 
Apply consistent `@Since` tags and retrofit the existing code using a
best guess from the git history.

Closes gh-17360
 2019-06-28 22:41:15 -07:00
Phillip Webb
fc7a99d0df Merge branch '2.1.x' 
Closes gh-17362
 2019-06-28 21:35:49 -07:00
Phillip Webb
6425fb6ec8 Merge branch '2.0.x' into 2.1.x 
Closes gh-17361
 2019-06-28 21:34:35 -07:00
Phillip Webb
4f079803d2 Merge branch '1.5.x' into 2.0.x 
Closes gh-17359
 2019-06-28 21:29:20 -07:00
Phillip Webb
dc5c5702f8 Enforce stricter javadoc @Since rules 
See gh-17360
 2019-06-28 21:16:27 -07:00
Phillip Webb
9433ad2222 Ignore SpringMethodVisibility check 
Ignore the new `SpringMethodVisibility` on released versions since
the required changes can introduce subtle bugs.

See gh-17359
 2019-06-28 21:15:01 -07:00
Phillip Webb
b0fffbe42e Upgrade to spring-javaformat 0.0.15 
Closes gh-17359
 2019-06-28 21:14:00 -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
Phillip Webb
6d01bc915b Make intermediate classes of public classes public 
Backport gh-12590 to 1.5.x and also pick up a few classes that were
missed. This commit also makes a few properties bound classes public.

Closes gh-17337
 2019-06-28 12:18:07 -07:00
Madhura Bhave
7e22901bb2 Fail build on unresolved documentation links 
Closes gh-12005
 2019-06-28 12:04:30 -07:00
Andy Wilkinson
d9bf7e936d Merge pull request #17290 from rossdrew 
* gh-17290:
  Remove hyphenation of opaquetoken in OAuth2 property names

Closes gh-17290
 2019-06-28 15:03:57 +01:00
rossdrew
d6977ea89f Remove hyphenation of opaquetoken in OAuth2 property names 
See gh-17290
 2019-06-28 14:48:56 +01:00
Phillip Webb
8edf88a08b Polish M2Eclipse ignore configuration 
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
 2019-06-27 09:42:14 -07:00
Andy Wilkinson
859b088bca Correct visibility of JUnit 5 lifecycle methods in smoke tests 
See gh-17292
 2019-06-27 15:04:10 +01:00
Andy Wilkinson
66f1344f7c Merge branch '2.1.x' 
Closes gh-17335
Closes gh-17292
 2019-06-27 12:00:34 +01:00
Andy Wilkinson
91786bc712 Merge branch '2.0.x' into 2.1.x 
Closes gh-17334
 2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Andy Wilkinson
1ee8c53b90 Upgrade to spring-javaformat 0.0.14 
Closes gh-17331
 2019-06-27 11:10:13 +01:00
Andy Wilkinson
867c35a2f6 Merge branch '2.1.x' 
Closes gh-17306
 2019-06-27 10:42:11 +01:00
Andy Wilkinson
096951d531 Merge branch '2.0.x' into 2.1.x 
Closes gh-17305
 2019-06-27 10:41:37 +01:00
Andy Wilkinson
57bc03ac57 Merge branch '1.5.x' into 2.0.x 2019-06-27 10:22:02 +01:00
Madhura Bhave
8730f32a78 Merge pull request #17323 from htztomic 
* pr/17323:
  Provide ability to add additional connectors on reactive Tomcat

Closes gh-17323
 2019-06-26 15:42:13 -07:00
HaiTao Zhang
d9048d2531 Provide ability to add additional connectors on reactive Tomcat 
See gh-17323
 2019-06-26 15:36:12 -07:00
Madhura Bhave
a4fd141622 Merge branch '2.1.x' 
Closes gh-17325
 2019-06-26 11:51:45 -07:00
Madhura Bhave
74912ee126 Remove setting.xml from .gitignore 
Closes gh-17309
 2019-06-26 11:50:51 -07:00
Andy Wilkinson
361a9404fd Merge branch '2.1.x' 
Closes gh-17321
 2019-06-26 17:40:44 +01:00
Andy Wilkinson
3fb06ee29e Merge branch '2.0.x' into 2.1.x 
Closes gh-17320
 2019-06-26 17:39:13 +01:00
Andy Wilkinson
4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Andy Wilkinson
72f7985219 Drop back to Eclipse 2019-03 to avoid m2e regression 
Closes gh-15200
 2019-06-26 17:31:00 +01:00
Andy Wilkinson
0cfcfb104e Link to Apache Licence in Maven Plugin docs rather than inlining it 
Closes gh-17317
 2019-06-26 17:31:00 +01:00
Andy Wilkinson
b67fedd749 Start building against Spring Kafka 2.3.0.M4 snapshots 
See gh-17319
 2019-06-26 16:55:48 +01:00
Madhura Bhave
e0ecd09aee Merge branch '2.1.x' 
Closes gh-17311
 2019-06-25 18:07:45 -07:00
Madhura Bhave
26b61e6f8d Fix deprecation warnings in pipeline.yml 
Closes gh-17310
 2019-06-25 17:48:57 -07:00
Madhura Bhave
c9d6617713 Fix CI scripts following samples rename 
See gh-17197
 2019-06-25 16:59:58 -07:00
Madhura Bhave
0545a1396c Reinstante settings.xml for smoke test 
This got lost when the samples were renamed to smoke tests

See gh-17197
 2019-06-25 16:59:46 -07:00
Madhura Bhave
d5c0009c6e Rename samples to smoke tests 
Closes gh-17197
 2019-06-25 11:32:56 -07:00
Phillip Webb
0b720b99b2 Merge branch '2.1.x' 
Closes gh-17308
 2019-06-25 11:19:57 -07:00
Phillip Webb
02e705c8e4 Relax nohttp requirement for service.wsdl 
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
 2019-06-25 11:17:27 -07:00
Andy Wilkinson
76e1fb4a1e Merge branch '2.1.x' 
Closes gh-17306
 2019-06-25 16:26:26 +01:00
Andy Wilkinson
7e4111954f Merge branch '2.0.x' into 2.1.x 
Closes gh-17305
 2019-06-25 16:25:46 +01:00
Andy Wilkinson
23e119c239 Merge branch '1.5.x' into 2.0.x 2019-06-25 16:25:24 +01:00