Commit Graph

2111 Commits

Author SHA1 Message Date
Stephane Nicoll 406192741e Upgrade to Maven Exec Plugin 1.6.0
Closes gh-13101
2018-05-14 11:19:46 +02:00
Stephane Nicoll 37324785fc Merge branch '2.0.x' 2018-05-14 11:09:15 +02:00
Stephane Nicoll caa271dcc1 Merge branch '1.5.x' into 2.0.x 2018-05-14 11:08:59 +02: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
Johnny Lim fb2ab67f4f Polish
Closes gh-13148
2018-05-14 08:24:01 +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
Stephane Nicoll 15edd02e1d Merge branch '2.0.x' 2018-05-14 08:13:40 +02:00
Johnny Lim aa60d60b8a Polish JpaProperties.determineDdlAuto()
Closes gh-13036
2018-05-14 08:13:06 +02:00
Stephane Nicoll 8e9a873787 Polish "Improve LDAP auto-configuration conditions"
Closes gh-13143
2018-05-11 17:59:21 +02:00
Vedran Pavic dfceede0bc Improve LDAP auto-configuration conditions
At present, auto-configuration of `LdapContextSource` is conditional on
presence of a `ContextSource` bean. However, there are valid use cases
which require multiple `ContextSource` bean, for instance
`PooledContextSource`. With the current arrangement, the
auto-configuration of `LdapContextSource` will back off if user provides
a `PooledContextSource` bean, while it would still be reasonable to
reuse the auto-configured `LdapContextSource`.

This commit improves `LdapContextSource` factory method return value and
condition to back off only if users actually provide a
`LdapContextSource` bean themselves.

See gh-13143
2018-05-11 17:59:21 +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
Stephane Nicoll 1afab3a886 Merge pull request #13136 from vpavic:improve-ldap-autoconfig
* pr/13136:
  Polish "Improve LDAP auto-configuration"
  Improve LDAP auto-configuration
2018-05-11 14:44:17 +02:00
Stephane Nicoll a0a0bea427 Polish "Improve LDAP auto-configuration"
Closes gh-13136
2018-05-11 14:37:32 +02:00
Vedran Pavic f81f50c119 Improve LDAP auto-configuration
Auto-configuration of LDAP's `LdapTemplate` is currently a part of
`LdapDataAutoConfiguration` which is conditional of presence of
`LdapRepository` (i.e. Spring Data LDAP). This arrangement isn't ideal
since the `LdapTemplate` is a part of Spring LDAP project, and therefore
should not be tied to Spring Data LDAP.

This commit improves and simplifies LDAP auto-configuration by moving
`LdapTemplate` configuration to `LdapAutoConfiguration`. Consequently,
`LdapDataAutoConfiguration` is not needed anymore and is removed.

See gh-13136
2018-05-11 14:37:13 +02: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 ae74ce9b39 Merge branch '2.0.x' 2018-05-11 14:28:38 +02:00
Vedran Pavic a08fa27c39 Add .gitignore for Gradle Plugin module
Closes gh-13137
2018-05-11 14:28:02 +02: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 b88a20fabb Polish 2018-05-11 13:05:17 +01:00
Andy Wilkinson a325b13d05 Polish "Auto-configure a ResourceConfig for Jersey endpoints if needed"
Closes gh-11948
2018-05-11 12:49:44 +01:00
Michael J. Simons bb2864ad02 Auto-configure a ResourceConfig for Jersey endpoints if needed
See gh-11948
2018-05-11 12:49:31 +01: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 39d7382129 Merge branch '2.0.x' 2018-05-11 11:54:19 +01:00
Andy Wilkinson 972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00
Andy Wilkinson 079b67c53b Merge branch '2.0.x' 2018-05-11 11:16:11 +01:00
Andy Wilkinson 7913d9b599 Add methods to BootJar for adding content to BOOT-INF
Closes gh-13000
2018-05-11 11:14:14 +01:00
Andy Wilkinson 07251a09d1 Merge branch '2.0.x' 2018-05-11 10:32:05 +01:00
Andy Wilkinson d9d7499ae6 Merge branch '1.5.x' into 2.0.x 2018-05-11 10:31:52 +01:00
Stephane Nicoll 360f4e17c2 Add support for PageableHandlerMethodArgumentResolver in WebMvcTest
Closes gh-13066
2018-05-11 10:37:17 +02:00
Stephane Nicoll 5e87a3d2fa Polish
See gh-13130
2018-05-11 10:03:03 +02:00
Stephane Nicoll 00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim 75e591e76e Polish
Closes gh-13130
2018-05-11 10:00:15 +02:00
Stephane Nicoll c35cb1b69f Merge branch '2.0.x' 2018-05-11 09:57:18 +02:00
Stephane Nicoll 4683940423 Merge branch '1.5.x' into 2.0.x 2018-05-11 09:56:54 +02:00
Stephane Nicoll a11acbc829 Merge branch '2.0.x' 2018-05-11 08:55:21 +02:00
Stephane Nicoll 4bec3b7cd9 Polish
See gh-13123
2018-05-11 08:55:03 +02:00
Madhura Bhave ea99d8cab0 Merge branch '2.0.x' 2018-05-10 11:53:25 -07:00
Madhura Bhave 05cf8229d9 Fix tests 2018-05-10 11:50:43 -07:00
Madhura Bhave 36c89e2383 Merge branch '2.0.x' 2018-05-10 10:01:42 -07:00
Madhura Bhave c937bb68a0 ServletEndpoints should take servletPath into account
Fixes gh-13106
2018-05-10 10:01:11 -07:00
Andy Wilkinson 0b76fc8f8e Merge branch '2.0.x' 2018-05-10 15:46:47 +01:00
Andy Wilkinson fbf974478a Merge branch '1.5.x' into 2.0.x 2018-05-10 15:46:28 +01:00
Madhura Bhave 36c7602f2a Merge branch '2.0.x' 2018-05-09 12:04:34 -07:00
Madhura Bhave 4ec87956f9 Fix EndpointRequest include/exclude for ServletEndpoints
Fixes gh-13089
2018-05-09 12:01:58 -07:00
Stephane Nicoll c72df104d8 Improve caches endpoint format
This commit adds an intermediate "caches" element so that additional
cache manager attributes can be added in the future.

Closes gh-13079
2018-05-09 11:08:23 +02:00