Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,823 Commits 23 Branches 0 Tags
1bb53ff44cd83a66fae3e4310bb9f22ad8e95109
Commit Graph

16823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
1bb53ff44c Merge branch '2.0.x' 2018-05-26 12:44:50 +02:00
Stephane Nicoll
feee8b5db6 Merge pull request #13266 from aheritier:patch-2 
* pr/13266:
  Add missing semicolon in example
 2018-05-26 12:44:36 +02:00
Arnaud Heritier
b60eadb10b Add missing semicolon in example 
Closes gh-13266
 2018-05-26 12:44:11 +02:00
Phillip Webb
68ffbafbae Fix checkstyle violations 2018-05-26 00:01:45 -07:00
Phillip Webb
3702da4573 Formatting 2018-05-25 23:52:38 -07:00
Phillip Webb
2215709165 Merge branch '2.0.x' 2018-05-25 23:50:39 -07:00
Phillip Webb
6f0ccc64a5 Fix checkstyle violations 2018-05-25 23:03:17 -07:00
Phillip Webb
9fd3b9103a Format code 2018-05-25 23:02:45 -07:00
Phillip Webb
e544922dd7 Merge branch '1.5.x' into 2.0.x 2018-05-25 23:02:08 -07:00
Phillip Webb
e75d8eaf40 Switch to spring-javaformat plugin 
Use `spring-javaformat` to format and check code. Code formatting can
now be applied using the `spring-javaformat-maven-plugin` from the
command line. Existing checkstyle rules have also been replaced and
the CONTRIBUTING.adoc file has been updated.

Closes gh-13255
 2018-05-25 20:59:04 -07:00
Phillip Webb
5626b7a50d Merge branch '2.0.x' 2018-05-25 20:58:31 -07:00
Phillip Webb
9c5f207e22 Fix merge error 2018-05-25 20:57:46 -07:00
Phillip Webb
d8157c94f3 Merge branch '2.0.x' 2018-05-25 19:48:37 -07:00
Phillip Webb
21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Phillip Webb
e69296d7d3 Fix checkstyle violations in samples 2018-05-25 18:18:00 -07:00
Phillip Webb
4853477081 Reformat code 2018-05-25 18:17:37 -07:00
Stephane Nicoll
75c10e615e Merge branch '2.0.x' 2018-05-25 16:45:57 +02:00
Stephane Nicoll
606eb9dda3 Merge pull request #13260 from torakiki:patch-1 
* pr/13260:
  Fix documentation error
 2018-05-25 16:45:45 +02:00
Andrea Vacondio
aed118c410 Fix documentation error 
Closes gh-13260
 2018-05-25 16:43:35 +02:00
Madhura Bhave
940c3d1b75 Merge branch '2.0.x' 2018-05-25 10:39:22 +02:00
Madhura Bhave
552878c431 Fix javadoc 2018-05-25 10:37:39 +02:00
Stephane Nicoll
79967a482a Merge branch '2.0.x' 2018-05-24 11:44:10 +02:00
Stephane Nicoll
a5b53b263e Merge branch '1.5.x' into 2.0.x 2018-05-24 11:43:48 +02:00
Stephane Nicoll
625f428aad Upgrade to gson 2.8.5 
Closes gh-13245
 2018-05-24 11:40:54 +02:00
Stephane Nicoll
8997143f31 Fix checkstyle violations 2018-05-24 11:40:54 +02:00
Stephane Nicoll
4464a5f5bd Remove code deprecated in 2.0 
Closes gh-12962
 2018-05-22 14:48:25 +02:00
Stephane Nicoll
1ea3e95ff6 Merge branch '2.0.x' 2018-05-22 13:40:51 +02:00
Stephane Nicoll
585135a280 Polish 2018-05-22 13:40:40 +02:00
Stephane Nicoll
d5abd57a91 Remove deprecated use of spring.main.web-environment 
Closes gh-13231
 2018-05-22 13:39:02 +02:00
Stephane Nicoll
12bbb18844 Merge branch '2.0.x' 2018-05-22 12:51:31 +02:00
Stephane Nicoll
a124379dd9 Remove use of deprecated web methods 
Closes gh-13231
 2018-05-22 12:51:06 +02:00
Stephane Nicoll
699b6ce6dc Remove reference to Jersey 1 
Closes gh-12582
 2018-05-22 10:50:27 +02:00
Stephane Nicoll
65738e63fb Polish 2018-05-22 08:28:09 +02:00
Phillip Webb
c5f63c19a4 Merge branch '2.0.x' 2018-05-21 21:38:32 -07:00
Phillip Webb
2dc4f1df00 Polish 2018-05-21 21:32:42 -07:00
Phillip Webb
e47e499af2 Merge branch '2.0.x' 2018-05-21 17:26:40 -07:00
Phillip Webb
f84014d7df Add save_build_info param to maven sync job 
Update CI pipeline so that the `sync-to-maven-central` job has access
to the artifactory build info.

Closes gh-13223
 2018-05-21 17:24:43 -07:00
Phillip Webb
40e68a6427 Merge branch '2.0.x' 2018-05-21 17:20:04 -07:00
Phillip Webb
6d8b4710d7 Merge branch '1.5.x' into 2.0.x 2018-05-21 17:18:49 -07:00
Phillip Webb
9f4f229b83 Polish title case in CONTRIBUTING.md 2018-05-21 17:10:52 -07:00
Phillip Webb
2fa057a06c Document how to raise security issues 
Update contributing documentation and the issue template with
instructions on how to report security vulnerabilities.

Closes gh-12509
 2018-05-21 17:07:44 -07:00
Phillip Webb
37646517cf Polish 2018-05-21 15:17:42 -07:00
Stephane Nicoll
074bbaa579 Merge pull request #13139 from izeye:type-parameter 
* pr/13139:
  Use type parameter for Supplier in AggregateBinder.merge()
 2018-05-18 14:46:51 +02:00
Johnny Lim
d72ba70cba Use type parameter for Supplier in AggregateBinder.merge() 
Closes gh-13139
 2018-05-18 14:35:16 +02:00
Stephane Nicoll
243023f2ad Merge branch '2.0.x' 2018-05-18 14:26:31 +02:00
Stephane Nicoll
c1236ed81b Merge pull request #13208 from mihhail-lapushkin:master 
* pr/13208:
  Polish contribution
  Support custom UriTemplateHandler in LocalHostUriTemplateHandler
 2018-05-18 14:26:18 +02:00
Stephane Nicoll
300f6bf4d7 Polish contribution 
Closes gh-13208
 2018-05-18 14:20:31 +02:00
Mihhail Lapushkin
d31dbac69e Support custom UriTemplateHandler in LocalHostUriTemplateHandler 
See gh-13208
 2018-05-18 14:19:01 +02:00
Stephane Nicoll
27c60e3deb Merge branch '2.0.x' 2018-05-18 13:42:57 +02:00
Stephane Nicoll
48cf025093 Polish 2018-05-18 13:42:45 +02:00