root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 18 Packages Projects Releases Wiki Activity
17,878 Commits 23 Branches 356 Tags 275 MiB
Commit Graph

17878 Commits

Author SHA1 Message Date
Stephane Nicoll e7b5d95681 Adapt ServerProperties with a default size to DataSize 
See gh-13974
 2018-08-13 16:43:23 +03:00
Stephane Nicoll 6734e11222 Adapt MultipartConfig to use DataSize support 
See gh-13974
 2018-08-13 16:43:23 +03:00
Stephane Nicoll 94013aaba6 Add support for DataSize 
This commit adds support for Spring Framework's `DataSize` allowing to
express a size in bytes and other convenient units.

Similar to the `Duration` support introduced previously, this commit
adds transparent binding support as well as detection of default values
in `@ConfigurationProperties`-annotated object.

Closes gh-13974
 2018-08-13 16:43:23 +03:00
Andy Wilkinson 78dd7bd934 Merge branch '2.0.x' 2018-08-13 13:18:55 +01:00
Andy Wilkinson 6e5ff77bb0 Merge branch '1.5.x' into 2.0.x 
The 3.0.1 version of the Maven Javadoc Plugin contains a bug [1] that
means that a link URL must redirect otherwise it is ignored.

[1] https://issues.apache.org/jira/browse/MJAVADOC-532
 2018-08-13 13:16:50 +01:00
Andy Wilkinson f63a95ed91 Align link configuration with the needs of the Maven Javadoc Plugin 
The -link parameters passed into the javadoc executable are used
as-is. For example, redirects are not followed. Unlike 3.x, 2.x of the
Maven javadoc plugin does not attempt to follow redirects before links
are passed to the javadoc executable. As a result, for external links
to work, the links that we provide must be canonical and produce a
200 response when accessed.

Closes gh-14031
 2018-08-13 13:00:32 +01:00
Andy Wilkinson 76d9b1cdbd Merge branch '2.0.x' 2018-08-13 12:30:10 +01:00
Andy Wilkinson 58aaf4863f Merge pull request #14032 from Nikolay Rybak 
* gh-14032:
  Propagate retryWrites flag from connection URI to ReactiveMongoClient
 2018-08-13 12:30:00 +01:00
Nikolay Rybak 7759dcd9df Propagate retryWrites flag from connection URI to ReactiveMongoClient 
Closes gh-14032
 2018-08-13 12:10:47 +01:00
Andy Wilkinson e41519b6b1 Merge branch '2.0.x' 2018-08-13 11:38:56 +01:00
Andy Wilkinson 29e38f4af8 Merge branch '1.5.x' into 2.0.x 2018-08-13 11:35:46 +01:00
Andy Wilkinson 384cfd2ad8 Preserve ref and query when creating URL in loader's handler 
Closes gh-14011
 2018-08-13 11:30:15 +01:00
Stephane Nicoll 095036bddb Merge pull request #14043 from dreis2211:add-missing-override 
* pr/14043:
  Add missing @Override
 2018-08-13 13:14:20 +03:00
dreis2211 c9bdc98935 Add missing @Override 
Closes gh-14043
 2018-08-13 13:14:02 +03:00
Stephane Nicoll eede660b84 Merge branch '2.0.x' 2018-08-13 13:11:08 +03:00
Stephane Nicoll f4b0101632 Merge branch '1.5.x' into 2.0.x 2018-08-13 13:10:05 +03:00
Stephane Nicoll 3a2c962215 Merge pull request #14046 from frohwerk:master 
* pr/14046:
  Fix freemarker documentation link
 2018-08-13 13:04:18 +03:00
frohwerk a9f4dbd160 Fix freemarker documentation link 
Closes gh-14046
 2018-08-13 13:03:46 +03:00
Andy Wilkinson da550efc6b Merge branch '2.0.x' 2018-08-10 12:50:31 +01:00
Andy Wilkinson 263e157ef0 Merge branch '1.5.x' into 2.0.x 2018-08-10 12:50:15 +01:00
Stephane Nicoll bfd616ac7a Prevent JavaFX to be added to the classpath with Java 11 
See https://hibernate.atlassian.net/browse/HV-1644
 2018-08-10 13:46:39 +02:00
Andy Wilkinson 37bd286985 Perform failure analysis of NoSuchMethodErrors 
Closes gh-14040
 2018-08-10 12:35:08 +01:00
