Stephane Nicoll
77dcbdb1e5
Polish
...
See gh-13320
2018-06-01 09:28:55 +02:00
Stephane Nicoll
bc47bf44a9
Merge branch '2.0.x'
2018-06-01 09:26:29 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Stephane Nicoll
5790a26bcb
Merge branch '2.0.x'
2018-05-31 17:36:10 +02:00
Stephane Nicoll
20e349c332
Polish
2018-05-31 17:35:56 +02:00
Stephane Nicoll
fec75c42fa
Move unused property in code to metadata
2018-05-31 17:07:42 +02:00
Stephane Nicoll
74379da726
Merge branch '2.0.x'
2018-05-31 16:39:11 +02:00
Stephane Nicoll
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
Phillip Webb
840948c6c9
Polish
2018-05-30 21:02:57 -07:00
Phillip Webb
3fb79194a0
Merge branch '2.0.x'
2018-05-30 21:02:07 -07:00
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Madhura Bhave
9f4a5c13a5
Add auto-config for WebFlux OAuth2 Login
...
Closes gh-13142
2018-05-30 18:53:11 -07:00
Phillip Webb
40800355c7
Merge branch '2.0.x'
2018-05-30 12:41:48 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Stephane Nicoll
463e11ab2b
Merge branch '2.0.x'
2018-05-30 17:49:53 +02:00
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
Stephane Nicoll
bd9299dbf9
Add missing metadata for renamed SSL properties
...
Closes gh-13239
2018-05-30 14:24:07 +02:00
Stephane Nicoll
3f001899b4
Harmonize ssl properties for Kafka
...
Closes gh-13239
2018-05-29 17:51:01 +02:00
Stephane Nicoll
e2c14c590a
Merge branch '2.0.x'
2018-05-29 09:04:31 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
6814b7f240
Merge branch '2.0.x'
2018-05-28 14:29:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
Stephane Nicoll
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Phillip Webb
68ffbafbae
Fix checkstyle violations
2018-05-26 00:01:45 -07:00
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
Stephane Nicoll
c22e9a5514
Make sure that JpaProperties does not have Hibernate imports
...
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.
This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.
Closes gh-13043
2018-05-05 07:21:50 +02:00
Phillip Webb
a323a85e3b
Merge branch '2.0.x'
2018-05-04 20:06:55 -07:00
Phillip Webb
975e986fef
Polish
2018-05-04 20:06:27 -07:00
Phillip Webb
f9750248ef
Migrate KafkaProperties to use PropertyMapper
2018-05-04 20:06:11 -07:00
Phillip Webb
7b120c1c97
Formatting
2018-05-04 16:36:35 -07:00
Phillip Webb
42c053cf1b
Merge branch '2.0.x'
2018-05-04 16:31:46 -07:00
Phillip Webb
6de479fe6a
Polish
2018-05-04 16:08:05 -07:00
Madhura Bhave
6855c5556d
EndpointRequest should consider server.servlet.path
...
Fixes gh-12934
2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698
Update copyright header year for changed files
2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
Stephane Nicoll
23c49116ff
Merge branch '2.0.x'
2018-05-04 16:57:27 +02:00
Stephane Nicoll
18b1e8da60
Merge branch '1.5.x' into 2.0.x
2018-05-04 16:57:12 +02:00
Phillip Webb
b6a2a46f78
Merge branch '2.0.x'
2018-05-03 23:54:42 -07:00
Phillip Webb
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb
8c0c0ee55a
Merge branch '2.0.x'
2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Stephane Nicoll
36a377764f
Merge branch '2.0.x'
2018-05-03 15:53:32 +02:00
Stephane Nicoll
700ec6b840
Polish "Complete SSL configuration for Kafka"
...
Closes gh-13031
2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59
Complete SSL configuration for Kafka
...
See gh-13031
2018-05-03 15:38:49 +02:00
Stephane Nicoll
921c037956
Merge branch '2.0.x'
2018-05-03 11:47:33 +02:00
Stephane Nicoll
69ab956e8b
Stop assuming datasource creation failure originates from auto-config
...
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.
This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.
Closes gh-12947
2018-05-03 11:46:27 +02:00
Gary Russell
8cf34238d3
Start building against Spring Kafka 2.2.0 snapshots
...
Closes gh-13007
2018-05-02 16:15:08 +02:00
Stephane Nicoll
4eeddbd889
Merge branch '2.0.x'
2018-05-02 16:08:03 +02:00
Stephane Nicoll
d6244889f5
Add default value for "spring.flyway.locations"
...
See gh-12193
2018-05-02 16:07:38 +02:00