Commit Graph

17900 Commits

Author SHA1 Message Date
Stephane Nicoll d0f272960e Merge branch '2.0.x' 2018-08-15 10:43:28 +03:00
Stephane Nicoll df779b4eeb Merge pull request #14049 from izeye:polish-20180813
* pr/14049:
  Polish
2018-08-15 10:43:18 +03:00
Johnny Lim b4abccc07c Polish
See gh-14049
2018-08-15 10:43:04 +03:00
Andy Wilkinson e0d67ae703 Avoid Atmosphere using a null URL to create a URLClassLoader
Unlike Java 8, 9, and 10, Java 11 does not tolerate a null URL being
used to create a URLClassLoader. The Atmosphere sample looks for
a resource named /WEB-INF/classes which only exists in a packaged
war application. In all other cases the resulting URL is null.
Atmosphere uses this to create a URLClassLoader which fails on Java
11.

This commit updates the sample to customize the handlers path. There
are other web application-specific assumptions in Atmosphere, such as
the scanning of WEB-INF/lib by default. This change appears to get
the sample going, but we should, perhaps, consider removing it in the
longer term, particularly as Boot itself has no Atmosphere
integration.

See gh-14028
2018-08-15 08:34:24 +01:00
Madhura Bhave 1dd8c83d77 Merge pull request #14065 from jzheaux
* gh-14065:
  Polish "Update OIDC configuration"
  Update OIDC config following Spring Security changes
2018-08-14 15:32:00 -07:00
Madhura Bhave baaf8c95ff Polish "Update OIDC configuration"
Closes gh-14065
2018-08-14 15:31:29 -07:00
Josh Cummings e34723efd2 Update OIDC config following Spring Security changes
The location changed for the class that provides a ClientRegistration
via an issuer URL, and this updates Spring Boot accordingly.
2018-08-14 15:31:29 -07:00
Andy Wilkinson 0fb02ab6a0 Merge pull request #14062 from Spencer Gibb
* gh-14062:
  Exclude protobuf-java from mysql-connector-java
2018-08-14 20:01:17 +01:00
Spencer Gibb 8427341480 Exclude protobuf-java from mysql-connector-java
Closes gh-14062
2018-08-14 20:01:07 +01:00
Madhura Bhave a8a75f1bbb Merge branch '2.0.x' 2018-08-14 11:25:24 -07:00
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