0a23f3b286
Merge branch '1.5.x' into 2.0.x
6 years ago
5a07c44a4f
Merge branch '2.1.x'
6 years ago
43d64ba580
Add dependency management for groovy-jaxb introduced in 2.5.1
...
Closes gh-15468
6 years ago
524067cd32
Merge branch '2.1.x'
6 years ago
4101e15421
Add dependency management for missing Groovy 2.5 modules
...
Closes gh-15468
6 years ago
70f4d5e5a8
Polish "Apply context and connector customizer beans to Tomcat factories"
...
Closes gh-15492
6 years ago
90c489048f
Apply context and connector customizer beans to Tomcat factories
...
See gh-15492
6 years ago
de599819ae
Merge branch '2.1.x'
6 years ago
33fb1fa9a3
Avoid creating meter binders before registry has been customized
...
Previously, MeterRegistryPostProcessor would trigger the creation of all
meter binders and meter registry customizers before applying the
customizers and calling the binders. In some situations with complex
dependency graphs where the creation of a binder and the injection of
its dependencies inadvertently triggered some meter binding, this
could result in meters being bound before the registry had been
customized.
This commit reworks MeterRegistryPostProcessor and MeterRegistryConfigurer
to defer the retrieval of registry customizers and meter binders until
just before they are needed. As a result, customizers are now retrieved
and applied before the binders are retrieved.
Closes gh-15483
6 years ago
903d940dd5
Merge branch '2.1.x'
6 years ago
007916f1ce
Start building against Spring Framework 5.1.4 snapshots
...
See gh-15493
6 years ago
0ad72d5b5e
Remove reliance on mavenLocal from Gradle plugin’s tests
...
See gh-15471
6 years ago
4edc32844a
Remove use of execute method inherited from internal class
...
Closes gh-15484
6 years ago
317c4c2c38
Merge branch '2.1.x'
6 years ago
7dbe70dc61
Merge branch '2.0.x' into 2.1.x
6 years ago
c0b07a9429
Polish "Fix StringSequence.equals() for different lengths"
...
Closes gh-15465
6 years ago
2a0680c2ba
Fix StringSequence.equals() for different lengths
...
See gh-15465
6 years ago
c8a0c99a21
Remove D…S…Init…InvokerTests' assumptions about classpath structure
...
See gh-15471
6 years ago
6d251a83dd
Merge branch '2.1.x'
6 years ago
af3fada396
Polish "Add missing dependency management entry for hibernate-vibur"
...
Closes gh-15467
6 years ago
c955906c3e
Add missing dependency management entry for hibernate-vibur
...
See gh-15467
6 years ago
6207b46bc6
Merge branch '2.1.x'
6 years ago
948902f090
Avoid unnecessary usage of ReflectionTestUtils
...
Closes gh-15482
6 years ago
ca13385534
Remove remaining assumption about File separator from LogFileTests
...
See gh-15471
6 years ago
3d7e4e99c5
Remove assumption about File separator from LogFileTests
...
See gh-15471
6 years ago
6adccbfd30
Make LoggingApplicationListener and tests more robust on Windows
...
Previously, LoggingApplicationListener its tests, and LogFile made some
assumptions that do not hold true on Windows. Specifically,
LoggingApplicationListenerTests used TestPropertySourceUtils to add
properties to the environment. This uses Java's standard Properties
parsing which does a poor job of handling Windows file paths (Strings
with backslashes in them). Secondly, LogFile made assumptions about
the use of forward clashes for the file separator.
This commit replaces the use of TestPropertySourceUtils and removes
the assumption about the OS's file separator.
Closes gh-15471
6 years ago
ddabfe3fcc
Deploy spring-boot-test-support so it's available downstream
...
Concourse builds spring-boot-tests separately from spring-boot-project
and relies on modules from the latter being available in the
distribution repository when building the former. This commit enables the
deployment of spring-boot-test-support from spring-boot-project so that it
is added to the distribution repository and is therefore available when
building spring-boot-tests. It is then excluded when putting to the
Artifactory resource as we do not want it to be published.
See gh-15471
6 years ago
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
6 years ago
1f4be6ba37
Merge branch '2.1.x'
6 years ago
80cfff753a
Merge branch '2.0.x' into 2.1.x
6 years ago
a6ff7c786a
Remove test starter from core module
...
Closes gh-15463
6 years ago
db5ab1d14c
Do not rely on test runner using static main method in RestarterTests
...
Closes gh-15461
6 years ago
62fbf48446
Start Elasticsearch with single-node discovery type
...
See gh-15441
6 years ago
47fc35105d
Allow more time for the Elasticsearch container to start
...
See gh-15441
6 years ago
ed52dab3b5
Revert upgrade to JUnit Jupiter 5.4 snapshots
6 years ago
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
6 years ago
2b453bbb16
Minimise dependencies on Log4j2
...
Closes gh-15441
6 years ago
e16511279a
Add junit-jupiter-engine for running Junit5 tests
6 years ago
9a6dbb5290
Merge branch '2.1.x'
6 years ago
036aace2cc
Add details in Jest ElasticSearch HealthIndicator
...
This commit polishes the previous one and aligns the Jest
HealthIndicator with the changes made for the REST variant.
Closes gh-15366
6 years ago
1ec2bbf54f
Include details in ElasticsearchRestHealthIndicator
...
This commit adds more information to the ElasticSearch REST
health indicator.
When the ES instance responds with an error HTTP status,
the health details now include the actual status code and reason phrase.
When the ES instance returns a HTTP 200 response, the entire response
map is used as health details.
See gh-15366
6 years ago
71b29684b3
Remove redundant field type configuration
...
See gh-15435
6 years ago
dfd477aa74
Merge branch '2.1.x'
6 years ago
38e4d330b0
Merge branch '2.0.x' into 2.1.x
6 years ago
0f92b139f3
Remove Mockito 1 leftover
...
Closes gh-15422
6 years ago
f863ce32ee
Merge branch '2.1.x'
6 years ago
3cc441c83e
Do not remove trailing slash from OAuth2 Issuer URI
...
Fixes gh-15324
6 years ago
55d7c19c06
Merge branch '2.1.x'
6 years ago
d05ae40c99
Remove redundant field type and optional configuration
...
See gh-15435
6 years ago
393decff35
Merge branch '2.1.x'
6 years ago
ef4ea591b3
Mark nested optional fields as optional
...
See gh-15435
6 years ago
c9c5cd18a2
Merge branch '2.1.x'
6 years ago
6752be9333
Exclude logback-classic from liquibase-core
...
Closes gh-15436
6 years ago
beffc4da9f
Remove ordering dependence from tests that create embedded databases
...
Closes gh-15423
6 years ago
05cb4cb379
Merge branch '2.1.x'
6 years ago
9dc2116351
Merge branch '2.0.x' into 2.1.x
6 years ago
554e7061ce
Upgrade to Spring Restdocs 2.0.3.RELEASE
...
Closes gh-15435
6 years ago
b2c5fd84b9
Use spring-doc-resources 0.1.0.BUILD-SNAPSHOT
6 years ago
2b1653d009
Simplify code by using try-with-resources statement
...
Closes gh-15427
6 years ago
ba29788482
Polish "Replace explicit generic type with diamond operator"
...
Closes gh-15424
6 years ago
a2ebba8db1
Replace explicit generic type with diamond operator
...
See gh-15424
6 years ago
f040459ae5
Merge branch '2.1.x'
6 years ago
a11dea46d7
Use the right class in @ConditionalOnClass
...
See gh-15372
6 years ago
e0b55d36de
Merge branch '2.1.x'
6 years ago
f13697b278
Make Resource Server auto-config conditional on JwtDecoder class
...
Fixes gh-15372
6 years ago
d3e5c5688f
Polish
6 years ago
e367b54928
Merge branch '2.1.x'
6 years ago
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
6 years ago
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
6 years ago
2cd3cff608
Merge branch '2.1.x'
6 years ago
4c6c07ddbb
Start building against Spring AMQP 2.1.3 snapshots
...
See gh-15407
6 years ago
f04f74870a
Start building against Spring Data Lovelace SR4 snapshots
...
See gh-15410
6 years ago
96f1a394b8
Start building against Spring Integration 5.1.2 snapshots
...
See gh-15413
6 years ago
e27d3d0d5e
Start building against Spring Kafka 2.2.3
...
See gh-15414
6 years ago
b01d5f62a4
Start building against Spring Security 5.1.3 snapshots
...
See gh-15417
6 years ago
a5f5ead520
Start building against Spring AMQP 2.0.11 snapshots
...
See gh-15406
6 years ago
5e640877c9
Start building against Spring Data Kay SR13 snapshots
...
See gh-15409
6 years ago
12a844d7da
Start building against Spring Integration 5.0.11 snapshots
...
See gh-15412
6 years ago
5336c8ccde
Start building against Spring Security 5.0.11 snapshots
...
See gh-15416
6 years ago
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
6 years ago
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
6 years ago
71173f2db5
Merge branch '2.1.x'
6 years ago
c84d199cb7
Upgrade to Flyway 5.2.4
...
Closes gh-15402
6 years ago
95a14e7ba5
Remove duplicate dependency management for spring-core
...
Closes gh-15380
6 years ago
6f6e712a7b
Merge branch '2.1.x'
6 years ago
bd21113e9f
Fix indent of WebServiceTemplate section
...
Closes gh-15389
6 years ago
5a18df2d69
Fix tests
6 years ago
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
6 years ago
4c96c76f11
Include Junit5 dependencies in Spring Boot Starter Test
...
See gh-14736
6 years ago
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
6 years ago
fb1c7c82b4
Merge branch '2.1.x'
6 years ago
ef40241bf6
Merge branch '2.0.x' into 2.1.x
6 years ago
d864b427eb
Remove unused ByteArrayStartsWith matcher
...
Closes gh-15386
6 years ago
ed3347f00d
Configure Asciidoctor toolchain for ref docs
...
This commit replaces the Docbook+Asciidoctor documentation toolchain by
a single Asciidoctor generation process.
First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.
Closes gh-12611
6 years ago
a7d22aaf4b
Reorganize asciidoc content
...
This commit adds an index page for the multi-file HTML version, and
fixed a couple of casing issues (significant words starting with lower
case in headings).
While researching how to get the content from index-docinfo.xml into
the output, I came across the notion of a colophon, which is a good name
for the information in that file. I have consequently changed "Legal"
(which I never liked but couldn't think of a better term for at the
time) to "Colophon".
See gh-12611
6 years ago
a60c575836
Cleanup asciidoctor build
...
Remove Guardfile for now; we might reintroduce it later, but it is
currently out of sync with the documentation changes.
Do not ignore html files in the asciidoc directory as those are needed
for docinfo parts.
See gh-12611
6 years ago
11f6a5ab70
Remove docbook toolchain
...
See gh-12611
6 years ago
096640de84
Merge branch '2.1.x'
6 years ago
185a49fb3b
Add reference to JaVers starter
6 years ago
95b94c0158
Merge branch '2.1.x'
6 years ago
c56c0ff433
Rename OAuth2ResourceServerJwkConfiguration
...
Closes gh-15375
6 years ago
5c986b5030
Merge branch '2.1.x'
6 years ago
42b58f6d27
Add JAXB API dependency that is no longer transitive via testcontainers
...
See gh-15371
6 years ago
8b21044902
Merge branch '2.1.x'
6 years ago
917108cce7
Merge branch '2.0.x' into 2.1.x
6 years ago
425a3aacf5
Add JAXB API dependency that is no longer transitive via testcontainers
...
See gh-15371
6 years ago
a85e27c7cd
Further replace magic number by HttpStatus
...
See gh-15130
6 years ago
f2ca2533d5
Polish "Replace magic number by HttpStatus"
...
Closes gh-15130
6 years ago
ffdc9f0ff3
Replace magic number by HttpStatus
...
See gh-15130
6 years ago
9483c91d58
Make sure to include validation query in case of failure
...
See gh-15055
6 years ago
9e84abc46b
Polish "Add validation query to DataSourceHealthIndicator details"
...
Closes gh-15055
6 years ago
fc85c34dd8
Add validation query to DataSourceHealthIndicator details
...
See gh-15055
6 years ago
bbad720e23
Polish contribution
...
Closes gh-15086
6 years ago
9e571a2827
Fail fast if nested condition uses a phase inappropriate for its members
...
See gh-15086
6 years ago
0f474ec08f
Merge branch '2.1.x'
6 years ago
07065532fe
Replace accidental use of code shaded by Testcontainers
...
See gh-15371
6 years ago
910a0e57b8
Drop dependency management for DropWizard Metrics modules removed in v4
...
Closes gh-15370
6 years ago
b05abe8ca0
Merge branch '2.1.x'
6 years ago
72ad0cc6be
Merge branch '2.0.x' into 2.1.x
6 years ago
3fd0380359
Correct optional dependency declarations in spring-boot-test-support
...
Closes gh-15371
6 years ago
0df13baa0f
Polish "Add configurable property for JWK encryption algorithm"
...
Closes gh-15145
6 years ago
460fdaf52f
Add configurable property for JWK encryption algorithm
...
See gh-15145
6 years ago
ec678eaa3b
Polish "Configure MessageSource if no "messageSource" bean defined"
...
Closes gh-15212
6 years ago
82d99da32a
Configure MessageSource if no "messageSource" bean defined
...
Enable MessageSourceAutoConfiguration OnMissingBeanCondition by name
rather than class since AbstractApplicationContext expects MessageSource
to be defined only with "messageSource" name.
See gh-15212
6 years ago
1b40b0edf1
Polish contribution
...
Closes gh-15054
6 years ago
3059f0e2e2
Add configuration property for configuring Tomcat's processor cache
...
See gh-15054
6 years ago
b528eb8a7e
Remove unnecessary cast in LoggingSystemProperties
...
Closes gh-15297
6 years ago
f57f16c190
Avoid premature declaration of variables
...
Closes gh-15215
6 years ago
a1a8a8cef0
Avoid instantiation of BeanPropertyBinder in Binder
...
Closes gh-15181
6 years ago
e2d5dfad3a
Use varargs for DefaultApplicationArguments
...
Closes gh-15142
6 years ago
7939b8b4da
Polish "Rename logging.file to logging.file.name"
...
Closes gh-15089
6 years ago
21da4a5d12
Rename logging.file to logging.file.name
...
See gh-15089
6 years ago
d9586d94f6
Change DataSourceHealthIndicator details from "hello" to "result"
...
Closes gh-15136
6 years ago
9c426c63bf
Polish
6 years ago
ed9468a31a
Update copyright year for changed files
6 years ago
81896e0222
Upgrade to Micrometer 1.1.1
...
Closes gh-15328
6 years ago
73d87ac112
Upgrade to Micrometer 1.0.8
...
Closes gh-15327
6 years ago
ba1ef52e39
Merge branch '2.0.x'
6 years ago
893d5666be
Update copyright year for changed files
6 years ago
74376aa023
Polish
6 years ago
ac322a8e30
Polish
6 years ago
789f18259f
Upgrade to Infinispan 9.4.3.Final
...
Closes gh-15338
6 years ago
d6adda1ec9
Upgrade to Flyway 5.2.3
...
Closes gh-15337
6 years ago
ebd6f4d0e5
Upgrade to Jetty Reactive Httpclient 1.0.2
...
Closes gh-15336
6 years ago
a02c0c9881
Upgrade to Byte Buddy 1.9.5
...
Closes gh-15335
6 years ago
1ea3444e76
Upgrade to Undertow 2.0.16.Final
...
Closes gh-15334
6 years ago
9f4d55766b
Upgrade to Rxjava2 2.2.4
...
Closes gh-15333
6 years ago
4feda19072
Upgrade to Netty Tcnative 2.0.20.Final
...
Closes gh-15332
6 years ago
f29f73c295
Upgrade to Lettuce 5.1.3.RELEASE
...
Closes gh-15331
6 years ago
d0fcbd106b
Merge branch '2.0.x'
6 years ago
28cd017347
Upgrade to Thymeleaf Extras Java8time 3.0.2.RELEASE
...
Closes gh-15330
6 years ago
b709f7afaa
Upgrade to Netty 4.1.31.Final
...
Closes gh-15329
6 years ago
9a25c2ce7e
Start building against Micrometer 1.1.1 snapshots
...
See gh-15328
6 years ago
ca11e83857
Start building against Micrometer 1.0.8 snapshots
...
See gh-15327
6 years ago
321da6c578
Upgrade to Spring Session Apple SR-7
...
Closes gh-15254
6 years ago
cdecd053c3
Upgrade to Spring Session Bean-SR1
...
Closes gh-15275
6 years ago
79102454b2
Upgrade to Spring Integration 5.1.1.RELEASE
...
Closes gh-15272
6 years ago
452028e347
Upgrade to Spring Integration 5.0.10.RELEASE
...
Closes gh-15251
6 years ago
427d494d57
Merge branch '2.0.x'
6 years ago
02a1c43587
Fix tests
6 years ago
fc6c07ad3c
Merge branch '2.0.x'
6 years ago
decaacddce
Account for application path for Jersey servlet endpoints
...
Closes gh-14895
6 years ago
8560010bd4
Upgrade to Spring Kafka 2.1.11.RELEASE
...
Closes gh-15315
6 years ago
5fab0aee43
Upgrade to Spring AMQP 2.0.10.RELEASE
...
Closes gh-15256
6 years ago
edbca5f4c0
Upgrade to Spring Security 5.0.10.RELEASE
...
Closes gh-15253
6 years ago
33e67f5847
Upgrade to Spring Kafka 2.2.2.RELEASE
...
Closes gh-15273
6 years ago
524a68209a
Upgrade to Spring AMQP 2.1.2.RELEASE
...
Closes gh-15271
6 years ago
3178e3f34b
Upgrade to Spring Security 5.1.2.RELEASE
...
Closes gh-15274
6 years ago
d12e42e8d5
Polish
...
Closes gh-15211
6 years ago
0a4ba499df
Add Actuator health checks for Elasticsearch REST clients
...
This commit adds `ElasticsearchRestHealthIndicator`, a new
`HealthIndicator` for Elasticsearch, using the Elasticsearch "low level
rest client" provided by the
`"org.elasticsearch.client:elasticsearch-rest-client"` dependency.
Note that Spring Boot will auto-configure both low and high level REST
clients, but since the high level one is using the former, a single
health indicator will cover both cases.
See gh-15211
6 years ago
6a766cf919
Start building against Spring Kafka 2.2.2 snapshots
...
See gh-15273
6 years ago
114347107e
Polish key description
6 years ago
33000b6e8e
Polish contribution
...
Closes gh-14985
6 years ago
108f28417e
Allow to disable SSL client authentication on the management port
...
When server and management are at different ports, and when server
requires TLS client authentication, then there is no simple method to
disable TLS client authentication for management port.
This commit adds an additional "none" option to ssl.client-auth.
Example:
server.port=8080
server.ssl.enabled=true
server.ssl.client-auth=need
management.server.port=8081
management.server.ssl.enabled=true
management.server.ssl.client-auth=none
See gh-14985
6 years ago
476fe6ed17
Stop configuring metrics if hibernate is not available
...
Closes gh-15317
6 years ago
5f145ac482
Merge branch '2.0.x'
6 years ago
b103e0c869
Polish "Unwrap DataSource target rather than plain instanceof calls"
...
Closes gh-15227
6 years ago
98378e210d
Start building against Spring Kafka 2.1.11 snapshots
...
See gh-15315
6 years ago
17f04b8b75
Replace DirectFieldAccessor usages by hasFieldOrPropertyWithValue
...
Closes gh-15312
6 years ago
2dc8f49f8a
Polish
6 years ago
dad6d4beca
Merge branch '2.0.x'
6 years ago
2b22b23aad
Polish
6 years ago
cf7664c01a
Cope with version not found in Embedded Mongo's Version enum
...
Closes gh-15311
6 years ago
dee8085f20
Merge branch '2.0.x'
6 years ago
83cf348ec8
Warn about Quartz dropping tables on restart
...
Closes gh-15295
6 years ago
760003b9d7
Polish "Document that test slices should not be combined"
...
Closes gh-15310
6 years ago
29cd1cc762
Document that test slices should not be combined
...
See gh-15310
6 years ago
b094e28081
Remove auto-configuration of RequestContextFilter when using Jersey
...
Closes gh-15048
6 years ago
643b0f84da
Merge branch '2.0.x'
6 years ago
ab39e50ece
List Gradle's Shadow Plugin as an alternative to Boot's loader
...
Closes gh-1828
6 years ago
e1ad5641d5
Polish "Trim whitespace when coercing to a LogLevel"
...
Closes gh-15143
6 years ago
dfe94a0abb
Trim whitespace when coercing to a LogLevel
...
See gh-15143
6 years ago
d6571c0157
Upgrade to Reactor Californium-SR3
...
Closes gh-15192
6 years ago
bf88a7e466
Be more lenient when repackage is invoked several times
...
This commit makes the repackager more lenient when it is invoked several
times in the same lifecycle.
Closes gh-15034
6 years ago
d7fe3c73a3
Provide better logging for RepackageMojo
...
Closes gh-15294
6 years ago
9331390079
Upgrade to Spring Data Lovelace-SR3
...
Closes gh-15191
6 years ago
fb3deab89d
Merge branch '2.0.x'
6 years ago
e81abc3f11
Order jacksonCodecCustomizer so user-provided customizer can go after it
...
Closes gh-15167
6 years ago
971adfcd5b
Merge branch '2.0.x'
6 years ago
e6dd11254c
Polish
6 years ago
51a5b841dd
Merge branch '2.0.x'
6 years ago
4a385e89bd
Mention fully executable jars in Jersey’s scanning limitations
...
Closes gh-3413
6 years ago
669eeef29b
Merge branch '2.0.x'
6 years ago
1f994b70b5
Correct description of file generated by heapdump endpoint
...
Closes gh-15016
6 years ago
1d029a09e2
Start building against Spring Data Lovelace-$R3 snapshots
...
See gh-15191
6 years ago
f9a3b79e97
Merge branch '2.0.x'
6 years ago
ae5d5235f6
Upgrade to Spring Data Kay-SR12
...
Closes gh-14893
6 years ago
376e7fdfa1
Document profile activation limitation of .spring-boot-devtools.properties
...
Closes gh-15151
6 years ago
6729e56f6b
Merge branch '2.0.x'
6 years ago
e74b084c67
Auto-configure codec customizations and JSON when using @WebFluxTest
...
Closes gh-15070
6 years ago
f6a22a05b8
Merge branch '2.0.x'
6 years ago
9553d4f64b
Polish "Auto-configure Spring Session's cookie serializer"
...
Closes gh-15163
6 years ago
0daf83efab
Auto-configure Spring Session's cookie serializer
...
See gh-15163
6 years ago
dfab0b4231
Upgrade to Spring Framework 5.1.3
...
Closes gh-15186
6 years ago
e89d1a8ebe
Upgrade to Spring Framework 5.0.11
...
Closes gh-15189
6 years ago
8928cd1982
Deprecate spring.rabbitmq.template.queue
...
Closes gh-15301
6 years ago
a240e22593
Adapt to Rabbit internal change
...
See gh-15271
6 years ago
cf525dabd2
Merge branch '2.0.x'
6 years ago
69edf8960f
Correct stale reference to embeddedLaunchScriptProperties with Gradle
...
Closes gh-15094
6 years ago
de8c353cec
Merge branch '2.0.x'
6 years ago
898d9f80f3
Merge branch '1.5.x' into 2.0.x
6 years ago
fa7be63fbb
Merge branch '2.0.x'
6 years ago
7ddbb37bd5
Polish
6 years ago
073ac7bc99
Fix Thymeleaf security dialect tests on Windows
6 years ago
a0d0ecf9d4
Test the Gradle plugin against Gradle 5.0
...
Closes gh-15171
6 years ago
5a9ff6a3cb
Merge branch '2.0.x'
6 years ago
5201584c60
Upgrade to Neo4j Ogm 3.1.5
...
Closes gh-15293
6 years ago
55721f06df
Upgrade to Kotlin 1.2.71
...
Closes gh-15292
6 years ago
c73fdc4ce4
Merge branch '2.0.x'
6 years ago
d2756319cb
Polish
6 years ago
1c4a26557c
Polish
6 years ago
c1bbcb6908
Merge branch '2.0.x'
6 years ago
4bc32e6358
Use a HandlerInterceptor for timing long tasks
...
Closes gh-15204
6 years ago
f43a83fa4f
Upgrade to Junit Jupiter 5.3.2
...
Closes gh-15286
6 years ago
ae1979f1ff
Merge branch '2.0.x'
6 years ago
5f0ac46d78
Unwrap DataSource target rather than plain instanceof calls
...
Closes gh-15227
6 years ago
e424dfbe15
Polish "Perform best effort to retrieve DataSourceProxy"
...
Closes gh-15206
6 years ago
26f9a92837
Perform best effort to retrieve DataSourceProxy
...
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it. Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.
This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.
In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.
See gh-15206
6 years ago
ee2107c91b
Merge branch '2.0.x'
6 years ago
44632ea55c
Merge branch '1.5.x' into 2.0.x
6 years ago
548cc05bb6
Polish
6 years ago
5a246ce24d
Merge branch '2.0.x'
6 years ago
8772f90e2f
Polish
6 years ago
35cce76ae8
Merge branch '2.0.x'
6 years ago
3331fa2d02
Merge branch '1.5.x' into 2.0.x
6 years ago
1797040e1a
Merge branch '2.0.x'
6 years ago
a54de61e61
Polish
...
Revert change inadvertently committed as part of gh-15017
6 years ago
4f405ed97d
Merge branch '2.0.x'
6 years ago
058428a14c
Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
...
Closes gh-15177
6 years ago
f25c32e8b9
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
Raheela
Stephane Nicoll
dreis2211
vasili pispanen
Madhura Bhave
Brian Clozel
Filip Hrisafov
igor-suhorukov
Jay Bryant
holy12345
Erlend Haugsnes
Razib Shahriar
artsiom
cac03
TwinProduction
Andre Restolho
Phillip Webb
Alon Bar-Lev
Johannes Zick
Dileep Bapat
Vedran Pavic
Tadaya Tsuyukubo