root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
19,828 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

4355 Commits

Author SHA1 Message Date
Filip Hrisafov 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
 2018-12-11 11:51:49 +01:00
Andy Wilkinson 71b29684b3 Remove redundant field type configuration 
See gh-15435
 2018-12-11 08:30:24 +00:00
Stephane Nicoll 38e4d330b0 Merge branch '2.0.x' into 2.1.x 2018-12-11 08:52:58 +01:00
dreis2211 0f92b139f3 Remove Mockito 1 leftover 
Closes gh-15422
 2018-12-11 08:52:15 +01:00
Madhura Bhave 3cc441c83e Do not remove trailing slash from OAuth2 Issuer URI 
Fixes gh-15324
 2018-12-10 16:35:52 -08:00
Andy Wilkinson d05ae40c99 Remove redundant field type and optional configuration 
See gh-15435
 2018-12-10 17:59:26 +00:00
Andy Wilkinson ef4ea591b3 Mark nested optional fields as optional 
See gh-15435
 2018-12-10 17:49:41 +00:00
Andy Wilkinson 6752be9333 Exclude logback-classic from liquibase-core 
Closes gh-15436
 2018-12-10 15:39:51 +00:00
Andy Wilkinson 9dc2116351 Merge branch '2.0.x' into 2.1.x 2018-12-10 14:36:21 +00:00
Andy Wilkinson 554e7061ce Upgrade to Spring Restdocs 2.0.3.RELEASE 
Closes gh-15435
 2018-12-10 14:36:03 +00:00
Madhura Bhave a11dea46d7 Use the right class in @ConditionalOnClass 
See gh-15372
 2018-12-07 14:15:59 -08:00
Madhura Bhave f13697b278 Make Resource Server auto-config conditional on JwtDecoder class 
Fixes gh-15372
 2018-12-07 13:48:32 -08:00
Madhura Bhave 31a5e85ab6 Perform placeholder resolution in test env post processor 
Fixes gh-15354
 2018-12-07 11:45:04 -08:00
Andy Wilkinson 4c6c07ddbb Start building against Spring AMQP 2.1.3 snapshots 
See gh-15407
 2018-12-07 15:22:35 +00:00
Andy Wilkinson f04f74870a Start building against Spring Data Lovelace SR4 snapshots 
See gh-15410
 2018-12-07 15:22:06 +00:00
Andy Wilkinson 96f1a394b8 Start building against Spring Integration 5.1.2 snapshots 
See gh-15413
 2018-12-07 15:21:28 +00:00
Andy Wilkinson e27d3d0d5e Start building against Spring Kafka 2.2.3 
See gh-15414
 2018-12-07 15:20:40 +00:00
Andy Wilkinson b01d5f62a4 Start building against Spring Security 5.1.3 snapshots 
See gh-15417
 2018-12-07 15:20:05 +00:00
Andy Wilkinson a5f5ead520 Start building against Spring AMQP 2.0.11 snapshots 
See gh-15406
 2018-12-07 15:15:01 +00:00
Andy Wilkinson 5e640877c9 Start building against Spring Data Kay SR13 snapshots 
See gh-15409
 2018-12-07 15:14:15 +00:00
Andy Wilkinson 12a844d7da Start building against Spring Integration 5.0.11 snapshots 
See gh-15412
 2018-12-07 15:13:36 +00:00
Andy Wilkinson 5336c8ccde Start building against Spring Security 5.0.11 snapshots 
See gh-15416
 2018-12-07 15:13:01 +00:00
Stephane Nicoll c84d199cb7 Upgrade to Flyway 5.2.4 
Closes gh-15402
 2018-12-07 09:56:18 +01:00
Stephane Nicoll bd21113e9f Fix indent of WebServiceTemplate section 
Closes gh-15389
 2018-12-06 09:06:02 +01:00
Stephane Nicoll ef40241bf6 Merge branch '2.0.x' into 2.1.x 2018-12-05 15:56:04 +01:00
dreis2211 d864b427eb Remove unused ByteArrayStartsWith matcher 
Closes gh-15386
 2018-12-05 15:52:42 +01:00
Stephane Nicoll 185a49fb3b Add reference to JaVers starter 2018-12-05 08:56:50 +01:00
Stephane Nicoll c56c0ff433 Rename OAuth2ResourceServerJwkConfiguration 
Closes gh-15375
 2018-12-04 10:53:01 +01:00
