Commit Graph

2858 Commits (0dfbb3d48c0f27f052e951e6a6a8bd8cb4004ed5)

Author SHA1 Message Date
Andy Wilkinson c6dae8f305 Upgrade to Johnzon Jsonb 1.1.8
Closes gh-13643
6 years ago
Andy Wilkinson aa5b70c43c Upgrade to Rxjava2 2.1.16
Closes gh-13642
6 years ago
Andy Wilkinson 2859d7e649 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 9120f49721 Merge branch '1.5.x' into 2.0.x 6 years ago
Karl Heinz Marbaise 0d3b49cd95 Upgrade to Maven War Plugin 3.2.2
Closes gh-13629
6 years ago
Karl Heinz Marbaise 205fa2507b Remove maven-eclipse-plugin as it has been retired
Closes gh-13631
6 years ago
dreis2211 d641249ca8 Fix deprecation warning in SpringPhysicalNamingStrategyTests
Closes gh-13623
6 years ago
Madhura Bhave 149c7a85c3 Merge branch '2.0.x' 6 years ago
Madhura Bhave 673a08d228 Support microseconds in Duration conversions
Closes gh-13624
6 years ago
Andy Wilkinson c3641c480b Merge branch '2.0.x' 6 years ago
Andy Wilkinson 06a8c41943 Preserve trailing whitespace in origin-tracked property values
Closes gh-13602
6 years ago
Andy Wilkinson de900e71a3 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 032d5488cd Tolerate non-existent source folders in DevTools
Closes gh-13620
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
Andy Wilkinson 4cccc9a886 Merge branch '2.0.x' 6 years ago
Andy Wilkinson a5d20ffed7 Avoid NPE when creating method tag for WebFlux req with non-standard method
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.

This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.

Closes gh-13596
6 years ago
Andy Wilkinson 45fdf2ffa4 Support Tomcat 9 and Undertow 2
Closes gh-11749
Closes gh-12243
6 years ago
Andy Wilkinson b4cd4f4c43 Stop mocking class that is final in latest Framework 5.1 snapshots 6 years ago
Madhura Bhave cde3c21926 Merge branch '2.0.x' 6 years ago
dreis2211 17edf0e2fe Fix typo 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 ca0de4385c Upgrade to Hibernate 5.3 and JPA 2.2
Closes gh-11725
6 years ago
Andy Wilkinson 9281e2a410 Avoid creating JsonParser for VCAP_* parsing when running outside CF
Closes gh-13437
6 years ago
Andy Wilkinson 8dbeb68afa Merge branch '2.0.x' 6 years ago
Andy Wilkinson 04119585e8 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 80ede14510 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 911453d478 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson a097f923c1 Provide sensible defaults for launch script properties when using Gradle
Closes gh-4458
7 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
Andy Wilkinson 24dec4807f Merge branch '2.0.x' 7 years ago
Andy Wilkinson fd125b4a4a Remove assumption that a file URI can be turned into a File
Closes gh-13493
7 years ago
Stephane Nicoll 4c172eb6cd Merge branch '2.0.x' 7 years ago
Stephane Nicoll f2cc6e2ef2 Fix link of RESTEasy repository
Closes gh-13538
7 years ago
Stephane Nicoll c594768640 Remove wro4j starter reference
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
7 years ago
Stephane Nicoll 8858c88a4c Remove GraphQL starter reference
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
7 years ago
Andy Wilkinson a612ba1b11 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 48c5e70ac8 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson eb6898314a Merge branch '2.0.x' 7 years ago
Andy Wilkinson 2624748911 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
Stephane Nicoll 9e9e746554 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 3ea7c2e003 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 4fc0a33094 Merge branch '1.5.x' into 2.0.x 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
Andy Wilkinson 7571f10ae3 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e730382718 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 20546024d3 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available
Closes gh-13521
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
Andy Wilkinson c12f8298e6 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 814e90805e Merge branch '1.5.x' into 2.0.x 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
Andy Wilkinson 12eafc84b0 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 497902de4e Only bridge JUL into SLF4J when JUL has not be customized
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.

A secondary, related problem was that LogbackLoggingSystem installs a
LevelChangePropagator so that Logback’s log level configuration is
propagated into JUL. This meant that an individual Boot app with
custom log level configuration could change the log levels of Tomcat
itself and of any other applications that had been deployed to Tomcat
and use JUL.

