fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,208 Commits 22 Branches 339 Tags
Commit Graph

639 Commits

Author SHA1 Message Date
Phillip Webb
792f0b190d Merge branch '2.0.x' 2018-05-30 14:08:42 -07:00
Phillip Webb
2c6465abdc Merge branch '1.5.x' into 2.0.x 2018-05-30 14:08:15 -07:00
Phillip Webb
40800355c7 Merge branch '2.0.x' 2018-05-30 12:41:48 -07:00
Phillip Webb
587df6a07a Port call setHttpOnly property on Tomcat context 
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4 to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.

See gh-12580
 2018-05-30 12:23:40 -07:00
Madhura Bhave
ed08e4592f Merge branch '2.0.x' 2018-05-29 15:15:02 -07:00
Madhura Bhave
ad1283195a Fix test in "Truststore password if SSLstoreprovider present" 
See gh-13088
 2018-05-29 15:06:39 -07:00
Ian Chan
e75d45ca45 Use empty trust-store password if SSL store provider present 
For Tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the trust-store with an
empty password. Previously, if a password was supplied using the
ssl.trust-store-password property, that would be the password used to
load the trust-store and the connector would warn with "Password
verification failed" message.

Fixes gh-12688
 2018-05-29 15:02:30 -07:00
Stephane Nicoll
188ba14c17 Merge branch '2.0.x' 2018-05-29 09:22:15 +02:00
Johnny Lim
9de2a8786d Fix a wrong issue reference 
Closes gh-13284
 2018-05-29 09:21:41 +02:00
Stephane Nicoll
f91b53747a Merge branch '2.0.x' 2018-05-28 09:41:41 +02:00
Johnny Lim
f385a1cb11 Polish 
Closes gh-13243
 2018-05-28 09:36:15 +02:00
Stephane Nicoll
7462401291 Merge branch '2.0.x' 2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b Fix javadoc 
Closes gh-13274
 2018-05-28 09:26:16 +02: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
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
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
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
300f6bf4d7 Polish contribution 
Closes gh-13208
 2018-05-18 14:20:31 +02:00
Stephane Nicoll
afe6abb20d Merge branch '2.0.x' 2018-05-17 15:31:02 +02:00
Johnny Lim
75639aa682 Polish 
Closes gh-13192
 2018-05-17 15:29:50 +02:00
Andy Wilkinson
46855ab8eb Merge branch '2.0.x' 2018-05-14 20:07:57 +01:00
Andy Wilkinson
73e525a280 Merge branch '1.5.x' into 2.0.x 2018-05-14 20:07:46 +01:00
Stephane Nicoll
9b379b43ae Merge branch '2.0.x' 2018-05-14 09:33:16 +02:00
Stephane Nicoll
8f53c2e2bb Support for custom comment prefix 
Some Quartz initialization scripts have comments in a different format.

This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.

Closes gh-13041
 2018-05-14 09:32:42 +02:00
Stephane Nicoll
b17c58b114 Merge branch '2.0.x' 2018-05-14 08:23:36 +02:00
Johnny Lim
3dd2f5bb05 Polish 
See gh-13148
 2018-05-14 08:19:10 +02:00
Andy Wilkinson
efda5ef3ac Merge branch '2.0.x' 2018-05-11 16:52:29 +01:00
Andy Wilkinson
3992dacdc8 Bind empty string to empty collection or array of rich types 
Previously, when an empty String was bound to a collection or
array of rich types it would fail as there was no converter capable
of creating a Collection<RichType> or RichType[] from the String.

This commit updates IndexedElementsBinder to apply special treatment
to empty String values. Now, when such a value is being processed,
an empty Collection or array is the result.

Closes gh-12965
 2018-05-11 16:41:37 +01:00
Andy Wilkinson
2df156bd52 Merge branch '2.0.x' 2018-05-11 13:32:22 +01:00
Andy Wilkinson
45f4e8795e Merge branch '1.5.x' into 2.0.x 2018-05-11 13:32:08 +01:00
Stephane Nicoll
b0433d66c1 Merge branch '2.0.x' 2018-05-11 14:24:13 +02:00
dreis2211
e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson
d5e4a19446 Upgrade to Liquibase 3.6.1 and adapt to logging changes 
Closes gh-13145
 2018-05-11 12:37:54 +01:00
Andy Wilkinson
972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00
Johnny Lim
75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Andy Wilkinson
fbf974478a Merge branch '1.5.x' into 2.0.x 2018-05-10 15:46:28 +01:00
Stephane Nicoll
9dccf5b895 Polish 
See gh-13078
 2018-05-07 14:48:56 +02:00
dreis2211
e3862d9bdf Fix deprecation warning in OriginTrackedYamlLoader 
Closes gh-13085
 2018-05-07 14:38:22 +02:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
57bfbfb3ad Fix checkstyle errors 2018-05-04 15:58:59 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00