Andy Wilkinson 42b58f6d27 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 16:29:10 +00:00
Andy Wilkinson 917108cce7 Merge branch '2.0.x' into 2.1.x 2018-12-03 15:07:30 +00:00
Andy Wilkinson 425a3aacf5 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 15:06:32 +00:00
Andy Wilkinson 07065532fe Replace accidental use of code shaded by Testcontainers 
See gh-15371
 2018-12-03 13:01:27 +00:00
Andy Wilkinson 910a0e57b8 Drop dependency management for DropWizard Metrics modules removed in v4 
Closes gh-15370
 2018-12-03 12:49:15 +00:00
Andy Wilkinson 72ad0cc6be Merge branch '2.0.x' into 2.1.x 2018-12-03 12:15:36 +00:00
Andy Wilkinson 3fd0380359 Correct optional dependency declarations in spring-boot-test-support 
Closes gh-15371
 2018-12-03 12:14:18 +00:00
Phillip Webb 9c426c63bf Polish 2018-11-29 22:57:04 -08:00
Phillip Webb ed9468a31a Update copyright year for changed files 2018-11-29 22:02:45 -08:00
Phillip Webb 81896e0222 Upgrade to Micrometer 1.1.1 
Closes gh-15328
 2018-11-29 21:29:25 -08:00
Phillip Webb 73d87ac112 Upgrade to Micrometer 1.0.8 
Closes gh-15327
 2018-11-29 15:33:19 -08:00
Phillip Webb ba1ef52e39 Merge branch '2.0.x' 2018-11-29 15:32:48 -08:00
Phillip Webb 893d5666be Update copyright year for changed files 2018-11-29 15:30:51 -08:00
Phillip Webb 74376aa023 Polish 2018-11-29 15:30:28 -08:00
Andy Wilkinson ac322a8e30 Polish 2018-11-29 14:45:20 +00:00
Andy Wilkinson 789f18259f Upgrade to Infinispan 9.4.3.Final 
Closes gh-15338
 2018-11-29 10:16:14 +00:00
Andy Wilkinson d6adda1ec9 Upgrade to Flyway 5.2.3 
Closes gh-15337
 2018-11-29 10:16:14 +00:00
Andy Wilkinson ebd6f4d0e5 Upgrade to Jetty Reactive Httpclient 1.0.2 
Closes gh-15336
 2018-11-29 10:16:13 +00:00
Andy Wilkinson a02c0c9881 Upgrade to Byte Buddy 1.9.5 
Closes gh-15335
 2018-11-29 10:16:12 +00:00
Andy Wilkinson 1ea3444e76 Upgrade to Undertow 2.0.16.Final 
Closes gh-15334
 2018-11-29 10:16:11 +00:00
Andy Wilkinson 9f4d55766b Upgrade to Rxjava2 2.2.4 
Closes gh-15333
 2018-11-29 10:16:10 +00:00
Andy Wilkinson 4feda19072 Upgrade to Netty Tcnative 2.0.20.Final 
Closes gh-15332
 2018-11-29 10:16:09 +00:00
Andy Wilkinson f29f73c295 Upgrade to Lettuce 5.1.3.RELEASE 
Closes gh-15331
 2018-11-29 10:16:08 +00:00
Andy Wilkinson d0fcbd106b Merge branch '2.0.x' 2018-11-29 10:14:46 +00:00
Andy Wilkinson 28cd017347 Upgrade to Thymeleaf Extras Java8time 3.0.2.RELEASE 
Closes gh-15330
 2018-11-29 10:11:19 +00:00
Andy Wilkinson b709f7afaa Upgrade to Netty 4.1.31.Final 
Closes gh-15329
 2018-11-29 10:11:18 +00:00
Andy Wilkinson 9a25c2ce7e Start building against Micrometer 1.1.1 snapshots 
See gh-15328
 2018-11-29 09:58:23 +00:00
Andy Wilkinson ca11e83857 Start building against Micrometer 1.0.8 snapshots 
See gh-15327
 2018-11-29 09:48:38 +00:00
Andy Wilkinson 321da6c578 Upgrade to Spring Session Apple SR-7 
Closes gh-15254
 2018-11-29 08:38:57 +00:00
Andy Wilkinson cdecd053c3 Upgrade to Spring Session Bean-SR1 
Closes gh-15275
 2018-11-29 08:37:46 +00:00