This commit updates both Slf4jLoggingSystem and LogbackLoggingSystem
so that they only change JUL’s configuration if it hasn’t already been
customized. The configuration is deemed to have not been customised if
there’s a single root handler and its a console handler.

Closes gh-13470
7 years ago
Brian Clozel cc894ce4f2 Fix Micrometer tag providers 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 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
Stephane Nicoll ae12d515ee Merge branch '2.0.x' 7 years ago
Johnny Lim 1e7ed2ffdb Add log level guards in ConfigFileApplicationListener
Closes gh-13512
7 years ago
Stephane Nicoll f682c77691 Polish "Add reference to dozer-spring-boot-starter"
Closes gh-13501
7 years ago
Kazuki Shimizu 9308904af7 Add reference to dozer-spring-boot-starter
See gh-13501
7 years ago
Johnny Lim fb834898ab Use final keywords for Map fields in JacksonProperties
Closes gh-13517
7 years ago
Madhura Bhave 3a01914b63 Merge branch '2.0.x' 7 years ago
Madhura Bhave 87680b4ee5 Fix profile precedence when active and include provided
Before 2.0.2, if profiles were activated via the environment using the
active and include profile property, profiles specified via the active
property would take precedence. This commit restores that behavior.

Fixes gh-13513
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
Stephane Nicoll defa171a32 Merge branch '2.0.x' 7 years ago
Johnny Lim dd3bfdbe42 Use @ManagementContextConfiguration consistently 7 years ago
Stephane Nicoll b4584e6a28 Support profile expression in Logback's <springProfile>
Closes gh-13496
7 years ago
Stephane Nicoll a89b2ae46e Support profile expression in yml profile matching
Closes gh-12469
7 years ago
Stephane Nicoll 0c4176f596 Drop JsonSimpleJsonParser and JSON simple dependency
Closes gh-13471
7 years ago
Stephane Nicoll fa7da40640 Upgrade to JUnit 5.2.0
Closes gh-13118
7 years ago
Andy Wilkinson f3f573a774 Merge branch '2.0.x' 7 years ago
Andy Wilkinson b3927cfd10 Start building against Spring REST Docs 2.0.2 snapshots
See gh-13505
7 years ago
Stephane Nicoll 3b0c1354cb Upgrade to Maven Surefire/Failsafe Plugin 2.22.0
Closes gh-13500
7 years ago
Johnny Lim 403f8927c3 Polish CachesEndpoint
Closes gh-13487
7 years ago
Johnny Lim ec845c93f2 Polish HibernateProperties and its test
Closes gh-13484
7 years ago
Stephane Nicoll 60b109cf0c Merge branch '2.0.x' 7 years ago
Johnny Lim f34fb5f1ee Reduce object creation in findMatchingItemMetadata()
Closes gh-13473
7 years ago
Andy Wilkinson b96f9d635f Upgrade to Elasticsearch 5.6.10
Closes gh-13479
7 years ago
Stephane Nicoll 5654fb049f Merge branch '2.0.x' 7 years ago
Stephane Nicoll 438f0b008a Upgrade to Spring Amqp 2.0.4
Closes gh-13477
7 years ago
Stephane Nicoll 2483ed3e4e Upgrade to Spring Kafka 2.1.7
Closes gh-13476
7 years ago
Stephane Nicoll f217aa40f0 Merge branch '2.0.x' 7 years ago
Stephane Nicoll d47d84ff7a Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll de6ce79d5f Upgrade to Spring Session Apple-SR3
Closes gh-13461
7 years ago
Stephane Nicoll 40ba15047b Upgrade to Spring Integration 5.0.6
Closes gh-13457
7 years ago
Brian Clozel 6e9fee35a7 Upgrade to Spring Data Kay SR8
Closes gh-13455
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
Andy Wilkinson f8eefa80df Merge branch '2.0.x' 7 years ago
Andy Wilkinson 42c307b744 Upgrade to Solr 6.6.4
Closes gh-13468
7 years ago
Andy Wilkinson bbcbc2d113 Upgrade to Reactor Bom Bismuth-SR10
Closes gh-13467
7 years ago
Andy Wilkinson ed3f43fd25 Upgrade to Jackson 2.9.6
Closes gh-13466
7 years ago
Andy Wilkinson 0e867aec97 Upgrade to Couchbase Client 2.5.9
Closes gh-13465
7 years ago
Andy Wilkinson 71b8b2d242 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson a79c8918ff Upgrade to Spring Security 5.0.6.RELEASE
Closes gh-13459
7 years ago
Stephane Nicoll c738b73c6f Merge branch '2.0.x' 7 years ago
Johnny Lim 870d7fe16a Use @SpringBootTest.properties in tests and samples
Closes gh-13453
7 years ago
Stephane Nicoll f8eedb04cc Merge branch '2.0.x' 7 years ago
Jon Schneider 96a6d2923c Upgrade to Micrometer 1.0.5
Closes gh-13454
7 years ago
Stephane Nicoll d24647b07c Upgrade to Spring Framework 5.0.7.RELEASE
Closes gh-13353
7 years ago
Johnny Lim de3c3cd755 Add CLIENT_NAME_NONE to WebClientExchangeTags 7 years ago
Johnny Lim c908445bff Use a precompiled pattern in WebClientExchangeTags.extractPath() 7 years ago
Andy Wilkinson 5bd9a445ae Merge branch '2.0.x' 7 years ago
Andy Wilkinson 6f2171c282 Improve error message when BootJar or BootWar has no known main class
Closes gh-12712
7 years ago
Andy Wilkinson db7789ad87 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 7b3be82cfa Merge branch '1.5.x' into 2.0.x 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
Madhura Bhave ed734d7e43 Trace filter ignores invalid requests
Fixes gh-12987
7 years ago
Brian Clozel 751a2b438e Upgrade duplicate finder maven plugin to 1.3.0
Closes gh-13411
7 years ago
Brian Clozel 59746de63b Backport web server configuration doc changes
Closes gh-13401
7 years ago
Rossen Stoyanchev a4ee33bf56 Follow-up dates for web server config documentation
See gh-13315
7 years ago
Stephane Nicoll 34167dc163 Polish 7 years ago
Stephane Nicoll a9e56aa089 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 5c96943e59 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb a0b6547aca Don't fail build on duplicate module-info classes
Update the duplicate-finder-maven-plugin configuration to ignore
module-info classes.

