Andy Wilkinson
508bfda9ad
Start building against Spring Framework 5.0.10 snapshots
...
See gh-14722
6 years ago
Andy Wilkinson
07dd689c9c
Polish
6 years ago
dreis2211
e6313fd96f
Fix @Cacheable typo
...
Closes gh-14720
6 years ago
Andy Wilkinson
9afd6f53e5
Document need for -parameters compilation with @SpyBean and @Cacheable
...
Closes gh-13945
6 years ago
Andy Wilkinson
4f51a83ab3
Add a note recommending the use of containers' multipart upload
...
Closes gh-2958
6 years ago
Andy Wilkinson
d3b3c8c64e
Honour management.metrics.web.server.auto-time-requests with WebFlux
...
Closes gh-13895
6 years ago
Andy Wilkinson
1f34da9025
Document application plugin's need for mainClassName to be set
...
Closes gh-14250
6 years ago
Andy Wilkinson
5d3f30ee94
Honour SSL key and trust store providers when configuring Netty
...
Closes gh-14714
6 years ago
Andy Wilkinson
d6d59edb35
Merge branch '1.5.x' into 2.0.x
6 years ago
dreis2211
55ec016bac
Remove unused fields in tests
...
Closes gh-14707
6 years ago
Andy Wilkinson
bbdd6cc9cb
Merge branch '1.5.x'
6 years ago
Andy Wilkinson
ca329d3d03
Update Jersey indicator class to one that requires the Servlet API
...
Previously, if WebFlux and Jersey were on the classpath, but there was
no Servlet API (and no embedded container) on the classpath, the web
application type would be prevented from being reactive. The absence
of the Servlet API would then prevent the web application type from
being servlet so it would be none.
By contrast, if Spring MVC was on the classpath in place of Jersey
the absence of the Servlet API would allow the web application type to
be reactive. This happened because the Spring MVC indicator class is
DispatcherServlet which requires the Servlet API.
This commit updates the Jersey indicator class to be ServletContainer.
This class is both an HttpServlet and a Filter so it too requires the
Servlet API and, therefore, further aligns the deduction behaviour for
Jersey and Spring MVC.
Closes gh-14701
6 years ago
Phillip Webb
6aedb69443
Update copyright year for changed files
6 years ago
Phillip Webb
456d1af443
Polish
6 years ago
Stephane Nicoll
febaf15b61
Guard WebApplicationType detection in case spring web is not present
...
Closes gh-14589
6 years ago
Andy Wilkinson
8573edc03e
Provide complete dependency management for Micrometer
...
Closes gh-14700
6 years ago
Andy Wilkinson
ad647ba073
Make JSON-B auto-config back of if no JSON-P implementation is available
...
Closes gh-14675
6 years ago
Andy Wilkinson
8ee4c5e4a1
Use offical JSON API jar rather than Geronimo's in Artemis starter
...
Closes gh-14691
6 years ago
Andy Wilkinson
0ad0785bf7
Provide complete dependency management for Apache Johnzon
...
Closes gh-14692
6 years ago
Andy Wilkinson
7490d8b99d
Make JSON-B auto-config back off when no implementation is available
...
Previously, the JSON-B auto-configuration would be enabled when the JSON-B API was
on the classpath. This led to a failure if there was no implementation available.
The JSON-B API loads an implementation using the service loader. This commit updates
the auto-configuration to be conditional on the presence of a
META-INF/services/javax.json.bind.spi.JsonbProvider file on the classpath.
Closes gh-14675
6 years ago
Andy Wilkinson
e7f100d5d7
Improve test coverage of PropertiesMeterFilter
...
Closes gh-14689
6 years ago
Phillip Webb
2b6bdfe277
Fix Reactive...Context NPE
...
Fix possible NPE in `ReactiveWebServerApplicationContext`.
See gh-14666
6 years ago
Stephane Nicoll
6cc272ecf5
Polish "Make sure cache busting works with error pages"
...
Closes gh-14583
6 years ago
artsiom
64f04fceea
Make sure cache busting works with error pages
...
See gh-14583
6 years ago
Phillip Webb
8c896d9376
Improve Reactive...Context thread safety
...
Refactor `ReactiveWebServerApplicationContext` to improve thread safety
by using a single manager object rather than then trying to synchronize
the `WebServer` and `HttpHandler`.
Closes gh-14666
6 years ago
Andy Wilkinson
cf24d18139
Explicity set permissions on files in lib of Boot distribution
...
Previously, only the permissions for the scripts in bin/ were set. The
permissions for the files in lib/ were not explicity set, leaving them
with the same permissions as the source files in Gradle's cache. This
has proven to be a little brittle when building in certain
environments, leading to test failures. It also assumes that the
file permissions in Gradle's cache will be appropriate for entries in
a distribution archive. That may not always be a reasonable assumption
to make.
To avoid the above-described problems, this commit updates the copy
spec that's used to add files to lib/ in the archive so that each
file uses 0644 for its permissions.
Closes gh-14158
6 years ago
Stephane Nicoll
1b10d3fcbf
Fix missing metadata for nested POJO
...
This commit fixes missing descriptions and default values when
applicable for `management.server.ssl`, `server.compression`,
`server.http2`, `server.servlet.jsp`, `server.servlet.session` and
`server.ssl`.
Those nested namespace are managed by a POJO that is declared outside
of the module of the target @ConfigurationProperties type using it. As
a result, the annotation processor has no access to the source model and
can't extract the description and the default value, if any.
This commit migrates the misleading field-level Javadoc to manual meta
data for the time being.
Closes gh-14669
6 years ago
Roland Weisleder
d2a063b26a
Clarify Javadoc of ConditionalOn annotations
...
Closes gh-14681
6 years ago
Stephane Nicoll
b4c5aea152
Fix detection of WebApplicationType with context class
...
Closes gh-14589
6 years ago
Janne Valkealahti
26345d3900
Polish docs
...
This commit replaces tabs to spaces in a yaml example for configuring
endpoint web exposure include.
Closes gh-14670
6 years ago
Stephane Nicoll
b248afc808
Clarify conversion system in Appendix
...
Closes gh-14645
6 years ago
Stephane Nicoll
135797c347
Remove useless prerequisites section
...
Closes gh-14668
6 years ago
Phillip Webb
bd9500290e
Defer HttpHandler initialization
...
Update `ReactiveWebServerApplicationContext` so that the `HttpHandler`
bean is not longer created from `onRefresh`, but is instead created
only when the server starts.
Prior to this commit, the WebFlux hander would cause early
initialization of several beans, including Jackson Modules.
Closes gh-14666
6 years ago
Phillip Webb
7afde2ba43
Add another ConfigurationPropertyName.equals test
...
Include an additional test to ensure that `.equals` works for names
starting with the same value.
See gh-14665
6 years ago
Phillip Webb
3ff20b2440
Restore import-control checkstyle
...
Restore checkstyle import control and fix a few violations in the
process.
Closes gh-14660
6 years ago
Rodolpho Couto
e30f693699
Add reference to valiktor-spring-boot-starter
...
Closes gh-14514
6 years ago
Johnny Lim
1eca492c5e
Polish
...
See gh-14621
6 years ago
Andy Wilkinson
da1fde6a5f
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
fd10226c54
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
62b481c7db
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
89f5cfc5a4
Merge branch '1.5.x' into 2.0.x
6 years ago
jnizet
eee07a840f
Move away from deprecated Gradle configurations
...
Closes gh-14593
6 years ago
Stephane Nicoll
b6e5103dc4
Polish contribution
...
Closes gh-14592
6 years ago
Marten Deinum
77afe76ed5
Polish
...
The SpringBootContextLoader still checked if tests were annotated with
@IntegrationTest or @WebIntegrationTest. Those classes have been
removed in Spring Boot 1.5 and been deprecated since 1.4.
This commit removes the check on the annotations as well as the static
list of names.
See gh-14592
6 years ago
Stephane Nicoll
885948ce3b
Polish
6 years ago
artsiom
7fb13d0dc2
Fix WebSocket web server customizer bean names
...
Closes gh-14582
6 years ago
Gary Russell
26c1e389df
Polish RabbitMQ properties doc
...
Fix description for `prefetch`; remove reference to transactions since
the direct container does not support transactionSize.
Also fix `transactionSize` to just reference acks; autoConfiguration
doesn't support enabling transactions.
Closes gh-14569
6 years ago
Stephane Nicoll
5506d972c6
Polish "Fix and improve Neo4j related documentation"
...
Closes gh-14548
6 years ago
Michael J. Simons
8a53adf3d2
Fix and improve Neo4j related documentation
...
See gh-14548
6 years ago
Stephane Nicoll
8cce5d3f64
Polish "Add dependency management for Neo4J OGM embedded driver"
...
Closes gh-14560
6 years ago
Michael J. Simons
ad449e9520
Add dependency management for Neo4J OGM embedded driver
...
See gh-14560
6 years ago
Stephane Nicoll
63d276da58
Upgrade to Neo4j Ogm 3.1.3
...
Closes gh-14536
6 years ago
Stephane Nicoll
75c893164e
Upgrade to Hibernate Validator 6.0.13.Final
...
Closes gh-14535
6 years ago
Stephane Nicoll
5cac8ac70b
Upgrade to Elasticsearch 5.6.12
...
Closes gh-14534
6 years ago
Stephane Nicoll
0143cb6193
Upgrade to Janino 3.0.10
...
Closes gh-14533
6 years ago
Stephane Nicoll
f49f407b99
Upgrade to Johnzon Jsonb 1.1.10
...
Closes gh-14532
6 years ago
Stephane Nicoll
59ecfea104
Upgrade to Unboundid Ldapsdk 4.0.8
...
Closes gh-14531
6 years ago
Stephane Nicoll
380696de58
Upgrade to Jackson 2.9.7
...
Closes gh-14530
6 years ago
Stephane Nicoll
8aece088a4
Upgrade to Spring Web Services 3.0.4.RELEASE
...
Closes gh-14526
6 years ago
Stephane Nicoll
957321492f
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
bff93a67ce
Fix remote DevTools restart when a previously added class is then changed
...
Previously, if a class was added and then changed, a restart would be triggered
and things would behave as if the class had been deleted. This occurred
because, when looking for additional classes that were not on the original
classpath, only files that had been added were considered. The subsequent
change to the class was noticed as a modified rather than an addition,
resulting in the class being skipped.
This commit updates the resource resolver to only ignore deleted files and
consider both added files and modified files when looking for additional
resources.
Closes gh-14205
6 years ago
Marcel Overdijk
0870f23902
Fix dependency management for Caffeine
...
Closes gh-14505
6 years ago
DK Lee
01cf52447c
Fix typo in WebClient example
...
Closes gh-14499
6 years ago
Andy Wilkinson
6fba477d5e
Remove redundant handling of a null exchange from WebFluxTags.uri()
...
Closes gh-14504
6 years ago
Andy Wilkinson
6020cb67d3
Polish javadoc of status method on WebFluxTags and WebMvcTags
6 years ago
Madhura Bhave
d7d5cbf959
Simplify printing ConditionEvaluationReport when using context runner
...
Closes gh-13119
6 years ago
Andy Wilkinson
fc60d9f6d4
Merge branch '1.5.x' into 2.0.x
6 years ago
Madhura Bhave
5708792d82
Merge branch '1.5.x' into 2.0.x
6 years ago
Madhura Bhave
09ccf875b7
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
ae4e1d0372
Test the Gradle plugin against Gradle 4.10
...
Closes gh-14417
6 years ago
Andy Wilkinson
630e2d0b41
Correct the permissions of scripts in archives of boot distribution
...
Closes gh-14158
6 years ago
Madhura Bhave
7af6665a0e
Ignore management.server.port for war
...
Fixes gh-14148
6 years ago
Andy Wilkinson
39d383006c
Upgrade to Spring Cloud Connectors 2.0.3.RELEASE
...
Closes gh-14414
6 years ago
Andy Wilkinson
2e86a6f479
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
9b1e74b2f1
Upgrade to Spring Session Apple-SR5
...
Closes gh-14332
6 years ago
Andy Wilkinson
856f9cb0ea
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
d09436872c
Upgrade to Spring Integration 5.0.8.RELEASE
...
Closes gh-14330
6 years ago
Andy Wilkinson
d7bfd07724
Upgrade to Spring Security 5.0.8.RELEASE
...
Closes gh-14403
6 years ago
Andy Wilkinson
0174417fb0
Upgrade to Spring Kafka 2.1.10.RELEASE
...
Closes gh-14402
6 years ago
Andy Wilkinson
8552d57757
Upgrade to Spring Amqp 2.0.6.RELEASE
...
Closes gh-14401
6 years ago
Andy Wilkinson
c33eda65c7
Upgrade to Spring Data Kay SR10
...
Closes gh-14328
6 years ago
Andy Wilkinson
a6feebb39d
Upgrade to Spring Kafka 2.1.9.RELEASE
...
Closes gh-14372
6 years ago
Andy Wilkinson
be498f945c
Upgrade to Postgresql 42.2.5
...
Closes gh-14371
6 years ago
Andy Wilkinson
54302b9a7b
Upgrade to Jetty El 8.5.33
...
Closes gh-14370
6 years ago
Andy Wilkinson
5010a690e8
Upgrade to Jaybird 3.0.5
...
Closes gh-14369
6 years ago
Andy Wilkinson
e2e8db3876
Upgrade to Elasticsearch 5.6.11
...
Closes gh-14368
6 years ago
Andy Wilkinson
03eda003d0
Upgrade to Janino 3.0.9
...
Closes gh-14367
6 years ago
Andy Wilkinson
cdd819adaa
Upgrade to Johnzon Jsonb 1.1.9
...
Closes gh-14366
6 years ago
Andy Wilkinson
59cb5bf44c
Upgrade to Activemq 5.15.6
...
Closes gh-14365
6 years ago
Andy Wilkinson
5c891f8e1b
Upgrade to Netty 4.1.29.Final
...
Closes gh-14364
6 years ago
Andy Wilkinson
956ef0f785
Upgrade to Javax Mail 1.6.2
...
Closes gh-14363
6 years ago
Andy Wilkinson
590ea73097
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
8afa201271
Start building against Spring Session Apple snapshots
...
See gh-14332
6 years ago
Stephane Nicoll
1740f039f3
Start building against Spring Integration snapshots
...
See gh-14330
6 years ago
Stephane Nicoll
d53839eecb
Start building against Spring Data Kay snapshots
...
See gh-14328
6 years ago
Madhura Bhave
e41394233b
Harmonize ReactiveSecurityAutoConfiguration
...
Fixes gh-14263
6 years ago
Stephane Nicoll
ce63db2e42
Upgrade to Spring Framework 5.0.9
...
Closes gh-14325
6 years ago
Stephane Nicoll
b7e1a2ea6c
Add reference to Rollbar starter
...
Closes gh-14343
6 years ago
Andy Wilkinson
aa45f3c702
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
61344f7d9c
Upgrade to Reactor Bom Bismuth-SR11
...
Closes gh-14322
6 years ago
Stephane Nicoll
128ed77a69
Start building against Spring Framework 5.0 snapshots
...
See gh-14325
6 years ago
Madhura Bhave
ccdbc0aa06
Polish "Remove redundancy from actuator documentation"
...
Closes gh-14206
6 years ago
kuldeepsidhu88
abf5e63b54
Remove redundancy from actuator documentation
...
See gh-14206
6 years ago
Andy Wilkinson
6c865f9b43
Polish
...
See gh-1176
6 years ago
Andy Wilkinson
53372d5fd7
Document the use of --args to pass arguments to bootRun
...
Closes gh-1176
6 years ago
Stephane Nicoll
ff8b8c55c6
Remove reference to "management.metrics.binders.integration.enabled"
...
Closes gh-14319
6 years ago
Phillip Webb
a2cea6a45a
Upgrade amqp-client to 5.4.1
...
See gh-14259
6 years ago
Phillip Webb
ec27137632
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
b580dd70f8
Polish
6 years ago
Stephane Nicoll
3469142fec
Partially revert 59d911d
...
This commit restores the public `UsesUnsafeJava` and flag it as
deprecated.
Closes gh-14072
6 years ago
Stephane Nicoll
c410f7d153
Merge branch '1.5.x' into 2.0.x
6 years ago
Madhura Bhave
9c82d5c382
Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
...
Fixes gh-14161
6 years ago
Phillip Webb
cafff43022
Update copyright header of changed files
6 years ago
Phillip Webb
9af6b3422f
Polish
6 years ago
Phillip Webb
45613f8c3c
Merge branch '1.5.x' into 2.0.x
6 years ago
Johnny Lim
ca57e58ee5
Polish
...
See gh-14293
6 years ago
Johnny Lim
3eef927499
Use InvalidEndpointRequestException for MetricsEndpoint
...
Closes gh-14291
6 years ago
Kedar Joshi
72ebfb0332
Update default compressible media types
...
Closes gh-14278
6 years ago
Stephane Nicoll
42bf594d96
Polish condition name
...
See gh-14285
6 years ago
Stephane Nicoll
ddeae9b58e
Polish "Fix WSDL locations condition to work with a list"
...
Closes gh-14285
6 years ago
Eneias Cordeiro da Silva
80358f7fbf
Fix WSDL locations condition to work with a list
...
See gh-14285
6 years ago
Stephane Nicoll
6078865372
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
8950c3ebb4
Polish
...
See gh-14271
6 years ago
Stephane Nicoll
00233cd57e
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
ea2fb620b4
Clarify structure of prefixes
...
Closes gh-14258
6 years ago
Stephane Nicoll
6d637bc53b
Add missing condition
...
Closes gh-14264
6 years ago
Phillip Webb
2e2f91d4a0
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
0625443d27
Polish "Limit metrics collection of incoming requests"
...
Closes gh-14173
6 years ago
Dmytro Nosan
81a6701914
Limit metrics collection of incoming requests
...
See gh-14173
6 years ago
Stephane Nicoll
f9081a2c23
Revert "Polish some joining collectors"
...
See gh-14221
6 years ago
dreis2211
afda71e419
Polish some joining collectors
...
Closes gh-14221
6 years ago
Stephane Nicoll
3997b3ae5e
Polish
6 years ago
Stephane Nicoll
ff11166af8
Restore RabbitMQ advanced starter as it is compatible with Spring Boot 2
6 years ago
dreis2211
70add0617a
Collapse identical catch blocks
...
Closes gh-14213
6 years ago
Stephane Nicoll
af426e383f
Review slice documentation to clarify the scope and alternative options
...
Closes gh-13810
6 years ago
Stephane Nicoll
f53e6c701f
Improve actuator documentation about the types supported for endpoints
...
Closes gh-13896
6 years ago
Stephane Nicoll
f5482a33a3
Document custom DispatcherServlet requirement
...
Closes gh-14145
6 years ago
Johnny Lim
fb71174c24
Polish
...
Closes gh-14184
6 years ago
Stephane Nicoll
be00c1db63
Fix dependency between cache and hibernate
...
This commit fixes the ordering between `CacheAutoConfiguration` and
`HibernateJpaAutoConfiguration` so that the auto-configured
`CacheManager` is configured before Hibernate starts.
Closes gh-14181
6 years ago
Stephane Nicoll
5e7be50265
Restore trace request param behaviour with error controller
...
This commits restores the behaviour of Spring Boot 1.x with regards to
the "trace" request param used to add the stacktrace to the model.
This was inadvertently changed so that the stacktrace would be added
if the parameter wasn't set.
Closes gh-14171
6 years ago
Stephane Nicoll
9938d1f4b6
Order IntegrationAutoConfiguration properly
...
This commit makes sure that the auto-configuration for Spring
Integration runs after the datasource has been auto-configured if
necessary as there is an optional part that can initialize the jdbc
schema.
Closes gh-14175
6 years ago
Stephane Nicoll
000cb94323
Polish "Fix String concatenation in a loop"
...
Closes gh-14153
6 years ago
Hiroaki Yoshida
43acc37587
Fix String concatenation in a loop
...
See gh-14153
6 years ago
Madhura Bhave
55406d91d2
Consider dash & underscore when equating indexed elements
...
Fixes gh-14136
6 years ago
Stephane Nicoll
3d7d1e070f
Upgrade to Neo4j Ogm 3.1.2
...
Closes gh-14164
6 years ago
Hiroaki Yoshida
6e86ba12b7
Fix potential infinite recursive loop in toString
...
Closes gh-14152
6 years ago
Stephane Nicoll
b0d388830f
Polish test
6 years ago
Stephane Nicoll
e03f01564a
Deprecate EntityManagerFactoryBeanCallback
...
Closes gh-14083
6 years ago
Stephane Nicoll
e034b383db
Fix checkstyle violation
...
Closes gh-14125
6 years ago
Stephane Nicoll
d80ed27339
Fix checkstyle violation
6 years ago
Stephane Nicoll
eedeaa29e5
Polish "Replace loops with Arrays.setAll where possible"
...
Closes gh-14125
6 years ago
dreis2211
0bc66dc4a9
Replace loops with Arrays.setAll where possible
...
See gh-14125
6 years ago
Gerrit Meier
7e570acf07
Upgrade to Neo4j Ogm 3.1.1
...
Closes gh-14132
6 years ago
Madhura Bhave
f7135ff18f
Use ResolverStyle.SMART when a custom format is specified
...
Fixes gh-13970
6 years ago
artsiom
51fd27fad4
Configure HiddenHttpMethodFilter for Spring WebFlux
...
Closes gh-14008
6 years ago
Stephane Nicoll
22bc2bd7ba
Upgrade to Httpasyncclient 4.1.4
...
Closes gh-14098
6 years ago
Stephane Nicoll
412ff051e3
Upgrade to Derby 10.14.2.0
...
Closes gh-14097
6 years ago
Stephane Nicoll
b1805f4d37
Upgrade to Activemq 5.15.5
...
Closes gh-14096
6 years ago
Stephane Nicoll
bffc542409
Upgrade to Jest 5.3.4
...
Closes gh-14095
6 years ago
Stephane Nicoll
05dfdfad1d
Upgrade to Rxjava2 2.1.17
...
Closes gh-14094
6 years ago
Stephane Nicoll
83ee7fc934
Upgrade to Netty 4.1.28.Final
...
Closes gh-14093
6 years ago
Stephane Nicoll
8c29586699
Upgrade to Lettuce 5.0.5.RELEASE
...
Closes gh-14092
6 years ago
Stephane Nicoll
a303109d93
Upgrade to Unboundid Ldapsdk 4.0.7
...
Closes gh-14091
6 years ago
Madhura Bhave
b93c2b9a9f
Allow actuator endpoints to be used with mvcMatchers
...
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.
For all other applications, AntPathRequestMatcher is used as
a delegate.
Closes gh-13962
6 years ago
Stephane Nicoll
376ef83dc0
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
3e093035b4
Merge branch '1.5.x' into 2.0.x
6 years ago
Johnny Lim
5f3f1a1f11
Polish
...
Closes gh-14067
6 years ago
Stephane Nicoll
ca4ca15ef2
Restore Jade Templates starter as it is compatible with Spring Boot 2
6 years ago
dreis2211
59d911d6e0
Remove @UsesUnsafeJava annotations
...
Closes gh-14072
6 years ago
Johnny Lim
b4abccc07c
Polish
...
See gh-14049
6 years ago
Madhura Bhave
895d092640
PropertySourcesLoader with highest precedence should win
...
Fixes gh-13955
6 years ago
Andy Wilkinson
1973e342c9
Do not use lambda for task action as it breaks up-to-date checks
...
Due to gradle/gradle#5510 , using a lambda for a task action breaks
up-to-date checks in certain circumstances.
This commit updates JavaPluginAction to use an inner-class in place
of a lambda for the action that it adds to JavaCompile tasks. A test
has not been added as it does not appear to be possible to reproduce
it with a TestKit-based test.
Closes gh-14054
6 years ago
Stephane Nicoll
da1858f620
Upgrade to Hibernate Validator 6.0.12.Final
...
Closes gh-14053
6 years ago
Madhura Bhave
dfb97eb0f5
Convert environment if webApplicationType changes
...
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.
Fixes gh-13977
6 years ago
Andy Wilkinson
6e5ff77bb0
Merge branch '1.5.x' into 2.0.x
...
The 3.0.1 version of the Maven Javadoc Plugin contains a bug [1] that
means that a link URL must redirect otherwise it is ignored.
[1] https://issues.apache.org/jira/browse/MJAVADOC-532
6 years ago
Andy Wilkinson
58aaf4863f
Merge pull request #14032 from Nikolay Rybak
...
* gh-14032:
Propagate retryWrites flag from connection URI to ReactiveMongoClient
6 years ago
Nikolay Rybak
7759dcd9df
Propagate retryWrites flag from connection URI to ReactiveMongoClient
...
Closes gh-14032
6 years ago
Andy Wilkinson
29e38f4af8
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
f4b0101632
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
263e157ef0
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
27f5e46587
Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
...
Closes gh-14019
6 years ago
artsiom
83fbdc6ea8
Fix NPE in FlywayEndpoint when migration.installedOn is null
...
See gh-14019
6 years ago
Stephane Nicoll
a023bd030a
Add configurable timeout for Couchbase health indicator
...
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.
Closes gh-13879
6 years ago
Stephane Nicoll
21691f0b20
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
fbf3c48bf8
Fix setter detection in `configprops` endpoint
...
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).
This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.
Closes gh-13878
6 years ago
dreis2211
72707b9d58
Polish OnWebApplicationCondition
...
Closes gh-14015
6 years ago
dreis2211
47ed48625c
Fix typo
...
Closes gh-14013
6 years ago
Stephane Nicoll
e68dc2d3c4
Prune 3rd party starters that are not compatible with Spring Boot 2
...
Those can be re-added at any time there is Spring Boot 2 support
Closes gh-13510
6 years ago
Stephane Nicoll
f731f6aa39
Restore customization of HTTP trace request headers
...
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.
Closes gh-13924
6 years ago
Stephane Nicoll
737b4a275b
Polish
6 years ago
Stephane Nicoll
0f095abded
Polish
6 years ago
Stephane Nicoll
20ea16fe9f
Merge branch '1.5.x' into 2.0.x
6 years ago
Johnny Lim
7b6b91aae7
Return null immediately when sla is null in convertSla()
...
Closes gh-13991
6 years ago
Madhura Bhave
16aff4cd2c
Refactor PropertySourcesDeducer
...
Prior to the changes that fixed #12451 ,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.
Fixes gh-13738
6 years ago
Madhura Bhave
7e2494ebdd
Set environment active profiles according to processing order
...
Fixes gh-13965
6 years ago
cmakinen
07d96689c6
Add dependency management for micrometer-registry-cloudwatch
...
Closes gh-13982
6 years ago
Johnny Lim
94468e5865
Polish
...
See gh-13963
6 years ago
Stephane Nicoll
4e45f36bd1
Clean basePath if necessary
...
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already
Close gh-13964
6 years ago
dreis2211
66b1742f96
Optimize some StringBuilder.append() calls
...
Closes gh-13961
6 years ago
Stephane Nicoll
d31f68380a
Deprecate PooledConnectionFactory properties
...
This commit deprecated the properties of `PooledConnectionFactory` that
are no longer supported by an alternative that is a JMS 2 compliant.
This commit also adds a note to warn users that this pool implementation
is not JMS 2 compliant.
Closes gh-13956
6 years ago
Muhammad Hewedy
2f69785c6a
Add classpath prefix to the flyway location
...
Closes gh-13933
6 years ago
Johnny Lim
d4fba783fb
Remove ex.printStackTrace() in tests
...
Closes gh-13952
6 years ago
Andy Wilkinson
06b4007ce4
Avoid installing unwanted ConsoleHandler when cleaning up
...
Closes gh-13470
6 years ago
Madhura Bhave
01abb196ef
Fix typo
6 years ago
Stephane Nicoll
1435d83c18
Upgrade to Spring Session Apple-SR4
...
Closes gh-13888
6 years ago
Phillip Webb
0ec22c8bf9
Polish copyright date on changed files
6 years ago
Phillip Webb
aeb885192e
Polish ternary expressions
6 years ago
Stephane Nicoll
b24bb688b8
Upgrade to Spring Integration 5.0.7.RELEASE
...
Closes gh-13886
6 years ago
Phillip Webb
63b609827e
Fix checkstyle method order issues
...
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.
See gh-13932
6 years ago
Phillip Webb
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
6 years ago
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
6 years ago
Phillip Webb
ec1100a896
Upgrade to spring-javaformat 0.0.6
...
Closes gh-13932
6 years ago
Phillip Webb
cddd794a07
Polish
6 years ago
Madhura Bhave
e753b530fa
EndpointRequest should match links with trailing slash
...
Fixes gh-13921
6 years ago
Stephane Nicoll
f7b90a73a0
Upgrade to Spring Kafka 2.1.8.RELEASE
...
Closes gh-13887
6 years ago
Stephane Nicoll
2a0d1918f1
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
659535d1ec
Upgrade to Spring Data Kay SR9
...
Closes gh-13890
6 years ago
Johnny Lim
8a9224b78c
Polish NoSuchBeanDefinitionFailureAnalyzer
...
Closes gh-13923
6 years ago
Stephane Nicoll
54a6ee7a06
Upgrade to Spring HATEOAS 0.25.0.RELEASE
...
Closes gh-13742
6 years ago
Stephane Nicoll
8603fdddb1
Upgrade to Spring Amqp 2.0.5.RELEASE
...
Closes gh-3884
6 years ago
Stephane Nicoll
d98b23bdd9
Upgrade to Spring Framework 5.0.8
...
Closes gh-13704
6 years ago
dreis2211
bfbf57b0eb
Fix typo
...
Closes gh-13919
6 years ago
Stephane Nicoll
0f15b72fab
Upgrade to Spring Security 5.0.7.RELEASE
...
Closes gh-13898
6 years ago
Stephane Nicoll
85cffd1ab5
Upgrade to Spring Web Services 3.0.3.RELEASE
...
Closes gh-13912
6 years ago
Stephane Nicoll
37f1146c31
Fix formatting
6 years ago
Madhura Bhave
c775ff8f60
Fix import
6 years ago
Madhura Bhave
6bd438a737
Document `@ConditionalOnProperty` limitation with collections
...
Closes gh-7483
6 years ago
Madhura Bhave
57515dfa78
Fix typo
6 years ago
Phillip Webb
9a9111af21
Support path discovery for main dispatcher servlet
...
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.
Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.
This commit also reverts most of fddc9e9c7e
since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.
Closes gh-13834
6 years ago
Phillip Webb
d37e717500
Polish
6 years ago
Stephane Nicoll
12f8ef1b6e
Upgrade to Spring Web Services 3.0.2.RELEASE
...
Closes gh-13912
6 years ago
Stephane Nicoll
37f5e69173
Start building against Spring Security 5.0.7 snapshots
...
See gh-13898
6 years ago
Stephane Nicoll
99f33d5070
Start building against Spring Data Kay snapshots
...
See gh-13890
6 years ago
Andy Wilkinson
1ab98ca33f
Start building against Spring HATEOAS 0.25.0 snapshots
...
See gh-13742
6 years ago
Stephane Nicoll
21160da9f5
Use SNAPSHOTs for upcoming releases
6 years ago
Stephane Nicoll
e6cf082dbc
Fix typo
6 years ago
Stephane Nicoll
a25b6bd473
Restore support for TransactionAwareCacheDecorator
...
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.
Closes gh-13861
6 years ago
Madhura Bhave
1831f3be16
Fix NPE when Collection contains unbound children
...
Fixes gh-13636
6 years ago
Madhura Bhave
6032b454b0
Polish
6 years ago
Stephane Nicoll
829ac3fbef
Prevent headers to be mutated
...
This commit rework 1189ccc
to prevent a mutate call on the original
headers map.
Closes gh-13871
6 years ago
Stephane Nicoll
7d2e25f6f8
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
1a0afc6bbe
Polish "Use Collection.removeIf() where possible"
...
Closes gh-13871
6 years ago
dreis2211
1189ccc936
Use Collection.removeIf() where possible
...
See gh-13871
6 years ago
Stephane Nicoll
7176c54f5e
Polish "Add metric description and base unit to metrics endpoint"
...
Closes gh-13813
6 years ago
Johannes Edmeier
ab1f8cf77b
Add metric description and base unit to metrics endpoint
...
See gh-13813
6 years ago
Stephane Nicoll
ecb8da2536
Polish "Upgrade to Micrometer 1.0.6"
...
Closes gh-13819
6 years ago
Jon Schneider
f478911c54
Upgrade to Micrometer 1.0.6
...
See gh-13819
6 years ago
Stephane Nicoll
dcb68d4c64
Deprecate unused property
...
Closes gh-13836
6 years ago
Andy Wilkinson
daad992c96
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
136be5916c
Upgrade to Postgresql 42.2.4
...
Closes gh-13845
6 years ago
Andy Wilkinson
8f2a8576a6
Upgrade to Mariadb 2.2.6
...
Closes gh-13844
6 years ago
Andy Wilkinson
e5a4cfabc3
Upgrade to Hibernate Validator 6.0.11.Final
...
Closes gh-13843
6 years ago
Andy Wilkinson
1c6e75ff10
Upgrade to Kafka 1.0.2
...
Closes gh-13842
6 years ago
Andy Wilkinson
4003c3c6e5
Upgrade to Jna 4.5.2
...
Closes gh-13841
6 years ago
Andy Wilkinson
3fd6f00155
Upgrade to Netty 4.1.27.Final
...
Closes gh-13840
6 years ago
Andy Wilkinson
478181eb2c
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
fc0a687ee0
Migrate test to ApplicationContextRunner
6 years ago
Madhura Bhave
660d284f45
Document when and how to use brackets when binding to maps
...
Closes gh-13506
6 years ago
Madhura Bhave
56235187d0
Fix typo
6 years ago
Andy Wilkinson
10b91602e9
Increase connect and read timeouts when testing against Cassandra
6 years ago
Andy Wilkinson
de7899fba4
Improve reliability by give Cassandra more time and attempts to start
6 years ago
Andy Wilkinson
bfc4cad692
Upgrade to Spring REST Docs 2.0.2.RELEASE
...
Closes gh-13505
6 years ago
Stephane Nicoll
cdbe6fa122
Document properties migrator usage
...
Closes gh-13600
6 years ago
Stephane Nicoll
a1ef3f070a
Improve documentation for using a mock environment with @SpringBootTest
...
Closes gh-13827
6 years ago
Stephane Nicoll
592754d806
Polish "Make sure exception tag values are not empty in web metrics"
...
Closes gh-13187
6 years ago
Jon Schneider
ee37dc1c31
Make sure exception tag values are not empty in web metrics
...
See gh-13187
6 years ago
Madhura Bhave
66156cc24f
Polish
6 years ago
Andy Wilkinson
681717d07a
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
b9ad0d9992
Test the Gradle plugin against Gradle 4.8.1 instead of 4.8
...
Closes gh-13809
6 years ago
Andy Wilkinson
8deea933b9
Test the Gradle plugin against Gradle 4.9
...
Closes gh-13808
6 years ago
Andy Wilkinson
53400b1d81
Merge branch '1.5.x' into 2.0.x
6 years ago
Madhura Bhave
e907ae605d
Fix tests
...
See gh-13783
6 years ago
Madhura Bhave
9bd723ddad
Fix exception message
...
Fixes gh-13783
6 years ago
Johnny Lim
86ccb26c58
Polish EndpointRequest.RequestMatcherFactory.antPath()
...
Closes gh-13775
6 years ago
Madhura Bhave
c36804908c
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
a57d0f0853
Reinstate order of WebMvcMetricsFilter
...
Closes gh-13781
6 years ago
Stephane Nicoll
944ed767ac
Add dependency management for elasticsearch integration tests distro
...
Closes gh-13547
6 years ago
dreis2211
e9a8d4c949
Remove unused AbstractCouchbaseAutoConfigurationTests
...
Closes gh-13797
6 years ago
Stephane Nicoll
6e749ef276
Improve NoSuchBeanDefinitionFailureAnalyzer to handle null beans
...
Previously, if a user defines a `@Bean` with a method that returns
`null`, injection by type will ignore that definition but the report
doesn't mention that candidate.
This commit improves the failure analyzer to look for user-defined beans
as well, detecting beans that are `null` matching the requested type
and including them in the report.
Closes gh-13531
6 years ago
Stephane Nicoll
e679690a74
Clarify the WebTestClient requires WebFlux on the classpath
...
Closes gh-13469
6 years ago
Stephane Nicoll
d6c7eff8f7
Add check for empty values for lookup
...
Closes gh-13419
6 years ago
Stephane Nicoll
8095ee4a5b
Polish contribution
...
See gh-13790
6 years ago
Johnny Lim
f363fe7dd1
Polish
...
See gh-13790
6 years ago
Stephane Nicoll
ec2ebf52de
Merge branch '1.5.x' into 2.0.x
6 years ago
Brian Clozel
58e886fddf
Remove @Lazy injection for HttpMessageConverters
...
This commit turns a lazy injection point for `HttpMessageConverters`
into an `ObjectProvider`-backed injection.
This allows to lazily rely on that bean without creating for it; in some
environments, such proxy creation can lead to issues like SPR-16990.
See gh-13785
6 years ago
Stephane Nicoll
ffe994335e
Merge branch '1.5.x' into 2.0.x
6 years ago
Johnny Lim
f2cef87878
Fix since on JdbcOperationsDependsOnPostProcessor
...
Closes gh-13778
6 years ago
Johnny Lim
068e22d60b
Polish
...
See gh-13776
6 years ago
Johnny Lim
4314dc2972
Remove a List creation in CompositePropertySources.iterator()
...
Closes gh-13774
6 years ago
Stephane Nicoll
e6ea28dec5
Polish
6 years ago
Johnny Lim
13202eb278
Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
...
Closes gh-13706
6 years ago
Stephane Nicoll
174cc2bc4e
Merge branch '1.5.x' into 2.0.x
6 years ago
dreis2211
ac8eebfbad
Fix typos
...
Closes gh-13762
6 years ago
Stephane Nicoll
19709f7dea
Polish
6 years ago
Madhura Bhave
d7822ba135
Update copyright header for modified files
6 years ago
Madhura Bhave
c8c32cfa33
Migrate tests to ApplicationContextRunner
6 years ago
Andy Wilkinson
cced3514a7
Polish
6 years ago
Andy Wilkinson
c489c6c5f6
Polish test following forward merge
6 years ago
Andy Wilkinson
67dfa0a720
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
44273ee093
Merge branch '1.5.x' into 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
331775d6c0
Document latest version of gradle-git-properties plugin
...
Closes gh-13747
6 years ago
Johnny Lim
f94ce495d8
Fix parameter order for RequestMatcherAssert.doesNotMatch()
...
Closes gh-13707
6 years ago
Stephane Nicoll
177c54d441
Migrate JdbcTemplateAutoConfiguration tests to context runner
6 years ago
Stephane Nicoll
3423c5dddb
Detect DispatcherServlets registered via ServletRegistrationBean
...
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.
This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.
Closes gh-13186
6 years ago
Johnny Lim
46e6aa5963
Fix query string encoding in TraceableHttpServletRequest
...
Closes gh-13545
6 years ago
Johnny Lim
0de8317979
Separate logging from getUrlMappings()
...
Closes gh-13710
6 years ago
Andy Wilkinson
57e2bb9c6a
Merge branch '1.5.x' into 2.0.x
6 years ago
Madhura Bhave
4e7719f1c7
Fix typo
6 years ago
Andy Wilkinson
9eb5c9bd18
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
44b9aa168e
Polish "Improve description of Endpoint exclude"
...
Closes gh-13619
6 years ago
Miguel Gomes
838e6cdbbb
Improve description of Endpoint exclude
...
See gh-13619
6 years ago
Johnny Lim
ab6adc8265
Polish
...
Closes gh-13616
6 years ago
Andy Wilkinson
809e30506f
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
58be01a790
Try to make Jest auto-configuration tests more robust
6 years ago
Andy Wilkinson
468453b66e
Upgrade to Kotlin 1.2.51
...
Closes gh-13705
6 years ago
Andy Wilkinson
0e8206cdf4
Start building against Spring Framework 5.0.8 snapshots
...
See gh-13704
6 years ago
Andy Wilkinson
f173429327
Upgrade to Flatten Maven Plugin 1.0.1
...
Closes gh-13650
6 years ago
Andy Wilkinson
5220a08228
Upgrade to Xml Maven Plugin 1.0.2
...
Closes gh-13649
6 years ago
Andy Wilkinson
573f736374
Upgrade to Maven Resources Plugin 3.0.2
...
Closes gh-13648
6 years ago
Andy Wilkinson
83a56bac60
Upgrade to Maven Javadoc Plugin 3.0.1
...
Closes gh-13647
6 years ago
Andy Wilkinson
d3ef9fd2ba
Upgrade to Maven Enforcer Plugin 3.0.0-M2
...
Closes gh-13646
6 years ago
Andy Wilkinson
1c64496470
Upgrade to Jooq 3.10.8
...
Closes gh-13645
6 years ago
Andy Wilkinson
797efbd259
Upgrade to Solr 6.6.5
...
Closes gh-13644
6 years ago
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
9120f49721
Merge branch '1.5.x' into 2.0.x
6 years ago
Madhura Bhave
673a08d228
Support microseconds in Duration conversions
...
Closes gh-13624
6 years ago
Andy Wilkinson
06a8c41943
Preserve trailing whitespace in origin-tracked property values
...
Closes gh-13602
6 years ago
Andy Wilkinson
032d5488cd
Tolerate non-existent source folders in DevTools
...
Closes gh-13620
6 years ago
Madhura Bhave
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
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
dreis2211
17edf0e2fe
Fix typo
6 years ago
Madhura Bhave
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
6 years ago
Andy Wilkinson
04119585e8
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
911453d478
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
30f0fd1fe4
Merge branch '1.5.x' into 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
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
48c5e70ac8
Merge branch '1.5.x' into 2.0.x
7 years ago
Andy Wilkinson
2624748911
Merge branch '1.5.x' into 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
4fc0a33094
Merge branch '1.5.x' into 2.0.x
7 years ago
Andy Wilkinson
e2d6280d83
Merge branch '1.5.x' into 2.0.x
7 years ago
Andy Wilkinson
e730382718
Merge branch '1.5.x' into 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
Andy Wilkinson
814e90805e
Merge branch '1.5.x' into 2.0.x
7 years ago