Andy Wilkinson 79102454b2 Upgrade to Spring Integration 5.1.1.RELEASE 
Closes gh-15272
 2018-11-29 08:37:06 +00:00
Andy Wilkinson 452028e347 Upgrade to Spring Integration 5.0.10.RELEASE 
Closes gh-15251
 2018-11-29 08:35:18 +00:00
Madhura Bhave 427d494d57 Merge branch '2.0.x' 2018-11-28 21:32:05 -08:00
Madhura Bhave 02a1c43587 Fix tests 2018-11-28 21:26:47 -08:00
Madhura Bhave fc6c07ad3c Merge branch '2.0.x' 2018-11-28 17:41:11 -08:00
Madhura Bhave decaacddce Account for application path for Jersey servlet endpoints 
Closes gh-14895
 2018-11-28 17:25:32 -08:00
Andy Wilkinson 8560010bd4 Upgrade to Spring Kafka 2.1.11.RELEASE 
Closes gh-15315
 2018-11-28 19:46:34 +00:00
Andy Wilkinson 5fab0aee43 Upgrade to Spring AMQP 2.0.10.RELEASE 
Closes gh-15256
 2018-11-28 19:45:52 +00:00
Andy Wilkinson edbca5f4c0 Upgrade to Spring Security 5.0.10.RELEASE 
Closes gh-15253
 2018-11-28 19:45:19 +00:00
Andy Wilkinson 33e67f5847 Upgrade to Spring Kafka 2.2.2.RELEASE 
Closes gh-15273
 2018-11-28 19:42:08 +00:00
Andy Wilkinson 524a68209a Upgrade to Spring AMQP 2.1.2.RELEASE 
Closes gh-15271
 2018-11-28 19:42:08 +00:00
Andy Wilkinson 3178e3f34b Upgrade to Spring Security 5.1.2.RELEASE 
Closes gh-15274
 2018-11-28 19:42:08 +00:00
Brian Clozel d12e42e8d5 Polish 
Closes gh-15211
 2018-11-28 19:48:35 +01:00
artsiom 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
 2018-11-28 19:48:35 +01:00
Andy Wilkinson 6a766cf919 Start building against Spring Kafka 2.2.2 snapshots 
See gh-15273
 2018-11-28 17:40:33 +00:00
Stephane Nicoll 114347107e Polish key description 2018-11-28 11:31:48 +01:00
Stephane Nicoll 33000b6e8e Polish contribution 
Closes gh-14985
 2018-11-28 11:29:37 +01:00
Alon Bar-Lev 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
 2018-11-28 11:29:21 +01:00
Stephane Nicoll 476fe6ed17 Stop configuring metrics if hibernate is not available 
Closes gh-15317
 2018-11-28 10:54:56 +01:00
Stephane Nicoll 5f145ac482 Merge branch '2.0.x' 2018-11-28 10:23:44 +01:00
Stephane Nicoll b103e0c869 Polish "Unwrap DataSource target rather than plain instanceof calls" 
Closes gh-15227
 2018-11-28 10:18:28 +01:00
Stephane Nicoll 98378e210d Start building against Spring Kafka 2.1.11 snapshots 
See gh-15315
 2018-11-28 09:09:28 +01:00
dreis2211 17f04b8b75 Replace DirectFieldAccessor usages by hasFieldOrPropertyWithValue 
Closes gh-15312
 2018-11-28 08:47:41 +01:00
Andy Wilkinson 2dc8f49f8a Polish 2018-11-27 20:54:41 +00:00
Andy Wilkinson dad6d4beca Merge branch '2.0.x' 2018-11-27 20:37:35 +00:00
Andy Wilkinson 2b22b23aad Polish 2018-11-27 20:35:30 +00:00
Andy Wilkinson cf7664c01a Cope with version not found in Embedded Mongo's Version enum 
Closes gh-15311
 2018-11-27 16:33:22 +00:00
Andy Wilkinson dee8085f20 Merge branch '2.0.x' 2018-11-27 16:09:02 +00:00
Johannes Zick 83cf348ec8 Warn about Quartz dropping tables on restart 
Closes gh-15295
 2018-11-27 16:05:11 +00:00
Andy Wilkinson 760003b9d7 Polish "Document that test slices should not be combined" 
Closes gh-15310
 2018-11-27 15:50:19 +00:00