Closes gh-13403
7 years ago
Madhura Bhave cb621024e4 Include error stacktrace by default when devtools is in use
Fixes gh-828
7 years ago
Phillip Webb 375769ed5a Merge branch '2.0.x' 7 years ago
Phillip Webb dc1c459cde Polish "Fix caching issues with map property sources"
Refine the property source cache key fix so that a copy of the
key is only taken when the values change. This allows us to
retain the previous performance optimization of not creating
unnecessary string arrays.

Closes gh-13344
7 years ago
Fahim Farook c556d2b58f Fix caching issues with map property sources
Update `SpringIterableConfigurationPropertySource` so that the cache
key from a `MapPropertySource` is invalidated when the map contents
changes.

Prior to this commit, the actual keys of the map were used as the key.
This meant that if the underlying map changed, they key wouldn't be
invalidated because it ultimately pointed to the same object instance.

See gh-13344
7 years ago
Madhura Bhave 9570cd4172 Add saaj and jax-ws to webservices starter
Closes gh-13360
7 years ago
Madhura Bhave 6eaae608b5 Merge branch '2.0.x' 7 years ago
Madhura Bhave 461202bc25 EndpointRequest uses empty servlet path if not available
Fixes gh-13399
7 years ago
Brian Clozel 0004550f7b Document Reactor Netty server configuration
This commit regroups the documentation on how to configure a web server
in Spring Boot. The same concepts apply, whether the server is
Tomcat/Netty/Jetty/Undertow, or if it's deployed for a Servlet or
Reactive web application.