Stephane Nicoll 0d04d7adf8 Migrate @EventListener to ApplicationListener 
Closes gh-14041
 2018-08-10 12:52:14 +02:00
Stephane Nicoll 9d40df9a2a Upgrade to Mockito 2.21.0 
Closes gh-14039
 2018-08-10 09:55:09 +02:00
Stephane Nicoll ca8bdc8a72 Resume building against Spring Framework snapshots 
See gh-14038
 2018-08-10 09:53:10 +02:00
Stephane Nicoll 817a8a8302 Polish 2018-08-10 09:48:57 +02:00
Stephane Nicoll 0ca8f1083a Fix ClassCastException message detection on Java 11 
This commit also fixes the detection of a ClassCastException that can
be safely ignored on the module path with Java 9

Closes gh-14033
 2018-08-10 09:48:22 +02:00
Stephane Nicoll 295995829f Remove outdated Java10 profile 2018-08-09 13:33:03 +02:00
Andy Wilkinson 2756d87b3f Merge branch '2.0.x' 2018-08-09 11:15:13 +01:00
Andy Wilkinson 718372edb2 Merge pull request #14019 from ayudovin 
* gh-14019:
  Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
  Fix NPE in FlywayEndpoint when migration.installedOn is null
 2018-08-09 11:11:45 +01:00
Andy Wilkinson 27f5e46587 Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null" 
Closes gh-14019
 2018-08-09 11:10:21 +01:00
artsiom 83fbdc6ea8 Fix NPE in FlywayEndpoint when migration.installedOn is null 
See gh-14019
 2018-08-09 11:10:02 +01:00
Stephane Nicoll c5113885cd Merge pull request #14025 from izeye:max-swallow-size-default-value 
* pr/14025:
  Align server.tomcat.max-swallow-size with Tomcat's default value
 2018-08-09 09:56:49 +02:00
Johnny Lim b90113ac33 Align server.tomcat.max-swallow-size with Tomcat's default value 
Closes gh-14025
 2018-08-09 09:56:23 +02:00
Stephane Nicoll b5c3c33bd7 Merge pull request #14024 from izeye:polish-item-metadata-build-name 
* pr/14024:
  Polish ItemMetadata.buildName()
 2018-08-09 09:48:15 +02:00
Johnny Lim 05a7d21305 Polish ItemMetadata.buildName() 
Closes gh-14024
 2018-08-09 09:47:02 +02:00
Stephane Nicoll 243278d5ca Merge pull request #14023 from izeye:polish-20180809 
* pr/14023:
  Polish
 2018-08-09 09:32:27 +02:00
Johnny Lim 101cc59b7d Polish 
Closes gh-14023
 2018-08-09 09:32:10 +02:00
Madhura Bhave c8570a9459 Merge branch '2.0.x' 2018-08-08 15:06:56 -07:00
Madhura Bhave 26af0ca742 Increase wait timeout for bintray to 20 min 
Closes gh-13947
 2018-08-08 15:05:54 -07:00
Stephane Nicoll a12ca0a0dc Merge branch '2.0.x' 2018-08-08 16:05:34 +02:00
Stephane Nicoll a023bd030a Add configurable timeout for Couchbase health indicator 
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
 2018-08-08 16:01:58 +02:00
Stephane Nicoll 7b191bb9ed Merge branch '2.0.x' 2018-08-08 14:47:16 +02:00
Stephane Nicoll 21691f0b20 Merge branch '1.5.x' into 2.0.x 2018-08-08 14:46:55 +02:00
Stephane Nicoll 2135f7fda4 Merge pull request #14001 from izeye:gh-13935 
* pr/14001:
  Invoke Inflater.end() in ZipInflaterInputStream.close()
 2018-08-08 14:46:38 +02:00
Johnny Lim af2db82b22 Invoke Inflater.end() in ZipInflaterInputStream.close() 
Closes gh-14001
 2018-08-08 14:45:59 +02:00
Stephane Nicoll 48d365aba4 Fix checkstyle rule 2018-08-08 13:04:08 +02:00
Stephane Nicoll 13d5b00fe7 Merge branch '2.0.x' 2018-08-08 11:13:15 +02:00
Stephane Nicoll fbf3c48bf8 Fix setter detection in `configprops` endpoint 
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).

This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.

Closes gh-13878
 2018-08-08 11:13:03 +02:00
Stephane Nicoll aa0739e3b7 Fix checkstyle rule 2018-08-08 10:33:34 +02:00