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
17,900 Commits 23 Branches 345 Tags 270 MiB
Commit Graph

659 Commits

Author SHA1 Message Date
Stephane Nicoll d4d169277d Merge branch '2.0.x' 2018-06-21 09:23:43 +02:00
Johnny Lim b9ea0fd5a7 Polish 
See gh-13534
 2018-06-21 09:20:50 +02:00
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
 2018-06-19 15:17:00 +02:00
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
 2018-06-19 15:05:32 +02:00
Stephane Nicoll b4584e6a28 Support profile expression in Logback's <springProfile> 
Closes gh-13496
 2018-06-18 13:23:58 +02:00
Stephane Nicoll a89b2ae46e Support profile expression in yml profile matching 
Closes gh-12469
 2018-06-18 13:05:52 +02:00
Stephane Nicoll 0c4176f596 Drop JsonSimpleJsonParser and JSON simple dependency 
Closes gh-13471
 2018-06-18 10:11:50 +02:00
Andy Wilkinson db7789ad87 Merge branch '2.0.x' 2018-06-08 15:47:55 +01:00
Andy Wilkinson 7b3be82cfa Merge branch '1.5.x' into 2.0.x 2018-06-08 15:47:50 +01:00
Brian Clozel 59746de63b Backport web server configuration doc changes 
Closes gh-13401
 2018-06-07 14:38:19 +02:00
Rossen Stoyanchev a4ee33bf56 Follow-up dates for web server config documentation 
See gh-13315
 2018-06-07 14:32:59 +02:00
Stephane Nicoll a9e56aa089 Merge branch '2.0.x' 2018-06-07 10:46:20 +02:00
Stephane Nicoll 5c96943e59 Merge branch '1.5.x' into 2.0.x 2018-06-07 10:45:59 +02:00
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
 2018-06-06 17:32:24 +02:00
Stephane Nicoll 42c2059dd8 Merge branch '2.0.x' 2018-06-06 11:00:25 +02:00
Stephane Nicoll f6c99361a4 Merge branch '1.5.x' into 2.0.x 2018-06-06 11:00:02 +02:00
Madhura Bhave 26b826e017 Merge branch '2.0.x' 2018-06-05 13:49:42 -07:00
Madhura Bhave d0a2a8e929 Document ConfigurableServletWebServerFactory variants 
Closes gh-13083
 2018-06-05 13:48:43 -07:00
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
 2018-06-05 17:25:25 +02:00
Stephane Nicoll 51cf4e5d74 Polish "Add support to set visibility via JacksonProperties" 
Closes gh-13214
 2018-06-05 10:30:15 +02:00
Eddú Meléndez ca3659059a Add support to set visibility via JacksonProperties 
This commit allows to configure properties visibility.

See gh-13214
 2018-06-05 10:20:25 +02:00
Stephane Nicoll 3248400665 Merge branch '2.0.x' 2018-06-05 10:12:46 +02:00
Stephane Nicoll b4f8361989 Make JMX metrics domain configurable 
Closes gh-13356
 2018-06-05 10:12:26 +02:00
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
 2018-06-04 18:59:17 +02:00
Stephane Nicoll 93396aef51 Polish 2018-06-04 17:50:29 +02:00
Stephane Nicoll ee158df993 Merge branch '2.0.x' 2018-06-04 17:36:01 +02:00
Dmytro Nosan 20003489be Auto-configure jOOQ with TransactionListenerProvider 
Closes gh-13331
 2018-06-04 17:35:40 +02:00
Stephane Nicoll 8bcea0d8cc Polish "Add auto-configuration for WebServiceTemplate" 
Closes gh-1270
 2018-06-04 12:27:29 +02:00
dnosan c9df1c551a Add auto-configuration for WebServiceTemplate 
See gh-12707
 2018-06-04 11:12:02 +02:00
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 2018-06-01 09:26:29 +02:00
Johnny Lim 6b0ce46491 Polish 
Closes gh-13320
 2018-06-01 09:22:20 +02:00