Closes gh-13315
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
Andy Wilkinson cf8c0acdc5 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 47615154de Upgrade to Mongodb 3.6.4
Closes gh-13397
7 years ago
Andy Wilkinson fd56e79f7a Upgrade to Mariadb 2.2.5
Closes gh-13396
7 years ago
Andy Wilkinson 6d0d66cb28 Upgrade to Narayana 5.8.2.Final
Closes gh-13395
7 years ago
Andy Wilkinson a4a6f482c6 Upgrade to Hsqldb 2.4.1
Closes gh-13394
7 years ago
Andy Wilkinson ecd8760514 Upgrade to Hibernate Validator 6.0.10.Final
Closes gh-13393
7 years ago
Andy Wilkinson 50f3f50ebb Upgrade to Activemq 5.15.4
Closes gh-13392
7 years ago
Andy Wilkinson 2b4d51e763 Upgrade to Rxjava2 2.1.14
Closes gh-13391
7 years ago
Andy Wilkinson d79f2401be Upgrade to Netty 4.1.25.Final
Closes gh-13390
7 years ago
Andy Wilkinson 2d4f1bb043 Upgrade to Unboundid Ldapsdk 4.0.6
Closes gh-13389
7 years ago
Andy Wilkinson 27b5fdd1e1 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 42c2059dd8 Merge branch '2.0.x' 7 years ago
Stephane Nicoll f6c99361a4 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 0d63e7f592 Merge branch '2.0.x' 7 years ago
dreis2211 ba8a32fa4e Replace commons-codec Base64 usage
See gh-13378
7 years ago
Phillip Webb e0ae805924 Update copyright header 7 years ago
Phillip Webb 66be6c3396 Polish 7 years ago
Madhura Bhave 26b826e017 Merge branch '2.0.x' 7 years ago
Madhura Bhave d0a2a8e929 Document ConfigurableServletWebServerFactory variants
Closes gh-13083
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
Dmytro Nosan 5b159a6bd0 Use Duration in HttpWebServiceMessageSenderBuilder
Closes gh-13364
7 years ago
Stephane Nicoll 909722f143 Polish 7 years ago
Stephane Nicoll e9c3df4ad2 Polish "Add duration support for setConnectTimeout and setReadTimeout"
Closes gh-13355
7 years ago
Dmytro Nosan 36f3c1b883 Add duration support for setConnectTimeout and setReadTimeout
See gh-13355
7 years ago
Stephane Nicoll 8691d01aaf Polish "Add duration support for setConnectTimout and setReadTimeout"
See gh-13355
7 years ago
Stephane Nicoll 83f7df920b Merge branch '2.0.x' 7 years ago
Stephane Nicoll bf56ec496d Polish 7 years ago
Stephane Nicoll 47634f5587 Polish 7 years ago
Stephane Nicoll 1901008d6f Merge branch '2.0.x' 7 years ago
Stephane Nicoll fff06822dc Polish 7 years ago
Stephane Nicoll d84e2b90d7 Fix wrong usage of ManagementContextConfiguration
Closes gh-13366
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
Stephane Nicoll 3248400665 Merge branch '2.0.x' 7 years ago
Stephane Nicoll b4f8361989 Make JMX metrics domain configurable
Closes gh-13356
7 years ago
Stephane Nicoll c612ed2695 Polish "RestTemplateCustomizers should be applied at the end"
Closes gh-13358
7 years ago
Dmytro Nosan ce3420748f RestTemplateCustomizers should be applied at the end
See gh-13358
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 2274ac5214 Move spring-javaformat plugins to root POM
Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
7 years ago
Phillip Webb d47e7ebb5b Merge branch '2.0.x' 7 years ago
Phillip Webb e1d21e52d5 Allow multi-value spring.profiles properties
Update `ConfigFileApplicationListener` to correctly load properties
that have `spring.profiles` values containing a list.

Prior to this commit the loaded would attempt to add the same document
twice resulting in a "property source cannot be added relative to
itself" error.

Closes gh-13362
7 years ago
Phillip Webb a12baed5de Merge branch '2.0.x' 7 years ago
Phillip Webb c1ab3eab69 Polish 7 years ago
Phillip Webb 67b548dafb Protect against infinite property include loop
Update `ConfigFileApplicationListener` to ensure that a
`spring.profiles.include` property that refers to an already processed
profile doesn't cause an infinite loop.

Closes gh-13361
7 years ago
Madhura Bhave 378c4c9535 Stop included profiles overriding active profiles
Update `ConfigFileApplicationListener` so that `spring.profiles.include`
properties do not override higher priority active profiles.

