Commit Graph

2556 Commits (27d727b52e0343cfda3bff48375434d09363a02f)

Author SHA1 Message Date
Andy Wilkinson e730382718 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 20546024d3 Merge branch '2.0.x' 7 years ago
Andy Wilkinson e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available
Closes gh-13521
7 years ago
Stephane Nicoll 8b35d06cf6 Share RetryTemplate infrastructure for Rabbit listener and template
Closes gh-13529
7 years ago
Stephane Nicoll 65cc7c72f4 Harmonize JNDI lookups to enable resourceRef
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.

This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.

Closes gh-12803
7 years ago
Andy Wilkinson c12f8298e6 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 814e90805e Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 3fdb2b3c85 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 864a6b3e91 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 9d3ba14686 Fix conditions for CachingConnectionFactory support
Closes gh-12161
7 years ago
Andy Wilkinson 12eafc84b0 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 497902de4e Only bridge JUL into SLF4J when JUL has not be customized
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.

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

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

Closes gh-13470
7 years ago
Brian Clozel cc894ce4f2 Fix Micrometer tag providers after HttpStatus changes
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
7 years ago
Stephane Nicoll 8365d53554 Add support for JMS session caching
This commit adds support for CachingConnectionFactory for both Artemis
and ActiveMQ. If connection pooling is not enabled explicitly, sessions,
producers and consumers are cached. The factory can be further
customized, including reverting to the raw ConnectionFactory, using the
`spring.jms.*` namespace.

Closes gh-12161
7 years ago
Stephane Nicoll 0ef54a79b1 Add support for connection pooling with Artemis
This commit expands ActiveMQ's connection pooling to artemis. The same
pooling features are now shared by the two brokers and a
PooledConnectionFactory can be auto-configured when the necessary jar is
present.

Closes gh-13523
7 years ago
Brian Clozel 28c1bc9986 Fix DefaultErrorViewResolver after HttpStatus changes
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
7 years ago
Stephane Nicoll 6970f19ce3 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 7ae82b070b Stop calling Charset.availableCharsets() early
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.

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

Fixes gh-13513
7 years ago
Stephane Nicoll 165d993e5d Merge branch '2.0.x' 7 years ago
Stephane Nicoll 62c93a4b9a Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
Closes gh-13508
7 years ago
Stephane Nicoll defa171a32 Merge branch '2.0.x' 7 years ago
Johnny Lim dd3bfdbe42 Use @ManagementContextConfiguration consistently 7 years ago
Stephane Nicoll b4584e6a28 Support profile expression in Logback's <springProfile>
Closes gh-13496
7 years ago
Stephane Nicoll a89b2ae46e Support profile expression in yml profile matching
Closes gh-12469
7 years ago
Stephane Nicoll 0c4176f596 Drop JsonSimpleJsonParser and JSON simple dependency
Closes gh-13471
7 years ago
Stephane Nicoll fa7da40640 Upgrade to JUnit 5.2.0
Closes gh-13118
7 years ago
Andy Wilkinson f3f573a774 Merge branch '2.0.x' 7 years ago
Andy Wilkinson b3927cfd10 Start building against Spring REST Docs 2.0.2 snapshots
See gh-13505
7 years ago
Stephane Nicoll 3b0c1354cb Upgrade to Maven Surefire/Failsafe Plugin 2.22.0
Closes gh-13500
7 years ago
Johnny Lim 403f8927c3 Polish CachesEndpoint
Closes gh-13487
7 years ago
Johnny Lim ec845c93f2 Polish HibernateProperties and its test
Closes gh-13484
7 years ago
Stephane Nicoll 60b109cf0c Merge branch '2.0.x' 7 years ago
Johnny Lim f34fb5f1ee Reduce object creation in findMatchingItemMetadata()
Closes gh-13473
7 years ago
Andy Wilkinson b96f9d635f Upgrade to Elasticsearch 5.6.10
Closes gh-13479
7 years ago
Stephane Nicoll 5654fb049f Merge branch '2.0.x' 7 years ago
Stephane Nicoll 438f0b008a Upgrade to Spring Amqp 2.0.4
Closes gh-13477
7 years ago
Stephane Nicoll 2483ed3e4e Upgrade to Spring Kafka 2.1.7
Closes gh-13476
7 years ago
Stephane Nicoll f217aa40f0 Merge branch '2.0.x' 7 years ago
Stephane Nicoll d47d84ff7a Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll de6ce79d5f Upgrade to Spring Session Apple-SR3
Closes gh-13461
7 years ago
Stephane Nicoll 40ba15047b Upgrade to Spring Integration 5.0.6
Closes gh-13457
7 years ago
Brian Clozel 6e9fee35a7 Upgrade to Spring Data Kay SR8
Closes gh-13455
7 years ago
Brian Clozel cb6c8f76e2 Configure X-Forwarded-* support with Reactor Netty
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.