Stephane Nicoll 74379da726 Merge branch '2.0.x' 2018-05-31 16:39:11 +02:00
Stephane Nicoll 32aa5b9bae Merge branch '1.5.x' into 2.0.x 2018-05-31 16:38:23 +02:00
Stephane Nicoll 55d70d5691 Merge branch '2.0.x' 2018-05-31 10:41:01 +02:00
James McShane d74c768cdd Remove outdated reference to @EnableReactor 
Closes gh-13308
 2018-05-31 10:39:44 +02:00
Madhura Bhave 9f4a5c13a5 Add auto-config for WebFlux OAuth2 Login 
Closes gh-13142
 2018-05-30 18:53:11 -07:00
Stephane Nicoll bb69339a82 Merge branch '2.0.x' 2018-05-30 15:28:15 +02:00
Stephane Nicoll b47a72731f Merge branch '1.5.x' into 2.0.x 2018-05-30 15:27:58 +02:00
Stephane Nicoll 3f001899b4 Harmonize ssl properties for Kafka 
Closes gh-13239
 2018-05-29 17:51:01 +02:00
Stephane Nicoll 56dd53bfba Merge branch '2.0.x' 2018-05-29 17:28:34 +02:00
Stephane Nicoll 7849d73828 Polish 
See gh-13031
 2018-05-29 17:28:16 +02:00
Andy Wilkinson 32a9addb57 Merge branch '2.0.x' 2018-05-29 13:59:37 +01:00
Andy Wilkinson 1ce22aa50a Polish 2018-05-29 13:58:40 +01:00
Stephane Nicoll ec65cb1753 Merge branch '2.0.x' 2018-05-28 10:52:42 +02:00
Stephane Nicoll 15ba50ab3e Merge branch '1.5.x' into 2.0.x 2018-05-28 10:52:21 +02:00
Johnny Lim de01e7aad4 Polish 
See gh-13243
 2018-05-28 09:46:40 +02:00
Stephane Nicoll 1bb53ff44c Merge branch '2.0.x' 2018-05-26 12:44:50 +02:00
Arnaud Heritier b60eadb10b Add missing semicolon in example 
Closes gh-13266
 2018-05-26 12:44:11 +02:00
Stephane Nicoll 75c10e615e Merge branch '2.0.x' 2018-05-25 16:45:57 +02:00
Andrea Vacondio aed118c410 Fix documentation error 
Closes gh-13260
 2018-05-25 16:43:35 +02:00
Stephane Nicoll 699b6ce6dc Remove reference to Jersey 1 
Closes gh-12582
 2018-05-22 10:50:27 +02:00
Stephane Nicoll 8364d121b1 Merge branch '2.0.x' 2018-05-17 16:18:17 +02:00
Stephane Nicoll 125b5974c0 Merge branch '1.5.x' into 2.0.x 2018-05-17 16:17:55 +02:00
Stephane Nicoll afe6abb20d Merge branch '2.0.x' 2018-05-17 15:31:02 +02:00
Johnny Lim 75639aa682 Polish 
Closes gh-13192
 2018-05-17 15:29:50 +02:00
Stephane Nicoll beafba4487 Merge branch '2.0.x' 2018-05-17 09:35:29 +02:00
Stephane Nicoll 1d2edc1d37 Fix wrong reference to WebApplicationType 
Closes gh-13195
 2018-05-17 09:35:07 +02:00
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
 2018-05-16 17:48:41 +02:00
Stephane Nicoll 95b251590e Polish "Introduce HealthIndicatorRegistry" 
See gh-4965

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
 2018-05-16 17:39:20 +02:00
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
 2018-05-16 13:59:34 +02:00