This commit also changes when profiles get added to the environment.
Profiles are now added to the environment at the time of profile
processing so that they get logged in the order that they are processed.

Closes gh-13151
7 years ago
Brian Clozel 87af880446 Reactor BOM is now declaring reactor-netty 0.8
See gh-13321
7 years ago
Madhura Bhave 360d392eb1 Merge branch '2.0.x' 7 years ago
Madhura Bhave 60a4d67b13 Handle special characters in TraceableHttpServletRequest
Fixes gh-13273
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
Andy Wilkinson ebb99d1c20 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 1a0dfa06ab Add log4j-jul to Log4j 2 starter
Closes gh-12659
7 years ago
Phillip Webb 1d35b629bb Merge branch '2.0.x' 7 years ago
Phillip Webb abe92eba2e Protect Inet test against "helpful" DNS resolvers
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.

Closes gh-11897
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
Andy Wilkinson 0f321abe66 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 70c0d6a005 Test the Gradle plugin against Gradle 4.8
Closes gh-13359
7 years ago
Andy Wilkinson 00449bef6a Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
Closes gh-12631
7 years ago
Andy Wilkinson aee6aecfc2 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 624946a779 Upgrade to Maven Invoker Plugin 3.1.0
Closes gh-12687
7 years ago
Stephane Nicoll 93396aef51 Polish 7 years ago
Andy Wilkinson b38f60a631 Merge branch '2.0.x' 7 years ago
Andy Wilkinson d54072e0a8 More accurately document buildInfo's effect on up-to-date checking
Closes gh-13152
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
Andy Wilkinson d0ce919d8c Merge branch '2.0.x' 7 years ago
Andy Wilkinson 0df37b917b Ignore unresolvable placeholders during property binding
Closes gh-13122
7 years ago
Andy Wilkinson 9c8d2c8016 Improve analysis of bind failures caused by a conversion failure
Closes gh-13357
7 years ago
Andy Wilkinson 92629ac5af Merge branch '2.0.x' 7 years ago
Andy Wilkinson ea51cfabca Avoid uri tag explosion when use of path variable is undetected
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.

Closes gh-12447
7 years ago
Stephane Nicoll 4a6102091e Merge branch '2.0.x' 7 years ago
Stephane Nicoll bc59434bcc Start building against Spring Framework 5.0.7 snapshots
See gh-13353
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
Stephane Nicoll ef9c1a8e35 Extract ClientHttpRequestFactory detection to its own class
See gh-12707
7 years ago
dnosan c9df1c551a Add auto-configuration for WebServiceTemplate
See gh-12707
7 years ago
Stephane Nicoll 283ceaa071 Merge branch '2.0.x' 7 years ago
dreis2211 8bb7b8af51 Remove usage of deprecated Matchers class
Closes gh-13345
7 years ago
Stephane Nicoll d924c89525 Merge branch '2.0.x' 7 years ago
dreis2211 29605bacd2 Polish stream creation in some PropertySources
Closes gh-13343
7 years ago
Madhura Bhave 37a7457f36 Polish 7 years ago
Madhura Bhave 458d574d1f Merge branch '2.0.x' 7 years ago
Madhura Bhave 95174a0773 Don't fail if aggregate merge can't get existing value
Fixes gh-13303
7 years ago
Madhura Bhave 8ce13c765b Support binding to immutable maps
Closes gh-13323
7 years ago
Andy Wilkinson 78b1a37d7d Merge branch '2.0.x' 7 years ago
Andy Wilkinson 68cd27c47b Do not require DataSourcePoolMetrics to auto-configure Hikari meters
Closes gh-13330
7 years ago
Andy Wilkinson e306aad28c Merge branch '2.0.x' 7 years ago
Andy Wilkinson 27267a7090 Ensure that condition evaluator uses runner’s class loader
Closes gh-13319
7 years ago
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1
Closes gh-13322
7 years ago
Johnny Lim 5d5a14e4f7 Make MetricsProperties fields final if possible
Closes gh-13324
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
Madhura Bhave 817c228906 Merge branch '2.0.x' 7 years ago
Madhura Bhave 0afd947350 BindFailureAnalyzer should show original failure message
Fixes gh-13122
7 years ago
Stephane Nicoll 58d634f498 Merge branch '2.0.x' 7 years ago
Stephane Nicoll fa21333e4d Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
Closes gh-13318
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
Andy Wilkinson cff5c1ec72 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 0d7d95d8a9 Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
Closes gh-13314
7 years ago
Stephane Nicoll 55d70d5691 Merge branch '2.0.x' 7 years ago
James McShane d74c768cdd Remove outdated reference to @EnableReactor
Closes gh-13308
7 years ago
Phillip Webb 92b9b234f1 Merge branch '2.0.x' 7 years ago
Phillip Webb 3751968ecd Add missing ExpectedException rule
Add ExpectedException rule which was missed from the 1.5.x merge.
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
Phillip Webb cf27917e86 Merge branch '2.0.x' 7 years ago
Phillip Webb bdd541b2cc Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 5ae061f491 Merge branch '1.5.x' into 2.0.x 7 years ago
Madhura Bhave 9f4a5c13a5 Add auto-config for WebFlux OAuth2 Login
Closes gh-13142
7 years ago
Phillip Webb 792f0b190d Merge branch '2.0.x' 7 years ago
Phillip Webb 2c6465abdc Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 353560278b Merge branch '2.0.x' 7 years ago
Phillip Webb 401fcbeaa4 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 40800355c7 Merge branch '2.0.x' 7 years ago
Phillip Webb 587df6a07a Port call setHttpOnly property on Tomcat context
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4 to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.