Closes gh-10900
7 years ago
Andy Wilkinson f8eefa80df Merge branch '2.0.x' 7 years ago
Andy Wilkinson 42c307b744 Upgrade to Solr 6.6.4
Closes gh-13468
7 years ago
Andy Wilkinson bbcbc2d113 Upgrade to Reactor Bom Bismuth-SR10
Closes gh-13467
7 years ago
Andy Wilkinson ed3f43fd25 Upgrade to Jackson 2.9.6
Closes gh-13466
7 years ago
Andy Wilkinson 0e867aec97 Upgrade to Couchbase Client 2.5.9
Closes gh-13465
7 years ago
Andy Wilkinson 71b8b2d242 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson a79c8918ff Upgrade to Spring Security 5.0.6.RELEASE
Closes gh-13459
7 years ago
Stephane Nicoll c738b73c6f Merge branch '2.0.x' 7 years ago
Johnny Lim 870d7fe16a Use @SpringBootTest.properties in tests and samples
Closes gh-13453
7 years ago
Stephane Nicoll f8eedb04cc Merge branch '2.0.x' 7 years ago
Jon Schneider 96a6d2923c Upgrade to Micrometer 1.0.5
Closes gh-13454
7 years ago
Stephane Nicoll d24647b07c Upgrade to Spring Framework 5.0.7.RELEASE
Closes gh-13353
7 years ago
Johnny Lim de3c3cd755 Add CLIENT_NAME_NONE to WebClientExchangeTags 7 years ago
Johnny Lim c908445bff Use a precompiled pattern in WebClientExchangeTags.extractPath() 7 years ago
Andy Wilkinson 5bd9a445ae Merge branch '2.0.x' 7 years ago
Andy Wilkinson 6f2171c282 Improve error message when BootJar or BootWar has no known main class
Closes gh-12712
7 years ago
Andy Wilkinson db7789ad87 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 7b3be82cfa Merge branch '1.5.x' into 2.0.x 7 years ago
Madhura Bhave 87506248b0 Merge branch '2.0.x' 7 years ago
Madhura Bhave 4194baad91 Don't log p/w when AuthenticationManagerBuilder configured
Fixes gh-12872
7 years ago
Madhura Bhave f7ff8dd165 Make generated password output consistent 7 years ago
Madhura Bhave ed734d7e43 Trace filter ignores invalid requests
Fixes gh-12987
7 years ago
Brian Clozel 751a2b438e Upgrade duplicate finder maven plugin to 1.3.0
Closes gh-13411
7 years ago
Brian Clozel 59746de63b Backport web server configuration doc changes
Closes gh-13401
7 years ago
Rossen Stoyanchev a4ee33bf56 Follow-up dates for web server config documentation
See gh-13315
7 years ago
Stephane Nicoll 34167dc163 Polish 7 years ago
Stephane Nicoll a9e56aa089 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 5c96943e59 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb a0b6547aca Don't fail build on duplicate module-info classes
Update the duplicate-finder-maven-plugin configuration to ignore
module-info classes.

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

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

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

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

Closes gh-13315
7 years ago
Brian Clozel fe3de2816c Merge branch '2.0.x' 7 years ago
Brian Clozel 7cbbd95fc9 Ignore invalid Accept headers in WebFlux error handling
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.

This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.

Closes: gh-13372
7 years ago
Stephane Nicoll ab19db19a3 Move Hibernate settings to a dedicated class
Closes gh-1327
7 years ago
Andy Wilkinson cf8c0acdc5 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 47615154de Upgrade to Mongodb 3.6.4
Closes gh-13397
7 years ago
Andy Wilkinson fd56e79f7a Upgrade to Mariadb 2.2.5
Closes gh-13396
7 years ago
Andy Wilkinson 6d0d66cb28 Upgrade to Narayana 5.8.2.Final
Closes gh-13395
7 years ago
Andy Wilkinson a4a6f482c6 Upgrade to Hsqldb 2.4.1
Closes gh-13394
7 years ago
Andy Wilkinson ecd8760514 Upgrade to Hibernate Validator 6.0.10.Final
Closes gh-13393
7 years ago
Andy Wilkinson 50f3f50ebb Upgrade to Activemq 5.15.4
Closes gh-13392
7 years ago
Andy Wilkinson 2b4d51e763 Upgrade to Rxjava2 2.1.14
Closes gh-13391
7 years ago
Andy Wilkinson d79f2401be Upgrade to Netty 4.1.25.Final
Closes gh-13390
7 years ago
Andy Wilkinson 2d4f1bb043 Upgrade to Unboundid Ldapsdk 4.0.6
Closes gh-13389
7 years ago
Andy Wilkinson 27b5fdd1e1 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 42c2059dd8 Merge branch '2.0.x' 7 years ago
Stephane Nicoll f6c99361a4 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 0d63e7f592 Merge branch '2.0.x' 7 years ago
dreis2211 ba8a32fa4e Replace commons-codec Base64 usage
See gh-13378
7 years ago
Phillip Webb e0ae805924 Update copyright header 7 years ago
Phillip Webb 66be6c3396 Polish 7 years ago
Madhura Bhave 26b826e017 Merge branch '2.0.x' 7 years ago
Madhura Bhave d0a2a8e929 Document ConfigurableServletWebServerFactory variants
Closes gh-13083
7 years ago
Brian Clozel 56ab0da287 Support EncodedResourceResolver in resource chain
As of https://jira.spring.io/browse/SPR-16381, Spring Framework now
supports both gzip and Brotli as compression formats for static
resources resolved by the resource chain.