Andy Wilkinson 08a12e7964 Merge branch '2.0.x' 2018-05-15 10:28:56 +01:00
Andy Wilkinson be0b8eb871 Merge branch '1.5.x' into 2.0.x 2018-05-15 10:28:46 +01:00
Andy Wilkinson 72b45584eb Merge branch '2.0.x' 2018-05-15 09:18:06 +01:00
Andy Wilkinson 8b028e30d3 Merge branch '1.5.x' into 2.0.x 2018-05-15 09:18:01 +01:00
Stephane Nicoll 497aebe010 Merge branch '2.0.x' 2018-05-14 18:21:33 +02:00
Stephane Nicoll a3a6a2b291 Polish "Add CLI manifest for Scoop" 
Closes gh-12541
 2018-05-14 18:20:57 +02:00
Andrey Saksonov daccdbb18d Add CLI manifest for Scoop 
See gh-12541
 2018-05-14 18:00:32 +02:00
Stephane Nicoll c7eec5c45e Polish "Add liquibase test rollback on update property" 
Closes gh-13159
 2018-05-14 16:14:11 +02:00
Stephane Nicoll b839c98de9 Merge branch '2.0.x' 2018-05-14 16:04:30 +02:00
Sebastien Deleuze d747d43b23 Update Kotlin refdoc with the new tutorial 
Closes gh-13161
 2018-05-14 16:03:46 +02:00
Stephane Nicoll c8dc885cc5 Add missing note 
See gh-12933
 2018-05-14 13:30:40 +02:00
Stephane Nicoll 602f52fffc Add support for configuring common tags declaratively 
Closes gh-12933
 2018-05-14 13:26:01 +02:00
Stephane Nicoll 93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path 
Closes gh-12971
 2018-05-14 12:24:38 +02:00
Stephane Nicoll 9b379b43ae Merge branch '2.0.x' 2018-05-14 09:33:16 +02:00
Stephane Nicoll 8f53c2e2bb Support for custom comment prefix 
Some Quartz initialization scripts have comments in a different format.

This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.

Closes gh-13041
 2018-05-14 09:32:42 +02:00
Stephane Nicoll b17c58b114 Merge branch '2.0.x' 2018-05-14 08:23:36 +02:00
Johnny Lim 3dd2f5bb05 Polish 
See gh-13148
 2018-05-14 08:19:10 +02:00
Stephane Nicoll 8e9a873787 Polish "Improve LDAP auto-configuration conditions" 
Closes gh-13143
 2018-05-11 17:59:21 +02:00
Stephane Nicoll 00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim 75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll a11acbc829 Merge branch '2.0.x' 2018-05-11 08:55:21 +02:00
Stephane Nicoll 4bec3b7cd9 Polish 
See gh-13123
 2018-05-11 08:55:03 +02:00
Andy Wilkinson 5dbba99aed Merge branch '2.0.x' 2018-05-08 20:15:02 +01:00
Andy Wilkinson 7a53623e1c Polish "Clarify deployment of Spring Boot apps to App Engine Standard" 
See gh-13090
 2018-05-08 20:12:46 +01:00
ifigotin 676b013998 Clarify deployment of Spring Boot apps to App Engine Standard 
Closes gh-13090
 2018-05-08 20:12:33 +01:00
Andy Wilkinson e4bdf4e513 Polish 2018-05-08 12:14:39 +01:00
Andy Wilkinson a1bea69555 Make Elasticsearch dependency available to javadoc generation 
See gh-12600
 2018-05-08 12:12:21 +01:00
Brian Clozel 84c9a65e9d Auto-configure Elasticsearch REST clients 
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.

`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.

`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.

Closes gh-12600
 2018-05-07 17:57:09 +02:00
Johnny Lim 96ce71ddc4 Polish 
Closes gh-13078
 2018-05-07 14:55:13 +02:00
Stephane Nicoll 3ad8f3fcbf Merge branch '2.0.x' 2018-05-07 14:53:58 +02:00
Stephane Nicoll 9dccf5b895 Polish 
See gh-13078
 2018-05-07 14:48:56 +02:00