See gh-12580
7 years ago
Phillip Webb e38d5f910b Merge branch '1.5.x' into 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 f06627c408 Allow CompositeHealthIndicator to be created with a Map as before
See gh-4965
7 years ago
Stephane Nicoll bb69339a82 Merge branch '2.0.x' 7 years ago
Stephane Nicoll b47a72731f Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll bd9299dbf9 Add missing metadata for renamed SSL properties
Closes gh-13239
7 years ago
Andy Wilkinson 35c48bb9bd Polish 7 years ago
Andy Wilkinson 48a6abe217 Polish 7 years ago
Madhura Bhave ed08e4592f Merge branch '2.0.x' 7 years ago
Madhura Bhave ad1283195a Fix test in "Truststore password if SSLstoreprovider present"
See gh-13088
7 years ago
Ian Chan e75d45ca45 Use empty trust-store password if SSL store provider present
For Tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the trust-store with an
empty password. Previously, if a password was supplied using the
ssl.trust-store-password property, that would be the password used to
load the trust-store and the connector would warn with "Password
verification failed" message.

Fixes gh-12688
7 years ago
Stephane Nicoll 3f001899b4 Harmonize ssl properties for Kafka
Closes gh-13239
7 years ago
Stephane Nicoll 56dd53bfba Merge branch '2.0.x' 7 years ago
Stephane Nicoll 7849d73828 Polish
See gh-13031
7 years ago
Stephane Nicoll c8f57acca6 Merge branch '2.0.x' 7 years ago
Stephane Nicoll faa9910e46 Enable cache when a SecurityContext parameter is used
This commit restores caching for the main read operation when the
SecurityContext does not expose a principal (i.e. guest access).

Closes gh-13238
7 years ago
Andy Wilkinson 32a9addb57 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 1ce22aa50a Polish 7 years ago
Stephane Nicoll 39861bf819 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 4259817572 Fix extension discovery when endpoint instance is sub-classed
This commit fixes endpoint extension discovery when the related endpoint
is sub-classed. Previously, a strict by type check was applied against
the `endpoint` attribute of `EndpointExtension`.

Rather than using a `Class` check, this commit extracts the id of an
endpoint and uses it to match its extension, if any.

