Madhura Bhave
895d092640
PropertySourcesLoader with highest precedence should win
...
Fixes gh-13955
2018-08-14 11:23:55 -07:00
Andy Wilkinson
e3e3a44045
Merge branch '2.0.x'
2018-08-14 12:33:11 +01:00
Andy Wilkinson
1973e342c9
Do not use lambda for task action as it breaks up-to-date checks
...
Due to gradle/gradle#5510 , using a lambda for a task action breaks
up-to-date checks in certain circumstances.
This commit updates JavaPluginAction to use an inner-class in place
of a lambda for the action that it adds to JavaCompile tasks. A test
has not been added as it does not appear to be possible to reproduce
it with a TestKit-based test.
Closes gh-14054
2018-08-14 12:32:36 +01:00
Stephane Nicoll
f187ab72a4
Polish
2018-08-14 11:00:20 +03:00
Andy Wilkinson
9032e5b470
Update SSL tests and certs for Java 11 and TLSv1.3
...
See gh-14028
2018-08-14 08:51:38 +03:00
Stephane Nicoll
10fe9ba0d9
Merge branch '2.0.x'
2018-08-14 08:49:45 +03:00
Stephane Nicoll
da1858f620
Upgrade to Hibernate Validator 6.0.12.Final
...
Closes gh-14053
2018-08-14 08:48:16 +03:00
Madhura Bhave
1e5611d02d
Merge branch '2.0.x'
2018-08-13 14:04:59 -07:00
Madhura Bhave
e6a69119ef
Add trigger for 2.0.x-based pull requests
...
Closes gh-14034
2018-08-13 14:02:48 -07:00
Madhura Bhave
727e9c6b0f
Merge branch '2.0.x'
2018-08-13 12:23:48 -07:00
Madhura Bhave
dfb97eb0f5
Convert environment if webApplicationType changes
...
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.
Fixes gh-13977
2018-08-13 12:12:30 -07:00
Andy Wilkinson
04215e6651
Polish
2018-08-13 15:59:48 +01:00
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