Phillip Webb a323a85e3b Merge branch '2.0.x' 2018-05-04 20:06:55 -07:00
Phillip Webb 975e986fef Polish 2018-05-04 20:06:27 -07:00
Madhura Bhave e02954a25b Merge branch '2.0.x' 2018-05-04 16:55:54 -07:00
Madhura Bhave f5f3af7f9c Point to gradle plugin's doc for custom dependency versions 
Fixes gh-12807
 2018-05-04 16:54:11 -07:00
Phillip Webb 42c053cf1b Merge branch '2.0.x' 2018-05-04 16:31:46 -07:00
Phillip Webb 6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Stephane Nicoll 303b479b90 Merge branch '2.0.x' 2018-05-04 16:15:26 +02:00
Stephane Nicoll 959c569199 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:15:10 +02:00
Stephane Nicoll 15936a1fe8 Merge branch '2.0.x' 2018-05-04 14:27:39 +02:00
Stephane Nicoll 126f928f36 Polish "Improve Spring Session docs" 
Closes gh-13061
 2018-05-04 14:26:51 +02:00
Vedran Pavic 370160720d Improve Spring Session docs 
See gh-13061
 2018-05-04 14:26:39 +02:00
Phillip Webb 8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Stephane Nicoll 36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +02:00
Toshiaki Maki d208641c59 Complete SSL configuration for Kafka 
See gh-13031
 2018-05-03 15:38:49 +02:00
Stephane Nicoll ca1b637728 Merge branch '2.0.x' 2018-05-03 11:14:59 +02:00
Stephane Nicoll b3ad902902 Merge branch '1.5.x' into 2.0.x 2018-05-03 11:14:42 +02:00
Madhura Bhave ef0cfc43fe Merge branch '2.0.x' 2018-05-01 11:34:39 -07:00
Madhura Bhave d268b2102f Fix typo 2018-05-01 11:33:47 -07:00
Stephane Nicoll 9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Stephane Nicoll 284fe969e0 Merge branch '2.0.x' 2018-04-30 16:43:02 +02:00
Yaman Jain 50ca33ecd2 Fix typo 
Closes gh-12996
 2018-04-30 16:42:22 +02:00
Stephane Nicoll fb8a5a9864 Polish "Add cache actuator endpoint" 
This commit improves the initial proposal by providing a by name read
operation that returns the detail of a particular cache. It also adds
more tests and complete API documentation for the feature.

Closes gh-12216
 2018-04-30 16:34:00 +02:00
Stephane Nicoll 22b99a90de Polish 
See gh-12906
 2018-04-28 10:36:41 +02:00
Madhura Bhave acc1793e96 Merge branch '2.0.x' 2018-04-27 13:19:46 -07:00
Madhura Bhave 0385bd4131 Use spring.session.timeout for Spring Session timeout 
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
 2018-04-27 13:16:17 -07:00
Brian Clozel 1ef0098ab5 Add WebClient metrics support 
This commit adds support for Actuator Metrics for WebClient.
This support mirrors the current behavior for `RestTemplate`, reusing
the same metric name `"http.client.requests"` and tags.

`WebClient` is instrumented by a `MetricsWebClientFilterFunction` which
is applied by a `WebClientCustomizer`. This instrumentation happens
automatically only if you create an instance of `WebClient` using an
auto-configured `WebClient.Builder` bean.

This infrastructure is reusing de facto the `MeterFilter` that has been
added for `RestTemplate` in order to limit the "uri" tag cardinality.

Closes gh-12228
 2018-04-27 13:54:14 +02:00
Stephane Nicoll 621874708d Merge branch '2.0.x' 2018-04-27 10:20:18 +02:00
Stephane Nicoll 36fb078935 Merge branch '1.5.x' into 2.0.x 2018-04-27 10:19:45 +02:00
Stephane Nicoll c8843947fe Polish 2018-04-27 10:14:51 +02:00
Stephane Nicoll 1a41ff941a Polish 2018-04-27 10:14:31 +02:00
Stephane Nicoll 4d0fe5bbe6 Merge branch '2.0.x' 2018-04-27 09:33:48 +02:00
Johnny Lim b941c5f1a6 Polish 
Closes gh-12981
 2018-04-27 09:29:16 +02:00
