Commit Graph

823 Commits (f9207dd9463ca4de51c7f9cddae4e2decfdb1d62)

Author SHA1 Message Date
Andy Wilkinson c59f31218a Revert "Ignore Data Elasticsearch test that fails due to DATAES-470"
Closes gh-13744
6 years ago
Stephane Nicoll 4c7c328972 Polish "Upgrade to Liquibase 3.6.2"
Closes gh-13625
6 years ago
Miguel Gomes b5cb074219 Upgrade to Liquibase 3.6.2
See gh-13625
6 years ago
Stephane Nicoll 8fc1e0ed4e Merge branch '2.0.x' 6 years ago
dreis2211 ac8eebfbad Fix typos
Closes gh-13762
6 years ago
Brian Clozel 2e5f0c2873 Fix WebMvc auto-conf tests after Framework change
This commit adapts to a recent Spring Framework change (a40d25a) that
turns no-op Spring MVC beans (infrastructure components that, given
their configuration, won't contribute anything to the application) into
`NullBean` instances.
6 years ago
Madhura Bhave dba0e1b778 Merge branch '2.0.x' 6 years ago
Madhura Bhave d7822ba135 Update copyright header for modified files 6 years ago
Madhura Bhave 34ebf1a97c Merge branch '2.0.x' 6 years ago
Madhura Bhave c8c32cfa33 Migrate tests to ApplicationContextRunner 6 years ago
Madhura Bhave 6d9fabf5bc Harmonize mongo auto-configuration
Provides a way to easily exclude `MongoAutoConfiguration` or
`MongoReactiveAutoConfiguration` so that multiple mongo clients
are not present.

Fixes gh-12407
6 years ago
Andy Wilkinson cced3514a7 Polish 6 years ago
Andy Wilkinson 889f1bce3f Merge branch '2.0.x' 6 years ago
Andy Wilkinson c489c6c5f6 Polish test following forward merge 6 years ago
Andy Wilkinson f32ab6eade Merge branch '2.0.x' 6 years ago
Andy Wilkinson 67dfa0a720 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 59749d53b8 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 48819253eb Fix dependency order between JdbcTemplate and database migration tools
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.

This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.

Closes gh-13155
6 years ago
Stephane Nicoll 8194dc4aea Merge branch '2.0.x' 6 years ago
Stephane Nicoll 177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 6 years ago
Andy Wilkinson a5b3d549b9 Ignore Data Elasticsearch test that fails due to DATAES-470 6 years ago
Andy Wilkinson 43e2df105c Align with latest changes in Spring Data REST 6 years ago
Andy Wilkinson cf3b1f6653 Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
6 years ago
Andy Wilkinson c1a81cfca0 Prohibit bean overriding by default and analyze override failures
Closes gh-13609
6 years ago
Andy Wilkinson 19a494a94d Merge branch '2.0.x' 6 years ago
Andy Wilkinson 57e2bb9c6a Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 0b48e223f3 Merge branch '2.0.x' 6 years ago
Johnny Lim ab6adc8265 Polish
Closes gh-13616
6 years ago
dreis2211 5fcba490d2 Polish conditional expressions
Closes gh-13583
6 years ago
Andy Wilkinson 337d2d8e9a Merge branch '2.0.x' 6 years ago
Andy Wilkinson 58be01a790 Try to make Jest auto-configuration tests more robust 6 years ago
Andy Wilkinson 18904ec291 Upgrade to Mysql 8.0.11
Closes gh-13688
6 years ago
Andy Wilkinson 757c6a9619 Upgrade to Mongodb 3.8.0
Closes gh-13677
6 years ago
Andy Wilkinson b6b37c91bb Upgrade to Flyway 5.1.3
Closes gh-13672
6 years ago
Andy Wilkinson 2348047450 Upgrade to Elasticsearch 6.3.0
Closes gh-13671
6 years ago
Andy Wilkinson 1d4ec56b08 Upgrade to Solr 7.4.0
Closes gh-13667
6 years ago
Andy Wilkinson 304598e4bc Upgrade to Artemis 2.6.2
Closes gh-13663
6 years ago
Andy Wilkinson 706945d2ce Upgrade to Embedded Mongo 2.1.1
Closes gh-13657
6 years ago
Madhura Bhave 4eff07f6c0 Merge branch '2.0.x' 6 years ago
Madhura Bhave fddc9e9c7e Support multiple paths in DispatcherServletPathProvider
Closes gh-13603
6 years ago
Madhura Bhave 598b1f4300 Merge branch '2.0.x' 6 years ago
Madhura Bhave a1491be636 Refine DispatcherServletPathProvider creation
Closes gh-13527
6 years ago
Andy Wilkinson 5c3b4333f8 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 30f0fd1fe4 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 56a7aa552f Polish 7 years ago
Johnny Lim bb60edaca6 Polish
Closes gh-13534
7 years ago
Stephane Nicoll d4d169277d Merge branch '2.0.x' 7 years ago
Johnny Lim b9ea0fd5a7 Polish
See gh-13534
7 years ago
Andy Wilkinson c90f589906 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e2d6280d83 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template
Closes gh-13529
7 years ago
Stephane Nicoll 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
7 years ago
Stephane Nicoll 3fdb2b3c85 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 864a6b3e91 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 9d3ba14686 Fix conditions for CachingConnectionFactory support
Closes gh-12161
7 years ago
Stephane Nicoll 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
7 years ago
Stephane Nicoll 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
7 years ago
Brian Clozel 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.
7 years ago
Stephane Nicoll 6970f19ce3 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 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
7 years ago
Johnny Lim fb834898ab Use final keywords for Map fields in JacksonProperties
Closes gh-13517
7 years ago
Stephane Nicoll 165d993e5d Merge branch '2.0.x' 7 years ago
Stephane Nicoll 62c93a4b9a Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
Closes gh-13508
7 years ago
Johnny Lim ec845c93f2 Polish HibernateProperties and its test
Closes gh-13484
7 years ago
Brian Clozel 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
7 years ago
Madhura Bhave 87506248b0 Merge branch '2.0.x' 7 years ago
Madhura Bhave 4194baad91 Don't log p/w when AuthenticationManagerBuilder configured
Fixes gh-12872
7 years ago
Madhura Bhave f7ff8dd165 Make generated password output consistent 7 years ago
Stephane Nicoll 34167dc163 Polish 7 years ago
Brian Clozel fe3de2816c Merge branch '2.0.x' 7 years ago
Brian Clozel 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
7 years ago
Stephane Nicoll ab19db19a3 Move Hibernate settings to a dedicated class
Closes gh-1327
7 years ago
Phillip Webb e0ae805924 Update copyright header 7 years ago
Phillip Webb 66be6c3396 Polish 7 years ago
Brian Clozel 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
7 years ago
Stephane Nicoll 51cf4e5d74 Polish "Add support to set visibility via JacksonProperties"
Closes gh-13214
7 years ago
Eddú Meléndez ca3659059a Add support to set visibility via JacksonProperties
This commit allows to configure properties visibility.

See gh-13214
7 years ago
Phillip Webb ade1397ea2 Merge branch '2.0.x' 7 years ago
Phillip Webb 571c50e43f Switch to functional web code to use static imports
Update the samples and tests to use the more idiomatic static import
style.
7 years ago
Phillip Webb 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
7 years ago
Brian Clozel 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
7 years ago
Stephane Nicoll ee158df993 Merge branch '2.0.x' 7 years ago
Dmytro Nosan 20003489be Auto-configure jOOQ with TransactionListenerProvider
Closes gh-13331
7 years ago
Stephane Nicoll 99f0270fce Merge branch '2.0.x' 7 years ago
Stephane Nicoll a9b2826c26 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 8bcea0d8cc Polish "Add auto-configuration for WebServiceTemplate"
Closes gh-1270
7 years ago
dnosan c9df1c551a Add auto-configuration for WebServiceTemplate
See gh-12707
7 years ago
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1
Closes gh-13322
7 years ago
Stephane Nicoll 77dcbdb1e5 Polish
See gh-13320
7 years ago
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 7 years ago
Johnny Lim 6b0ce46491 Polish
Closes gh-13320
7 years ago
Stephane Nicoll 5790a26bcb Merge branch '2.0.x' 7 years ago
Stephane Nicoll 20e349c332 Polish 7 years ago
Stephane Nicoll fec75c42fa Move unused property in code to metadata 7 years ago
Stephane Nicoll 74379da726 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 32aa5b9bae Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 840948c6c9 Polish 7 years ago
Phillip Webb 3fb79194a0 Merge branch '2.0.x' 7 years ago
Phillip Webb f8ec2e6176 Polish 7 years ago
Madhura Bhave 9f4a5c13a5 Add auto-config for WebFlux OAuth2 Login
Closes gh-13142
7 years ago
Phillip Webb 40800355c7 Merge branch '2.0.x' 7 years ago
Phillip Webb 09fa1e7e11 Polish 7 years ago
Stephane Nicoll 463e11ab2b Merge branch '2.0.x' 7 years ago
Johnny Lim 4eb070767c Remove an unnecessary @QuartzDataSource
Closes gh-13302
7 years ago
Stephane Nicoll bd9299dbf9 Add missing metadata for renamed SSL properties
Closes gh-13239
7 years ago
Stephane Nicoll 3f001899b4 Harmonize ssl properties for Kafka
Closes gh-13239
7 years ago
Stephane Nicoll e2c14c590a Merge branch '2.0.x' 7 years ago
dreis2211 3ed31d60dc Add assertion in IntegrationAutoConfigurationTests
Closes gh-13280
7 years ago
Stephane Nicoll 6814b7f240 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 8a9d0bd22a Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll f91b53747a Merge branch '2.0.x' 7 years ago
Johnny Lim f385a1cb11 Polish
Closes gh-13243
7 years ago
Phillip Webb 68ffbafbae Fix checkstyle violations 7 years ago
Phillip Webb 3702da4573 Formatting 7 years ago
Phillip Webb 2215709165 Merge branch '2.0.x' 7 years ago
Phillip Webb 6f0ccc64a5 Fix checkstyle violations 7 years ago
Phillip Webb 9fd3b9103a Format code 7 years ago
Phillip Webb 5626b7a50d Merge branch '2.0.x' 7 years ago
Phillip Webb 9c5f207e22 Fix merge error 7 years ago
Phillip Webb d8157c94f3 Merge branch '2.0.x' 7 years ago
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 4464a5f5bd Remove code deprecated in 2.0
Closes gh-12962
7 years ago
Phillip Webb c5f63c19a4 Merge branch '2.0.x' 7 years ago
Phillip Webb 2dc4f1df00 Polish 7 years ago
Phillip Webb 40e68a6427 Merge branch '2.0.x' 7 years ago
Phillip Webb 6d8b4710d7 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 8364d121b1 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 125b5974c0 Merge branch '1.5.x' into 2.0.x 7 years ago
Johnny Lim b7fe3a5332 Make ErrorProperties.whitelabel final
Closes gh-13197
7 years ago
Andy Wilkinson 69aa4913e3 Align tests for OAuth properties adapter with changes in Spring Security
Closes gh-13185
7 years ago
Stephane Nicoll 9ea4fce03e Merge branch '2.0.x' 7 years ago
Johnny Lim 652bbf4ab2 Polish DefaultErrorWebExceptionHandler.renderErrorView()
Closes gh-13174
7 years ago
Andy Wilkinson b5185fbe10 Upgrade to Lettuce 5.1.0.M1
Closes gh-13181
7 years ago
Andy Wilkinson 148997fd43 Upgrade to Elasticsearch 6.2.4
Closes gh-13178
7 years ago
Andy Wilkinson 150a19523c Start building against Spring Data Lovelace M3 snapshots
See gh-13169
7 years ago
Stephane Nicoll e5ac3bc391 Merge branch '2.0.x' 7 years ago
Johnny Lim b9aa934d78 Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
Closes gh-13171
7 years ago
Stephane Nicoll c7eec5c45e Polish "Add liquibase test rollback on update property"
Closes gh-13159
7 years ago
Vladyslav Kiriushkin 08279c889c Add liquibase test rollback on update property
See gh-13159
7 years ago
Stephane Nicoll 93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path
Closes gh-12971
7 years ago
Stephane Nicoll 9b379b43ae Merge branch '2.0.x' 7 years ago
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
7 years ago
Stephane Nicoll b17c58b114 Merge branch '2.0.x' 7 years ago
Johnny Lim 3dd2f5bb05 Polish
See gh-13148
7 years ago
Stephane Nicoll 15edd02e1d Merge branch '2.0.x' 7 years ago
Johnny Lim aa60d60b8a Polish JpaProperties.determineDdlAuto()
Closes gh-13036
7 years ago
Stephane Nicoll 8e9a873787 Polish "Improve LDAP auto-configuration conditions"
Closes gh-13143
7 years ago
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
7 years ago
Stephane Nicoll a0a0bea427 Polish "Improve LDAP auto-configuration"
Closes gh-13136
7 years ago
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
7 years ago
Stephane Nicoll b0433d66c1 Merge branch '2.0.x' 7 years ago
dreis2211 e6a23fa3ff Remove unnecessary semicolons
Closes gh-13144
7 years ago
Andy Wilkinson b88a20fabb Polish 7 years ago
Stephane Nicoll 5e87a3d2fa Polish
See gh-13130
7 years ago
Stephane Nicoll 00a43d8f4d Merge branch '2.0.x' 7 years ago
Johnny Lim 75e591e76e Polish
Closes gh-13130
7 years ago
Stephane Nicoll c35cb1b69f Merge branch '2.0.x' 7 years ago
Stephane Nicoll 4683940423 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson d77c4c83a1 Polish 7 years ago
Andy Wilkinson a41c9eb736 Merge branch '2.0.x' 7 years ago
Andy Wilkinson c826310fd1 Polish 7 years ago
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
7 years ago
Stephane Nicoll ea2a98d009 Merge branch '2.0.x' 7 years ago
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
7 years ago
Phillip Webb a323a85e3b Merge branch '2.0.x' 7 years ago
Phillip Webb 975e986fef Polish 7 years ago
Phillip Webb f9750248ef Migrate KafkaProperties to use PropertyMapper 7 years ago
Phillip Webb 7b120c1c97 Formatting 7 years ago
Phillip Webb 42c053cf1b Merge branch '2.0.x' 7 years ago
Phillip Webb 6de479fe6a Polish 7 years ago
Madhura Bhave 6855c5556d EndpointRequest should consider server.servlet.path
Fixes gh-12934
7 years ago
Phillip Webb 5b3cb8a698 Update copyright header year for changed files 7 years ago
Phillip Webb 6e09e497f2 Formatting 7 years ago
Stephane Nicoll 23c49116ff Merge branch '2.0.x' 7 years ago
Stephane Nicoll 18b1e8da60 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb b6a2a46f78 Merge branch '2.0.x' 7 years ago
Phillip Webb 2d70a7ae5e Polish caught exception names
Prefer `ex` over `e`.
7 years ago
Phillip Webb 41efea51a7 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
7 years ago
Phillip Webb 8c0c0ee55a Merge branch '2.0.x' 7 years ago
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 36a377764f Merge branch '2.0.x' 7 years ago
Stephane Nicoll 700ec6b840 Polish "Complete SSL configuration for Kafka"
Closes gh-13031
7 years ago
Toshiaki Maki d208641c59 Complete SSL configuration for Kafka
See gh-13031
7 years ago
Stephane Nicoll 921c037956 Merge branch '2.0.x' 7 years ago
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
7 years ago
Gary Russell 8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots
Closes gh-13007
7 years ago
Stephane Nicoll 4eeddbd889 Merge branch '2.0.x' 7 years ago
Stephane Nicoll d6244889f5 Add default value for "spring.flyway.locations"
See gh-12193
7 years ago
Andy Wilkinson 0526594a3c Merge branch '2.0.x' 7 years ago
Andy Wilkinson f019d5c85b Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 0819822eb6 Merge branch '2.0.x' 7 years ago
Stephane Nicoll fbf8f57773 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 9f7be62687 Backport polish commit "22b99a90" 7 years ago
Stephane Nicoll 0fcffae0d9 Merge branch '2.0.x' 7 years ago
Johnny Lim d8700522d3 Rename nested *AutoConfiguration classes to *Configuration
Closes gh-12989
7 years ago
Stephane Nicoll 22b99a90de Polish
See gh-12906
7 years ago
Madhura Bhave acc1793e96 Merge branch '2.0.x' 7 years ago
Madhura Bhave 0385bd4131 Use spring.session.timeout for Spring Session timeout
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
7 years ago
Stephane Nicoll 4d0fe5bbe6 Merge branch '2.0.x' 7 years ago
Johnny Lim b941c5f1a6 Polish
Closes gh-12981
7 years ago