dreis2211 29cd1cc762 Document that test slices should not be combined 
See gh-15310
 2018-11-27 15:50:19 +00:00
Andy Wilkinson b094e28081 Remove auto-configuration of RequestContextFilter when using Jersey 
Closes gh-15048
 2018-11-27 15:39:46 +00:00
Andy Wilkinson 643b0f84da Merge branch '2.0.x' 2018-11-27 15:32:14 +00:00
Andy Wilkinson ab39e50ece List Gradle's Shadow Plugin as an alternative to Boot's loader 
Closes gh-1828
 2018-11-27 15:31:26 +00:00
Andy Wilkinson e1ad5641d5 Polish "Trim whitespace when coercing to a LogLevel" 
Closes gh-15143
 2018-11-27 15:14:26 +00:00
Dileep Bapat dfe94a0abb Trim whitespace when coercing to a LogLevel 
See gh-15143
 2018-11-27 15:10:36 +00:00
Stephane Nicoll d6571c0157 Upgrade to Reactor Californium-SR3 
Closes gh-15192
 2018-11-27 15:21:36 +01:00
Stephane Nicoll 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
 2018-11-27 15:09:55 +01:00
Stephane Nicoll d7fe3c73a3 Provide better logging for RepackageMojo 
Closes gh-15294
 2018-11-27 15:06:51 +01:00
Andy Wilkinson 9331390079 Upgrade to Spring Data Lovelace-SR3 
Closes gh-15191
 2018-11-27 14:01:15 +00:00
Andy Wilkinson fb3deab89d Merge branch '2.0.x' 2018-11-27 13:55:33 +00:00
Andy Wilkinson e81abc3f11 Order jacksonCodecCustomizer so user-provided customizer can go after it 
Closes gh-15167
 2018-11-27 13:51:33 +00:00
Andy Wilkinson 971adfcd5b Merge branch '2.0.x' 2018-11-27 13:27:05 +00:00
Andy Wilkinson e6dd11254c Polish 2018-11-27 13:26:49 +00:00
Andy Wilkinson 51a5b841dd Merge branch '2.0.x' 2018-11-27 12:51:16 +00:00
Andy Wilkinson 4a385e89bd Mention fully executable jars in Jersey’s scanning limitations 
Closes gh-3413
 2018-11-27 12:51:05 +00:00
Andy Wilkinson 669eeef29b Merge branch '2.0.x' 2018-11-27 12:36:22 +00:00
Andy Wilkinson 1f994b70b5 Correct description of file generated by heapdump endpoint 
Closes gh-15016
 2018-11-27 12:35:35 +00:00
Andy Wilkinson 1d029a09e2 Start building against Spring Data Lovelace-$R3 snapshots 
See gh-15191
 2018-11-27 12:17:37 +00:00
Andy Wilkinson f9a3b79e97 Merge branch '2.0.x' 2018-11-27 12:12:07 +00:00
Andy Wilkinson ae5d5235f6 Upgrade to Spring Data Kay-SR12 
Closes gh-14893
 2018-11-27 12:11:14 +00:00
Andy Wilkinson 376e7fdfa1 Document profile activation limitation of .spring-boot-devtools.properties 
Closes gh-15151
 2018-11-27 12:09:56 +00:00
Andy Wilkinson 6729e56f6b Merge branch '2.0.x' 2018-11-27 12:00:36 +00:00
Andy Wilkinson e74b084c67 Auto-configure codec customizations and JSON when using @WebFluxTest 
Closes gh-15070
 2018-11-27 11:48:30 +00:00
Andy Wilkinson f6a22a05b8 Merge branch '2.0.x' 2018-11-27 11:21:22 +00:00
Andy Wilkinson 9553d4f64b Polish "Auto-configure Spring Session's cookie serializer" 
Closes gh-15163
 2018-11-27 11:08:15 +00:00
Vedran Pavic 0daf83efab Auto-configure Spring Session's cookie serializer 
See gh-15163
 2018-11-27 11:08:05 +00:00
Stephane Nicoll dfab0b4231 Upgrade to Spring Framework 5.1.3 
Closes gh-15186
 2018-11-27 11:40:06 +01:00
Stephane Nicoll e89d1a8ebe Upgrade to Spring Framework 5.0.11 
Closes gh-15189
 2018-11-27 11:06:57 +01:00