Madhura Bhave dafe8823cc Merge branch '2.0.x' 2018-04-26 13:46:06 -07:00
Madhura Bhave 24ce3ecb43 Fix typo in docs 2018-04-26 13:43:51 -07:00
Madhura Bhave 6bebb931e5 Merge branch '2.0.x' 2018-04-26 12:21:51 -07:00
Madhura Bhave 228c85fe67 Improve List and Map binding documentation 
Closes gh-12444
 2018-04-26 12:18:49 -07:00
Stephane Nicoll 25414d1b58 Merge branch '2.0.x' 2018-04-25 17:20:30 +02:00
Stephane Nicoll 9cf8080a17 Polish "Document Kotlin custom metadata generation" 
Closes gh-12960
 2018-04-25 17:19:55 +02:00
sdeleuze c24e7a5930 Document Kotlin custom metadata generation 
See gh-12960
 2018-04-25 17:19:38 +02:00
Stephane Nicoll 03cf4fbb10 Polish "Add actuator endpoint for exposing the Spring Integration graph" 
Closes gh-12331
 2018-04-25 16:16:43 +02:00
Tim Ysewyn 8c67ef1079 Add actuator endpoint for exposing the Spring Integration graph 
See gh-12331
 2018-04-25 16:16:43 +02:00
Stephane Nicoll 65fda8d3d6 Merge branch '2.0.x' 2018-04-25 09:43:43 +02:00
Stephane Nicoll 11ad9bfebf Upgrade version of gradle-git-properties in doc 
Closes gh-12955
 2018-04-25 09:43:19 +02:00
Stephane Nicoll 50d73285f7 Merge branch '2.0.x' 2018-04-22 11:12:12 +02:00
Stephane Nicoll f58f23c5b8 Document that binder doesn't handle static properties 
Closes gh-12912
 2018-04-22 11:11:56 +02:00
Stephane Nicoll 49f64aab48 Merge branch '2.0.x' 2018-04-22 09:21:09 +02:00
Stephane Nicoll 469ce57016 Remove outdated note 
As we've updated the complete ref doc to use a canonical format for
configuration keys, this not is outdated and this commit removes it.
 2018-04-22 09:20:19 +02:00
Stephane Nicoll 6df1ea3544 Fix use of deprecated property in docs 
Closes gh-12940
 2018-04-22 09:19:08 +02:00
Stephane Nicoll e72306b33e Merge branch '2.0.x' 2018-04-18 09:50:09 +02:00
Stephane Nicoll 026d8bed5f Fix additional missing semicolon on sample code 
Closes gh-12895
 2018-04-18 09:49:15 +02:00
Jienan Duan 90ae14ec21 Add missing semicolon on sample code 
See gh-12895
 2018-04-18 09:47:54 +02:00
Stephane Nicoll a85998f4c3 Polish "Add auto-configuration for Hibernate metrics" 
Closes gh-12550
 2018-04-17 13:46:27 +02:00
Rui Figueira b6b92ba937 Add auto-configuration for Hibernate metrics 
All Hibernate entityManagerFactories are automatically instrumented
and their statistics are included into Micrometer using its
HibernateMetrics binder.

Closes gh-12550
 2018-04-17 13:23:18 +02:00
Stephane Nicoll 2002115637 Add doc ref for hierarchical name mapping 2018-04-16 08:43:46 +02:00
Stephane Nicoll bfe31e6688 Fix broken build 2018-04-13 16:40:15 +02:00
Stephane Nicoll 2204d5f750 Polish 2018-04-13 15:18:42 +02:00
Stephane Nicoll 31441a7590 Add a note to explain how to disable the web server 
See gh-12853
 2018-04-13 15:18:08 +02:00
Stephane Nicoll 7550f92ea5 Clarify DataSource metrics section for custom DataSources 
Closes gh-12851
 2018-04-13 14:50:44 +02:00