560 Commits

Author SHA1 Message Date
Phillip Webb
3702da4573 Formatting 2018-05-25 23:52:38 -07: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
Phillip Webb
5626b7a50d Merge branch '2.0.x' 2018-05-25 20:58:31 -07:00
Phillip Webb
9c5f207e22 Fix merge error 2018-05-25 20:57:46 -07:00
Phillip Webb
d8157c94f3 Merge branch '2.0.x' 2018-05-25 19:48:37 -07:00
Phillip Webb
21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Stephane Nicoll
4464a5f5bd Remove code deprecated in 2.0
Closes gh-12962
2018-05-22 14:48:25 +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
Phillip Webb
40e68a6427 Merge branch '2.0.x' 2018-05-21 17:20:04 -07:00
Phillip Webb
6d8b4710d7 Merge branch '1.5.x' into 2.0.x 2018-05-21 17:18:49 -07:00
Stephane Nicoll
8364d121b1 Merge branch '2.0.x' 2018-05-17 16:18:17 +02:00
Stephane Nicoll
125b5974c0 Merge branch '1.5.x' into 2.0.x 2018-05-17 16:17:55 +02:00
Johnny Lim
b7fe3a5332 Make ErrorProperties.whitelabel final
Closes gh-13197
2018-05-17 15:31:51 +02:00
Andy Wilkinson
69aa4913e3 Align tests for OAuth properties adapter with changes in Spring Security
Closes gh-13185
2018-05-16 11:30:28 +01:00
Stephane Nicoll
9ea4fce03e Merge branch '2.0.x' 2018-05-16 09:29:02 +02:00
Johnny Lim
652bbf4ab2 Polish DefaultErrorWebExceptionHandler.renderErrorView()
Closes gh-13174
2018-05-16 09:28:26 +02:00
Andy Wilkinson
b5185fbe10 Upgrade to Lettuce 5.1.0.M1
Closes gh-13181
2018-05-15 17:22:26 +01:00
Andy Wilkinson
148997fd43 Upgrade to Elasticsearch 6.2.4
Closes gh-13178
2018-05-15 17:11:28 +01:00
Andy Wilkinson
150a19523c Start building against Spring Data Lovelace M3 snapshots
See gh-13169
2018-05-15 16:57:51 +01:00
Stephane Nicoll
e5ac3bc391 Merge branch '2.0.x' 2018-05-15 15:10:04 +02:00
Johnny Lim
b9aa934d78 Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
c7eec5c45e Polish "Add liquibase test rollback on update property"
Closes gh-13159
2018-05-14 16:14:11 +02:00
Vladyslav Kiriushkin
08279c889c Add liquibase test rollback on update property
See gh-13159
2018-05-14 16:06:08 +02:00
Stephane Nicoll
93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path
Closes gh-12971
2018-05-14 12:24:38 +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
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
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
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
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
Andy Wilkinson
d77c4c83a1 Polish 2018-05-09 09:19:03 +01:00
Andy Wilkinson
a41c9eb736 Merge branch '2.0.x' 2018-05-09 09:14:48 +01:00
Andy Wilkinson
c826310fd1 Polish 2018-05-09 08:44:15 +01:00
Brian Clozel
84c9a65e9d Auto-configure Elasticsearch REST clients
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.

`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.

`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.

Closes gh-12600
2018-05-07 17:57:09 +02:00
Stephane Nicoll
ea2a98d009 Merge branch '2.0.x' 2018-05-05 07:22:20 +02:00