The `GzipResourceResolver` has been deprecated and replaced by the
`EncodedResourceResolver`. This commit uses this new resolver and adapts
the configuration key to reflect those changes.

Note that this resolver is now configured ahead of the
`VersionResourceResolver`.

Closes gh-13242
7 years ago
Dmytro Nosan 5b159a6bd0 Use Duration in HttpWebServiceMessageSenderBuilder
Closes gh-13364
7 years ago
Stephane Nicoll 909722f143 Polish 7 years ago
Stephane Nicoll e9c3df4ad2 Polish "Add duration support for setConnectTimeout and setReadTimeout"
Closes gh-13355
7 years ago
Dmytro Nosan 36f3c1b883 Add duration support for setConnectTimeout and setReadTimeout
See gh-13355
7 years ago
Stephane Nicoll 8691d01aaf Polish "Add duration support for setConnectTimout and setReadTimeout"
See gh-13355
7 years ago
Stephane Nicoll 83f7df920b Merge branch '2.0.x' 7 years ago
Stephane Nicoll bf56ec496d Polish 7 years ago
Stephane Nicoll 47634f5587 Polish 7 years ago
Stephane Nicoll 1901008d6f Merge branch '2.0.x' 7 years ago
Stephane Nicoll fff06822dc Polish 7 years ago
Stephane Nicoll d84e2b90d7 Fix wrong usage of ManagementContextConfiguration
Closes gh-13366
7 years ago
Stephane Nicoll 51cf4e5d74 Polish "Add support to set visibility via JacksonProperties"
Closes gh-13214
7 years ago
Eddú Meléndez ca3659059a Add support to set visibility via JacksonProperties
This commit allows to configure properties visibility.

See gh-13214
7 years ago
Stephane Nicoll 3248400665 Merge branch '2.0.x' 7 years ago
Stephane Nicoll b4f8361989 Make JMX metrics domain configurable
Closes gh-13356
7 years ago
Stephane Nicoll c612ed2695 Polish "RestTemplateCustomizers should be applied at the end"
Closes gh-13358
7 years ago
Dmytro Nosan ce3420748f RestTemplateCustomizers should be applied at the end
See gh-13358
7 years ago
Phillip Webb ade1397ea2 Merge branch '2.0.x' 7 years ago
Phillip Webb 571c50e43f Switch to functional web code to use static imports
Update the samples and tests to use the more idiomatic static import
style.
7 years ago
Phillip Webb 2274ac5214 Move spring-javaformat plugins to root POM
Relocate spring-javaformat plugins to the root of the project.

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

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

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

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

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

Closes gh-13151
7 years ago
Brian Clozel 87af880446 Reactor BOM is now declaring reactor-netty 0.8
See gh-13321
7 years ago
Madhura Bhave 360d392eb1 Merge branch '2.0.x' 7 years ago
Madhura Bhave 60a4d67b13 Handle special characters in TraceableHttpServletRequest
Fixes gh-13273
7 years ago
Phillip Webb ef5301d079 Add saaj and jax-ws dependencies for Java 9 build
Add test dependencies for saaj-impl and jax-ws since Java 9+ no longer
includes them.

See gh-1270
7 years ago
Andy Wilkinson ebb99d1c20 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 1a0dfa06ab Add log4j-jul to Log4j 2 starter
Closes gh-12659
7 years ago
Phillip Webb 1d35b629bb Merge branch '2.0.x' 7 years ago
Phillip Webb abe92eba2e Protect Inet test against "helpful" DNS resolvers
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.

Closes gh-11897
7 years ago
Brian Clozel bd8106d77f Upgrade to Spring Framework 5.1
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.

Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.

See gh-13321
7 years ago
Andy Wilkinson 0f321abe66 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 70c0d6a005 Test the Gradle plugin against Gradle 4.8
Closes gh-13359
7 years ago
Andy Wilkinson 00449bef6a Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
Closes gh-12631
7 years ago
Andy Wilkinson aee6aecfc2 Merge branch '2.0.x' 7 years ago
Andy Wilkinson 624946a779 Upgrade to Maven Invoker Plugin 3.1.0
Closes gh-12687
7 years ago