c90f589906
Merge branch '2.0.x'
2018-06-20 13:57:05 +01:00
e2d6280d83
Merge branch '1.5.x' into 2.0.x
2018-06-20 13:56:55 +01:00
8b35d06cf6
Share RetryTemplate infrastructure for Rabbit listener and template
...
Closes gh-13529
2018-06-20 09:28:00 +02:00
65cc7c72f4
Harmonize JNDI lookups to enable resourceRef
...
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.
This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.
Closes gh-12803
2018-06-19 21:51:18 +02:00
3fdb2b3c85
Merge branch '2.0.x'
2018-06-19 20:59:43 +02:00
864a6b3e91
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:59:27 +02:00
9d3ba14686
Fix conditions for CachingConnectionFactory support
...
Closes gh-12161
2018-06-19 19:58:48 +02:00
8365d53554
Add support for JMS session caching
...
This commit adds support for CachingConnectionFactory for both Artemis
and ActiveMQ. If connection pooling is not enabled explicitly, sessions,
producers and consumers are cached. The factory can be further
customized, including reverting to the raw ConnectionFactory, using the
`spring.jms.*` namespace.
Closes gh-12161
2018-06-19 15:17:00 +02:00
0ef54a79b1
Add support for connection pooling with Artemis
...
This commit expands ActiveMQ's connection pooling to artemis. The same
pooling features are now shared by the two brokers and a
PooledConnectionFactory can be auto-configured when the necessary jar is
present.
Closes gh-13523
2018-06-19 15:05:32 +02:00
28c1bc9986
Fix DefaultErrorViewResolver after HttpStatus changes
...
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 15:02:45 +02:00
6970f19ce3
Merge branch '2.0.x'
2018-06-19 14:12:25 +02:00
7ae82b070b
Stop calling Charset.availableCharsets() early
...
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.
Closes gh-13423
2018-06-19 14:12:00 +02:00
fb834898ab
Use final keywords for Map fields in JacksonProperties
...
Closes gh-13517
2018-06-19 09:13:33 +02:00
165d993e5d
Merge branch '2.0.x'
2018-06-18 17:54:39 +02:00
62c93a4b9a
Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
...
Closes gh-13508
2018-06-18 17:54:10 +02:00
ec845c93f2
Polish HibernateProperties and its test
...
Closes gh-13484
2018-06-15 13:44:35 +02:00
cb6c8f76e2
Configure X-Forwarded-* support with Reactor Netty
...
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.
Closes gh-10900
2018-06-13 14:55:33 +02:00
87506248b0
Merge branch '2.0.x'
2018-06-07 12:53:37 -07:00
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
34167dc163
Polish
2018-06-07 13:34:18 +02:00
fe3de2816c
Merge branch '2.0.x'
2018-06-06 14:07:58 +02:00
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
ab19db19a3
Move Hibernate settings to a dedicated class
...
Closes gh-1327
2018-06-06 14:00:35 +02:00
e0ae805924
Update copyright header
2018-06-05 17:45:09 -07:00
66be6c3396
Polish
2018-06-05 17:44:51 -07:00
56ab0da287
Support EncodedResourceResolver in resource chain
...
As of https://jira.spring.io/browse/SPR-16381 , Spring Framework now
supports both gzip and Brotli as compression formats for static
resources resolved by the resource chain.
The `GzipResourceResolver` has been deprecated and replaced by the
`EncodedResourceResolver`. This commit uses this new resolver and adapts
the configuration key to reflect those changes.
Note that this resolver is now configured ahead of the
`VersionResourceResolver`.
Closes gh-13242
2018-06-05 17:25:25 +02:00
51cf4e5d74
Polish "Add support to set visibility via JacksonProperties"
...
Closes gh-13214
2018-06-05 10:30:15 +02:00
ca3659059a
Add support to set visibility via JacksonProperties
...
This commit allows to configure properties visibility.
See gh-13214
2018-06-05 10:20:25 +02:00
ade1397ea2
Merge branch '2.0.x'
2018-06-04 17:28:54 -07:00
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
ef5301d079
Add saaj and jax-ws dependencies for Java 9 build
...
Add test dependencies for saaj-impl and jax-ws since Java 9+ no longer
includes them.
See gh-1270
2018-06-04 12:16:30 -07:00
bd8106d77f
Upgrade to Spring Framework 5.1
...
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.
Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.
See gh-13321
2018-06-04 18:59:17 +02:00
ee158df993
Merge branch '2.0.x'
2018-06-04 17:36:01 +02:00
20003489be
Auto-configure jOOQ with TransactionListenerProvider
...
Closes gh-13331
2018-06-04 17:35:40 +02:00
99f0270fce
Merge branch '2.0.x'
2018-06-04 14:15:08 +02:00
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
8bcea0d8cc
Polish "Add auto-configuration for WebServiceTemplate"
...
Closes gh-1270
2018-06-04 12:27:29 +02:00
c9df1c551a
Add auto-configuration for WebServiceTemplate
...
See gh-12707
2018-06-04 11:12:02 +02:00
205b1c1327
Upgrade to Hazelcast 3.10.1
...
Closes gh-13322
2018-06-01 09:30:42 +02:00
77dcbdb1e5
Polish
...
See gh-13320
2018-06-01 09:28:55 +02:00
bc47bf44a9
Merge branch '2.0.x'
2018-06-01 09:26:29 +02:00
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
5790a26bcb
Merge branch '2.0.x'
2018-05-31 17:36:10 +02:00
20e349c332
Polish
2018-05-31 17:35:56 +02:00
fec75c42fa
Move unused property in code to metadata
2018-05-31 17:07:42 +02:00
74379da726
Merge branch '2.0.x'
2018-05-31 16:39:11 +02:00
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
840948c6c9
Polish
2018-05-30 21:02:57 -07:00
3fb79194a0
Merge branch '2.0.x'
2018-05-30 21:02:07 -07:00
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
9f4a5c13a5
Add auto-config for WebFlux OAuth2 Login
...
Closes gh-13142
2018-05-30 18:53:11 -07:00
40800355c7
Merge branch '2.0.x'
2018-05-30 12:41:48 -07:00
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
463e11ab2b
Merge branch '2.0.x'
2018-05-30 17:49:53 +02:00
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
bd9299dbf9
Add missing metadata for renamed SSL properties
...
Closes gh-13239
2018-05-30 14:24:07 +02:00
3f001899b4
Harmonize ssl properties for Kafka
...
Closes gh-13239
2018-05-29 17:51:01 +02:00
e2c14c590a
Merge branch '2.0.x'
2018-05-29 09:04:31 +02:00
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
6814b7f240
Merge branch '2.0.x'
2018-05-28 14:29:00 +02:00
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
68ffbafbae
Fix checkstyle violations
2018-05-26 00:01:45 -07:00
3702da4573
Formatting
2018-05-25 23:52:38 -07:00
2215709165
Merge branch '2.0.x'
2018-05-25 23:50:39 -07:00
6f0ccc64a5
Fix checkstyle violations
2018-05-25 23:03:17 -07:00
9fd3b9103a
Format code
2018-05-25 23:02:45 -07:00
5626b7a50d
Merge branch '2.0.x'
2018-05-25 20:58:31 -07:00
9c5f207e22
Fix merge error
2018-05-25 20:57:46 -07:00
d8157c94f3
Merge branch '2.0.x'
2018-05-25 19:48:37 -07:00
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
4464a5f5bd
Remove code deprecated in 2.0
...
Closes gh-12962
2018-05-22 14:48:25 +02:00
c5f63c19a4
Merge branch '2.0.x'
2018-05-21 21:38:32 -07:00
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
40e68a6427
Merge branch '2.0.x'
2018-05-21 17:20:04 -07:00
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
8364d121b1
Merge branch '2.0.x'
2018-05-17 16:18:17 +02:00
125b5974c0
Merge branch '1.5.x' into 2.0.x
2018-05-17 16:17:55 +02:00
b7fe3a5332
Make ErrorProperties.whitelabel final
...
Closes gh-13197
2018-05-17 15:31:51 +02:00
69aa4913e3
Align tests for OAuth properties adapter with changes in Spring Security
...
Closes gh-13185
2018-05-16 11:30:28 +01:00
9ea4fce03e
Merge branch '2.0.x'
2018-05-16 09:29:02 +02:00
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
b5185fbe10
Upgrade to Lettuce 5.1.0.M1
...
Closes gh-13181
2018-05-15 17:22:26 +01:00
148997fd43
Upgrade to Elasticsearch 6.2.4
...
Closes gh-13178
2018-05-15 17:11:28 +01:00
150a19523c
Start building against Spring Data Lovelace M3 snapshots
...
See gh-13169
2018-05-15 16:57:51 +01:00
e5ac3bc391
Merge branch '2.0.x'
2018-05-15 15:10:04 +02:00
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
c7eec5c45e
Polish "Add liquibase test rollback on update property"
...
Closes gh-13159
2018-05-14 16:14:11 +02:00
08279c889c
Add liquibase test rollback on update property
...
See gh-13159
2018-05-14 16:06:08 +02:00
93c45cb6ec
Move server.servlet.path to spring.mvc.servlet.path
...
Closes gh-12971
2018-05-14 12:24:38 +02:00
9b379b43ae
Merge branch '2.0.x'
2018-05-14 09:33:16 +02:00
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
b17c58b114
Merge branch '2.0.x'
2018-05-14 08:23:36 +02:00
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
15edd02e1d
Merge branch '2.0.x'
2018-05-14 08:13:40 +02:00
aa60d60b8a
Polish JpaProperties.determineDdlAuto()
...
Closes gh-13036
2018-05-14 08:13:06 +02:00
8e9a873787
Polish "Improve LDAP auto-configuration conditions"
...
Closes gh-13143
2018-05-11 17:59:21 +02:00
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
Stephane Nicoll
Brian Clozel
Johnny Lim
Madhura Bhave
Phillip Webb
Eddú Meléndez
Dmytro Nosan
dnosan
Vedran Pavic
dreis2211
Vladyslav Kiriushkin