Closes gh-13082
7 years ago
Stephane Nicoll 52b80c77d8 Merge branch '2.0.x' 7 years ago
nkjackzhang 17bcd1c359 Fix wrong reference in cast operation
Closes gh-13288
7 years ago
Stephane Nicoll 3bbdeee70b Merge branch '2.0.x' 7 years ago
Johnny Lim bd2053aa17 Use more Tag constants
Closes gh-13286
7 years ago
Stephane Nicoll 188ba14c17 Merge branch '2.0.x' 7 years ago
Johnny Lim 9de2a8786d Fix a wrong issue reference
Closes gh-13284
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 ec65cb1753 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 15ba50ab3e Merge branch '1.5.x' into 2.0.x 7 years ago
Johnny Lim de01e7aad4 Polish
See gh-13243
7 years ago
Stephane Nicoll f91b53747a Merge branch '2.0.x' 7 years ago
Johnny Lim f385a1cb11 Polish
Closes gh-13243
7 years ago
Stephane Nicoll 7462401291 Merge branch '2.0.x' 7 years ago
Eddú Meléndez 065eebfb4b Fix javadoc
Closes gh-13274
7 years ago
Stephane Nicoll be9a0ef65d Merge branch '2.0.x' 7 years ago
hengyunabc b75e58b70f Add enforce-rule to ensure maven version >= 3.5.0
Closes gh-13271
7 years ago
Phillip Webb 3739699d79 Merge branch '2.0.x' 7 years ago
Phillip Webb dba73d76b8 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 1bb53ff44c Merge branch '2.0.x' 7 years ago
Arnaud Heritier b60eadb10b Add missing semicolon in example
Closes gh-13266
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 e544922dd7 Merge branch '1.5.x' into 2.0.x 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 75c10e615e Merge branch '2.0.x' 7 years ago
Andrea Vacondio aed118c410 Fix documentation error
Closes gh-13260
7 years ago
Madhura Bhave 940c3d1b75 Merge branch '2.0.x' 7 years ago
Madhura Bhave 552878c431 Fix javadoc 7 years ago
Stephane Nicoll 79967a482a Merge branch '2.0.x' 7 years ago
Stephane Nicoll a5b53b263e 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
Stephane Nicoll 1ea3e95ff6 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 585135a280 Polish 7 years ago
Stephane Nicoll d5abd57a91 Remove deprecated use of spring.main.web-environment
Closes gh-13231
7 years ago
Stephane Nicoll 12bbb18844 Merge branch '2.0.x' 7 years ago
Stephane Nicoll a124379dd9 Remove use of deprecated `web` methods
Closes gh-13231
7 years ago
Stephane Nicoll 699b6ce6dc Remove reference to Jersey 1
Closes gh-12582
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
Johnny Lim d72ba70cba Use type parameter for Supplier in AggregateBinder.merge()
Closes gh-13139
7 years ago
Stephane Nicoll 243023f2ad Merge branch '2.0.x' 7 years ago
Stephane Nicoll 300f6bf4d7 Polish contribution
Closes gh-13208
7 years ago
Mihhail Lapushkin d31dbac69e Support custom UriTemplateHandler in LocalHostUriTemplateHandler
See gh-13208
7 years ago
Stephane Nicoll 27c60e3deb Merge branch '2.0.x' 7 years ago
Stephane Nicoll 48cf025093 Polish 7 years ago
Stephane Nicoll d35d221b5c Merge branch '2.0.x' 7 years ago
Stephane Nicoll 6893be5479 Make sure that RabbitMQ metrics are configured early
The ConnectionFactory can be used early in user configuration to
configure an `Exchange`. Such connection may not hold the proper
MetricCollector and can be cached, leading to missed metrics
information.

This commit moves the configuration of RabbitMQ metrics to a
BeanPostProcessor so that the proper MetricCollector is configured
before any connection is created.

Closes gh-12855
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
Stephane Nicoll afe6abb20d Merge branch '2.0.x' 7 years ago
Johnny Lim 75639aa682 Polish
Closes gh-13192
7 years ago
Stephane Nicoll b51b997b70 Run specific health check
This commit improves the `health` endpoint to run health check for a
particular component or, if that component is itself a composite, an
instance of that component.

Concretely, it is now possible to issue a `GET` on
`/actuator/health/{component}` and
`/actuator/health/{component}/instance` to retrieve the health of a
component or an instance of a composite component, respectively.

If details cannot be showed for the current user, any request leads to a
404 and does not invoke the health check at all.