Stephane Nicoll 8928cd1982 Deprecate spring.rabbitmq.template.queue 
Closes gh-15301
 2018-11-27 09:55:45 +01:00
Stephane Nicoll a240e22593 Adapt to Rabbit internal change 
See gh-15271
 2018-11-27 08:31:46 +01:00
Andy Wilkinson cf525dabd2 Merge branch '2.0.x' 2018-11-26 17:53:53 +00:00
Andy Wilkinson 69edf8960f Correct stale reference to embeddedLaunchScriptProperties with Gradle 
Closes gh-15094
 2018-11-26 17:53:27 +00:00
Andy Wilkinson de8c353cec Merge branch '2.0.x' 2018-11-26 17:40:46 +00:00
Andy Wilkinson 898d9f80f3 Merge branch '1.5.x' into 2.0.x 2018-11-26 17:40:35 +00:00
Andy Wilkinson fa7be63fbb Merge branch '2.0.x' 2018-11-26 16:53:00 +00:00
Andy Wilkinson 7ddbb37bd5 Polish 2018-11-26 16:52:49 +00:00
Andy Wilkinson 073ac7bc99 Fix Thymeleaf security dialect tests on Windows 2018-11-26 16:15:15 +00:00
Andy Wilkinson a0d0ecf9d4 Test the Gradle plugin against Gradle 5.0 
Closes gh-15171
 2018-11-26 16:02:54 +00:00
Andy Wilkinson 5a9ff6a3cb Merge branch '2.0.x' 2018-11-26 15:51:52 +00:00
Andy Wilkinson 5201584c60 Upgrade to Neo4j Ogm 3.1.5 
Closes gh-15293
 2018-11-26 15:51:01 +00:00
Andy Wilkinson 55721f06df Upgrade to Kotlin 1.2.71 
Closes gh-15292
 2018-11-26 15:50:59 +00:00
Andy Wilkinson c73fdc4ce4 Merge branch '2.0.x' 2018-11-26 12:09:21 +00:00
Andy Wilkinson d2756319cb Polish 2018-11-26 12:09:14 +00:00
Andy Wilkinson 1c4a26557c Polish 2018-11-26 11:47:35 +00:00
Andy Wilkinson c1bbcb6908 Merge branch '2.0.x' 2018-11-26 11:41:55 +00:00
Andy Wilkinson 4bc32e6358 Use a HandlerInterceptor for timing long tasks 
Closes gh-15204
 2018-11-26 11:30:06 +00:00
Stephane Nicoll f43a83fa4f Upgrade to Junit Jupiter 5.3.2 
Closes gh-15286
 2018-11-26 10:41:08 +01:00
Stephane Nicoll ae1979f1ff Merge branch '2.0.x' 2018-11-26 10:35:37 +01:00
Stephane Nicoll 5f0ac46d78 Unwrap DataSource target rather than plain instanceof calls 
Closes gh-15227
 2018-11-26 10:35:10 +01:00
Stephane Nicoll e424dfbe15 Polish "Perform best effort to retrieve DataSourceProxy" 
Closes gh-15206
 2018-11-26 10:18:48 +01:00
Tadaya Tsuyukubo 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
 2018-11-26 10:18:48 +01:00
Andy Wilkinson ee2107c91b Merge branch '2.0.x' 2018-11-23 20:15:42 +00:00
Andy Wilkinson 44632ea55c Merge branch '1.5.x' into 2.0.x 2018-11-23 20:15:26 +00:00
Andy Wilkinson 548cc05bb6 Polish 2018-11-23 19:33:33 +00:00
Andy Wilkinson 5a246ce24d Merge branch '2.0.x' 2018-11-23 17:00:24 +00:00
Andy Wilkinson 8772f90e2f Polish 2018-11-23 17:00:16 +00:00
Andy Wilkinson 35cce76ae8 Merge branch '2.0.x' 2018-11-23 16:59:27 +00:00
Andy Wilkinson 3331fa2d02 Merge branch '1.5.x' into 2.0.x 2018-11-23 16:59:18 +00:00
Andy Wilkinson 1797040e1a Merge branch '2.0.x' 2018-11-23 16:42:13 +00:00
Andy Wilkinson a54de61e61 Polish 
Revert change inadvertently committed as part of gh-15017
 2018-11-23 16:41:25 +00:00
Andy Wilkinson 4f405ed97d Merge branch '2.0.x' 2018-11-23 15:45:13 +00:00