Closes gh-8865
7 years ago
Andy Wilkinson 9f6d3bb21d Upgrade to Spring Data Lovelace M3
Closes gh-13169
7 years ago
Stephane Nicoll beafba4487 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 1d2edc1d37 Fix wrong reference to WebApplicationType
Closes gh-13195
7 years ago
Stephane Nicoll 2c176a3770 Add support for ReactiveHealthIndicatorRegistry
This commit updates the initial proposal to add support for reactive
use cases as well. A reactive application can use
ReactiveHealthIndicatorRegistry as an alternative to
HealthIndicatorRegistry.

Closes gh-4965
7 years ago
Stephane Nicoll 95b251590e Polish "Introduce HealthIndicatorRegistry"
See gh-4965

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
7 years ago
Vedran Pavic d829d522be Introduce HealthIndicatorRegistry
This commit introduces HealthIndicatorRegistry which handles
registration of HealthIndicator instances. Registering new
HealthIndicator instances is now possible in runtime.

See gh-4965
7 years ago
Stephane Nicoll ffdcdc0dc6 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 7b7e802129 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 69aa4913e3 Align tests for OAuth properties adapter with changes in Spring Security
Closes gh-13185
7 years ago
Andy Wilkinson d8f9aad8d4 Upgrade to Spring Security 5.1.0.M1
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 38b491018c Upgrade to Solr 7.2.1
Closes gh-13182
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 795ff45a65 Upgrade to Cassandra Java Driver 3.5.0
Closes gh-13177
7 years ago
Andy Wilkinson 150a19523c Start building against Spring Data Lovelace M3 snapshots
See gh-13169
7 years ago
Andy Wilkinson 33fadda4d9 Upgrade to Mongo Driver Reactive Streams 1.9.0-beta1
Closes gh-13180
7 years ago
Andy Wilkinson 3dfacaa1e3 Upgrade to MongoDB 3.8.0-beta2
Closes gh-13179
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 ed02d02d19 Polish "Allow repackage maven goal to take a source classifier"
Closes gh-11061
7 years ago
Björn 3c8e012411 Allow repackage maven goal to take a source classifier
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.

This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.

If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.

See gh-11061
7 years ago
Andy Wilkinson 08a12e7964 Merge branch '2.0.x' 7 years ago
Andy Wilkinson be0b8eb871 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 72b45584eb Merge branch '2.0.x' 7 years ago
Andy Wilkinson 8b028e30d3 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 46855ab8eb Merge branch '2.0.x' 7 years ago
Andy Wilkinson 73e525a280 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 16457ad988 Merge branch '2.0.x' 7 years ago
Andy Wilkinson cddc2b4483 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 497aebe010 Merge branch '2.0.x' 7 years ago
Stephane Nicoll a3a6a2b291 Polish "Add CLI manifest for Scoop"
Closes gh-12541
7 years ago
Andrey Saksonov daccdbb18d Add CLI manifest for Scoop
See gh-12541
7 years ago
Stephane Nicoll 24024b00da Merge branch '2.0.x' 7 years ago
Stephane Nicoll 2be1c8f527 Polish "Set classloader for JMX endpoints to application classloader"
Closes gh-12209
7 years ago
David Herberth e44c81672f Set classloader for JMX endpoints to application classloader
See gh-12209
7 years ago
Frank Pavageau ab7f6654d8 Manage the Mockito/JUnit 5 dependency
This requires an updated Mockito dependency as well, since it was
introduced in Mockito 2.17.0 but really works starting with 2.18.0.

Closes gh-12890
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 b839c98de9 Merge branch '2.0.x' 7 years ago
Sebastien Deleuze d747d43b23 Update Kotlin refdoc with the new tutorial
Closes gh-13161
7 years ago
Stephane Nicoll c8dc885cc5 Add missing note
See gh-12933
7 years ago
Stephane Nicoll 602f52fffc Add support for configuring common tags declaratively
Closes gh-12933
7 years ago
Andy Wilkinson 8e4f4317f6 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 285203d272 Provide dependency management for Hibernate's JPA API module
Closes gh-13154
7 years ago
Stephane Nicoll 93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path
Closes gh-12971
7 years ago
Stephane Nicoll 406192741e Upgrade to Maven Exec Plugin 1.6.0
Closes gh-13101
7 years ago
Stephane Nicoll 37324785fc Merge branch '2.0.x' 7 years ago
Stephane Nicoll caa271dcc1 Merge branch '1.5.x' into 2.0.x 7 years ago