Commit Graph

1760 Commits

Author SHA1 Message Date
Stephane Nicoll 7a88fe692d Polish Quartz dependency management
Closes gh-12364
2018-03-06 17:00:56 +01:00
Stephane Nicoll 326c1e123c Merge branch '1.5.x' 2018-03-06 15:26:47 +01:00
Stephane Nicoll 6f7501f62b Remove my clone 2018-03-06 10:21:00 +01:00
Madhura Bhave e6eca04af2 Make EndpointRequestMatcher#excluding public
Fixes gh-12354
2018-03-05 16:07:46 -08:00
Madhura Bhave 4ca1e6ae4e Polish "Fix typo in TestDatabaseAutoConfiguration"
Closes gh-12350
2018-03-05 13:13:07 -08:00
inabajunmr ddd8598e2e Fix typo in TestDatabaseAutoConfiguration failure msg
See gh-12350
2018-03-05 13:10:46 -08:00
Madhura Bhave b6e09e8311 Merge branch '1.5.x' 2018-03-05 12:54:01 -08:00
Andy Wilkinson d00d1da27a Upgrade to Maven Javadoc Plugin 3.0.0
Closes gh-12345
2018-03-05 12:45:17 +00:00
Cristian Greco b552842b9d Fix link to Spring Data JPA in docs
Closes gh-12342
2018-03-05 12:33:26 +00:00
Andy Wilkinson f918e0eb6a Merge branch '1.5.x' 2018-03-05 11:55:18 +00:00
Andy Wilkinson 85900796d3 Remove stale tip about ManagementContextConfiguration for endpoints
Closes gh-12312
2018-03-05 11:19:10 +00:00
Andy Wilkinson 2c882a47d0 Merge pull request #12324 from Jon Schneider
* gh-12324:
  Polish "Improve docs on custom metrics"
  Improve docs on custom metrics
2018-03-05 10:55:00 +00:00
Andy Wilkinson d7499387d8 Polish "Improve docs on custom metrics"
Closes gh-12324
2018-03-05 10:54:19 +00:00
Jon Schneider 25ff82f1d7 Improve docs on custom metrics
See gh-12324
2018-03-05 10:53:55 +00:00
dreis2211 3adced9962 Remove workaround for JDK-8023130 in RunProcess
With JDK 8 being the baseline and JDK 7 not being supported anymore we
can get rid of the workaround for a JDK 7 bug in
ProcessBuilder.inheritIO on Windows machines.

Closes gh-12337
2018-03-05 10:39:28 +00:00
Andy Wilkinson 9882d87e1b Start building against Spring Framework 5.0.5 snapshots
See gh-12340
2018-03-05 09:34:41 +00:00
Stephane Nicoll 6533278191 Update reference guide to stop mentioning setWebEnvironment
Closes gh-12330
2018-03-04 09:50:40 +01:00
Andy Wilkinson 1f5143de70 Avoid problems with Failsafe when building with JDK 10
See gh-12028
2018-03-03 17:52:41 +00:00
Andy Wilkinson d30c1fd9f8 Make javadoc plugin use Java 10-compatible version of Commons Lang 3
See gh-12028
2018-03-03 17:52:41 +00:00
Andy Wilkinson 4aa947c227 Use a Java 10-compatibile version of Maven’s site plugin
See gh-12028
2018-03-03 17:52:41 +00:00
Stephane Nicoll 7f5b7a6b47 Polish contribution
Closes gh-12326
2018-03-03 12:26:14 +01:00
Johnny Lim 751c444166 Polish
See gh-12326
2018-03-03 12:25:41 +01:00
Madhura Bhave 1c27a8e6e2 Move tests to ApplicationContextRunner 2018-03-02 18:30:55 -08:00
Andy Wilkinson 3370c23ab9 Skip the Gradle plugin when building with the full profile and JDK 10
See gh-12028
2018-03-02 17:48:27 +00:00
Andy Wilkinson 2b1252e282 Skip the Gradle Plugin when building with JDK 10
Previously, the JDK 10 build would fail as we build the plugin using
Gradle 4.0.x (the lowest version of Gradle that we support) and
Gradle 4.0.x doesn't work with Java 10.

Upgrading to Gradle 4.1, which appears to work with Java 10, was
considered but rejected for now as it introduces the risk that we
inadvertently use an API that's new in 4.1 and break our 4.0 support.

This commit goes for the extreme option and disables building the
Gradle Plugin when building with JDK.

See gh-12028
2018-03-02 17:05:58 +00:00
Andy Wilkinson 20654b9bc9 Remove no longer needed AspectJ version override with JDK 9+
See gh-12028
2018-03-02 16:04:10 +00:00
Andy Wilkinson f7c8be1877 Apply java9 profile to JDK 10 (and later) as well as JDK 9
See gh-12028
2018-03-02 15:28:03 +00:00
Andy Wilkinson 7fdc26351a Upgrade to Kotlin 1.2.30
Closes gh-12320
See gh-12028
2018-03-02 15:23:29 +00:00
Andy Wilkinson a7d05d4276 Avoid SUREFIRE-1439 by using 2.21.0-SNAPSHOT when building with JDK 10
See gh-12028
2018-03-02 15:14:45 +00:00
Andy Wilkinson 9f7e840416 Improve documentation for using configuration processor with Gradle
Closes gh-12316
2018-03-02 13:41:28 +00:00
Andy Wilkinson 4a3e0a231c Test the Gradle plugin against Gradle 4.6
Closes gh-12314
2018-03-02 13:41:28 +00:00
Andy Wilkinson e4a1fed3b8 Test the Gradle plugin against Gradle 4.6 2018-03-02 13:41:27 +00:00
Andy Wilkinson 188d120c9c Test the Gradle plugin against Gradle 4.5.1
Closes gh-12315
2018-03-02 13:41:27 +00:00
Johnny Lim 83ed0c7783 Make UserDetailsServiceAutoConfiguration.getOrDeducePassword() private
Closes gh-12295
2018-03-02 10:41:11 +01:00
igor-suhorukov 69fe32b1f5 Polish
Replace class "Stack" by more modern "Deque"

Closes gh-12304
2018-03-02 10:39:28 +01:00
Stephane Nicoll ef9fb1696c Merge branch '1.5.x' 2018-03-01 17:26:51 +01:00
Stephane Nicoll 8b5ad5b942 Replace outdated Spring Integration metrics section with a link 2018-03-01 17:00:01 +01:00
Stephane Nicoll 8a6664869e Fix typo 2018-03-01 16:56:02 +01:00
Phillip Webb 38f112b9e1 Update flattened POM elements
Update flattened POM rules to satisfy maven central
requirements.

Fixes gh-12290
2018-02-28 19:37:09 -08:00
Phillip Webb 9bee9e9cf9 Polish 2018-02-28 13:50:43 -08:00
Madhura Bhave df337eaf5e Fix author name 2018-02-28 12:26:58 -08:00
Andy Wilkinson 1761e50b03 Upgrade to Spring Integration 5.0.3
Closes gh-12235
2018-02-28 20:23:51 +00:00
Andy Wilkinson 8d1e69bca4 Polish Gradle plugin's javadoc 2018-02-28 20:22:45 +00:00
Andy Wilkinson 703de64842 Reinstate imports 2018-02-28 20:11:42 +00:00
Andy Wilkinson ef157d3649 Fix Checkstyle violations 2018-02-28 19:59:39 +00:00
Phillip Webb 7bc535e4fa Polish 2018-02-28 10:59:26 -08:00
Phillip Webb 67998e983f Revert "Include WebSecurityConfigurer beans in @WebMvcTest"
This reverts commit eef6fdb066.
2018-02-28 10:59:26 -08:00
Andy Wilkinson 01304959fa Polish "Remove redundant auto-configuration of SI Micrometer metrics"
Closes gh-12287
2018-02-28 17:45:32 +00:00
Gary Russell ddd820af9a Remove redundant auto-configuration of SI Micrometer metrics
Spring Integration no longer requires a `MicrometerMetricsFactory` to
support Micrometer metrics so there's nothing for Boot to
auto-configure.

See gh-12287
2018-02-28 17:33:05 +00:00
Andy Wilkinson c4c50b7c49 Only auto-configure LogbackMetrics when Logback is actually being used
Closes gh-12286
2018-02-28 17:20:04 +00:00
Andy Wilkinson 9b46221345 Escape backslashes so they are preserved during Properties parsing
Closes gh-12285
2018-02-28 16:34:05 +00:00
Andy Wilkinson 75ed406f47 Upgrade to Spring Security 5.0.3
Closes gh-12247
2018-02-28 15:50:28 +00:00
Johnny Lim f12c7ab38a Remove an unnecessary method in EndpointDiscoverer
Closes gh-12284
2018-02-28 15:45:25 +01:00
Stephane Nicoll 0f652cdf4f Fix injection point with proxied DataSource
Prior to this commit, the `ApplicationContext` couldn't start with a
JDK-proxied `HikariDataSource` as the JMX auto-configuration was
attempting to inject a (too narrowed) `HikariDataSource`.

This commit rather injects a regular `DataSource` and attempt to unwrap
it as a `HikariDataSource`.

Closes gh-12271
2018-02-28 15:37:07 +01:00
Stephane Nicoll 5fa71a1f94 Switch test to ApplicationContextRunner 2018-02-28 14:13:45 +01:00
Andy Wilkinson 299eca084c Upgrade to Spring Data Kay SR5
Closes gh-12234
2018-02-28 11:28:03 +00:00
Andy Wilkinson 35b7a16917 Merge branch '1.5.x' 2018-02-28 11:24:08 +00:00
Brian Clozel 14d36c9ad8 Polish
Closes gh-12268
2018-02-28 09:36:21 +01:00
Stephane Maldini 7866b946f7 Add Netty Compression support
Reactor Netty 0.7.5 now supports all Compression options.
Unlike previous Reactor Netty versions, the minimum compression
threshold is now based on the content-length instead of
accumulating for a while the data.

See gh-12268
2018-02-28 09:36:21 +01:00
Andy Wilkinson 0abe62e181 Upgrade to Jetty El 8.5.24.2
Closes gh-12279
2018-02-28 08:21:52 +00:00
Andy Wilkinson 85b63f3d38 Upgrade to Hibernate 5.2.14.Final
Closes gh-12278
2018-02-28 08:21:52 +00:00
Stephane Nicoll 4180762d6d Polish contribution
Closes gh-12236
2018-02-28 09:01:59 +01:00
igor-suhorukov 56cbc65e7b Polish
See gh-12236
2018-02-28 08:58:46 +01:00
Stephane Nicoll a93052f380 Upgrade to Reactor Bismuth-SR7
Closes gh-12233
2018-02-28 08:37:02 +01:00
Phillip Webb 7f8bb4e8eb Allow EndpointRequest matching without path bean
Update `EndpointRequest` to that the `PathMappedEndpoints` bean is
optional. A missing bean is treated as if there are no path mapped
endpoints.

Fixes gh-12238
2018-02-27 21:05:35 -08:00
Phillip Webb eef6fdb066 Include WebSecurityConfigurer beans in @WebMvcTest
Update `WebMvcTypeExcludeFilter` to include `WebSecurityConfigurer`
beans.

Fixes gh-12275
2018-02-27 21:05:35 -08:00
Phillip Webb c23b0e99f1 Fix failing PathRequestTests
Fix test failing due to commit d66496787d.

See gh-12238
2018-02-27 17:06:21 -08:00
Phillip Webb d66496787d Propagate exceptions in security matchers
Update `ApplicationContextRequestMatcher` and
`ApplicationContextServerWebExchangeMatcher` to use a supplier for
the context, rather than the context itself.

This allow exceptions to be propagated to subclasses which may choose
to deal with them.

See gh-12238
2018-02-27 16:29:14 -08:00
Phillip Webb 802cd856aa Remove test-autoconfigure dependency
Update `spring-boot-actuator-autoconfigure` so that it no longer has
a dependency on `spring-boot-test-autoconfigure`. This will allow us to
add test support for actuator concerns in the future if we need to.

Fixed gh-12270
2018-02-27 16:29:03 -08:00
Brian Clozel 438004efe5 Simplify HTTP compression support for Reactor Netty
This commit simplifies the HTTP compression configuration for Reactor
Netty servers.

Also, this commit removes a test for the
`server.compression.min-response-size` support, as this is only
supported when the HTTP response contains a `Content-Length` header.
Since most Spring WebFlux responses are using
`Transfer-Encoding: chunked`, we should not test for that case.

See gh-12268
2018-02-27 23:47:35 +01:00
Madhura Bhave 7f85322ddd Fix checkstyle 2018-02-27 13:38:54 -08:00
Andy Wilkinson dc36360155 Polish 2018-02-27 21:25:48 +00:00
Andy Wilkinson 9640881f38 Fix BuildInfo up-to-date check when group, name, or version changes
Previously, if the project's group, name, or version changed the
BuildInfo task would still be considered up-to-date as the values of
the project's properties were not reflected in the fields of the
BuildInfo instance.

This commit updates BuildInfo to copy the value of the project's
property to the corresponding BuildInfo field when the property is
read using its getter method on BuildInfo.

Closes gh-12266
2018-02-27 21:21:16 +00:00
Phillip Webb 3e4da3cc37 Polish 2018-02-27 12:53:01 -08:00
Andy Wilkinson c7ed5c3d4a Upgrade to EhCache 3.5.0
Closes gh-12256
2018-02-27 20:45:54 +00:00
Andy Wilkinson fe7927900e Upgrade to Spring Kafka 2.1.4.RELEASE
Closes gh-12246
2018-02-27 20:15:21 +00:00
Andy Wilkinson 21f2492d09 Upgrade to Micrometer 1.0.1
Closes gh-12245
2018-02-27 20:14:38 +00:00
Andy Wilkinson fdb9a1ea8f Consider time in BuildInfo up-to-date checks and allow it to be set
Closes gh-12111
Closes gh-12266
2018-02-27 20:09:07 +00:00
Andy Wilkinson 25a0031e10 Upgrade to Narayana 5.8.0.Final
Closes gh-12259
2018-02-27 17:43:36 +00:00
Andy Wilkinson 574a157faf Upgrade to Influxdb Java 2.9
Closes gh-12258
2018-02-27 17:43:36 +00:00
Andy Wilkinson d8d8a06f95 Upgrade to Elasticsearch 5.6.8
Closes gh-12257
2018-02-27 17:43:36 +00:00
Andy Wilkinson 2fdf84199a Upgrade to Javax Annotation 1.3.2
Closes gh-12255
2018-02-27 17:43:36 +00:00
Andy Wilkinson cffbad9b65 Upgrade to Rxjava2 2.1.10
Closes gh-12254
2018-02-27 17:43:36 +00:00
Andy Wilkinson c0d9e3d14e Upgrade to Netty 4.1.22.Final
Closes gh-12253
2018-02-27 17:43:36 +00:00
Andy Wilkinson 476b7087a7 Upgrade to Hikaricp 2.7.8
Closes gh-12252
2018-02-27 17:43:36 +00:00
Andy Wilkinson 410555a1b6 Upgrade to Caffeine 2.6.2
Closes gh-12251
2018-02-27 17:43:36 +00:00
Stephane Nicoll 9ce96fbd89 Document support for java.util.Duration
Closes gh-12244
2018-02-27 18:00:36 +01:00
Stephane Nicoll 6676967cc1 Polish 2018-02-27 16:47:55 +01:00
Stephane Nicoll 0b46408846 Polish 2018-02-27 16:47:34 +01:00
Stephane Nicoll b0f381bb6f Review conditions of ElasticsearchHealthIndicatorAutoConfiguration
Closes gh-12249
2018-02-27 16:37:59 +01:00
Stephane Nicoll cb96bbd9be Polish
See https://github.com/micrometer-metrics/micrometer-docs/issues/14
2018-02-27 16:32:06 +01:00
Andy Wilkinson 0ba192dead Merge branch '1.5.x' 2018-02-27 14:47:13 +00:00
Andy Wilkinson 25c293b872 Start building against Spring Security 5.0.3 snapshots
See gh-12247
2018-02-27 14:32:23 +00:00
Andy Wilkinson b0d2cca172 Start building against Spring Kafka 2.1.4 snapshots
See gh-12246
2018-02-27 13:52:48 +00:00
Andy Wilkinson 0a81b0a142 Start building against Spring Data Kay SR5 snapshots
See gh-12234
2018-02-27 13:46:33 +00:00
Andy Wilkinson 7f615eaa6c Start building against Spring Integration 5.0.3 snapshots
See gh-12235
2018-02-27 13:44:15 +00:00
Andy Wilkinson 37a66349fe Fall back to application conversion service in BindConverter
Previously, if a user declared a custom conversionService bean that
was not an ApplicationConversionService instance, the binder lost
the ability to convert a String to a Duration (along with any other
conversions that are specific to ApplicationConversionService).

This commit updates BindConverter so that, if the ConversionService
with which it is created is not an ApplicationConversionService, it
will use one as an additional service when performing conversion.

Closes gh-12237
2018-02-27 13:12:48 +00:00
Andy Wilkinson 30f79f2fb1 Use application name as convention for distribution's base name
Closes gh-12232
2018-02-27 12:56:50 +00:00
Andy Wilkinson 60ac2e5c09 Reduce the amount of garbage produced by JarFile
Previously, working with a JarFile created a large amount of garbage
that was allocated on the thread local allocation buffer (TLAB).
The TLAB allocations made a significant contribution to GC pressure
and slowed down startup. This commit reduces the amount of garbage
by making a number of changes.

Reading from a RandomAccessDataFile has been reworked to avoid
creating new RandomAccessFile instances. A single RandomAccessFile
is now created for an entire jar file and it is used to read data from
anywhere in that jar file, including entries in nested jar files. To
ensure that reads remain thread-safe, a lock is taken on the
RandomAccessFile that is shared by all RandomAccessDataFile instances
that are provided access to (portions of) the same jar file.

Reading all of the bytes from a RandomAccessData has been reworked to
avoid the use of an InputStream that was created, used to read the
data, and then thrown away. In place of the InputStream-based
mechanism a method has been introduced that returns all of the
RandomAccessData as a byte[]. Building on this change, a method has
also been introduced to read a portion of a RandomAccessData as a
byte[]. This avoids the need to create a new RandomAccessData
subsection where the subsection was only used to read its entire
contents and then thrown away.

Decoding of an MS-DOS datetime has been reworked to use LocalDataTime
rather than GregorianCalendar. The former produces less garbage than
the latter.

Closes gh-12226
2018-02-27 10:48:15 +00:00
Stephane Nicoll 569bad16da Polish 2018-02-27 10:54:43 +01:00
Stephane Nicoll b4c901cab6 Merge branch '1.5.x' 2018-02-27 10:31:05 +01:00
Phillip Webb c0d79b9273 Rationalize multi-document config file handling
Update `PropertySourceLoader` so that it no longer needs to deal with
matching multi-document files using the `spring.profile` property. The
loader now simply returns one or more `PropertSource` instances for a
given `Resource`.

All property matching now occurs in the `ConfigFileApplicationListener`.
This allows document processing logic to be contained in a single place,
and allows us to rationalize the algorithm so that negative matching
profiles are processed last.

Fixes gh-12159
2018-02-26 23:30:09 -08:00
Phillip Webb 3d8f760ea0 Upgrade to reactor Bismuth-BUILD-SNAPSHOT
See gh-12233
2018-02-26 23:18:02 -08:00
Phillip Webb 145400505d Only validate target values on zero depth
Update `ValidationBindHandler` so that validation only occurs when a
value is bound, or the bind depth is zero. This prevents validation from
triggering getters which may throw an exception.

Fixes gh-12227
2018-02-26 23:08:45 -08:00
Phillip Webb 3244836003 Port Locale sensitive test from 1.5.x 2018-02-26 22:26:33 -08:00
Phillip Webb 29c3be3590 Polish 2018-02-26 10:26:02 -08:00
Stephane Nicoll 306c79f0de Merge branch '1.5.x' 2018-02-26 18:03:32 +01:00
Andy Wilkinson 219b2d8c1e Upgrade to AssertJ 3.9.1
Closes gh-12224
2018-02-26 15:50:07 +00:00
Andy Wilkinson 8d73ab088a Document new endpoint infrastructure
Closes gh-10001
2018-02-26 15:26:18 +00:00
Stephane Nicoll cd522dadcd Revert "Add Kafka health indicator"
Closes gh-12225
2018-02-26 15:46:35 +01:00
Kedar Joshi b189d88b94 Polish
Closes gh-12208
2018-02-26 09:42:17 +01:00
dreis2211 cbabf5414c Polish argument capturing in two Tomcat tests
Closes gh-12203
2018-02-26 09:35:39 +01:00
Johnny Lim dc715a352a Update doc to align with TomcatEmbeddedServletContainerFactory renaming
Closes gh-12215
2018-02-26 09:34:03 +01:00
Arnaud Heritier 6359642509 Fix dependency management of hibernate-validator-annotation-processor
Closes gh-12210
2018-02-25 11:03:20 +01:00
igor-suhorukov 98f4692c62 Polish
This commit changes invocations to immediately return the expression
instead of assigning it to a temporary variable. The method name should
be sufficient for callers to know exactly what will be returned.

Closes gh-12211
2018-02-25 10:59:02 +01:00
Andy Wilkinson c27fa7bf91 Polish ordering of version properties and managed dependencies 2018-02-24 20:19:15 +00:00
Stephane Nicoll 2641559231 Polish contribution
Closes gh-12202
2018-02-24 16:10:44 +01:00
dreis2211 e2fb093ccf Polish
See gh-12202
2018-02-24 16:09:38 +01:00
Johnny Lim d441a8a89a Polish
Closes gh-12205
2018-02-24 11:53:25 +01:00
Andy Wilkinson 1314678890 Nest @EnableWebFluxSecurity to avoid overzealous Wildfly warnings
Closes gh-12174
2018-02-23 20:50:20 +00:00
Andy Wilkinson 85c7ed2746 Merge branch '1.5.x' 2018-02-23 17:15:23 +00:00
Andy Wilkinson 73ad36d817 Merge branch '1.5.x' 2018-02-23 15:34:45 +00:00
Andy Wilkinson 782ab2803e Polish documentation regarding target class proxying
Closes gh-12196
2018-02-23 14:52:43 +00:00
Stephane Nicoll 9b61df6a2b Polish 2018-02-23 15:18:46 +01:00
Stephane Nicoll 13b736b1cd Migrate remaining duration-based properties for Rabbit
Closes gh-12192
2018-02-23 15:16:57 +01:00
Andy Wilkinson 48656d0d53 Fix build warnings about use of ${artifactId}
See gh-11994
2018-02-23 13:33:53 +00:00
Stephane Nicoll cb1eed42b8 Polish 2018-02-23 13:57:19 +01:00
Stephane Nicoll e1fd9df7b9 Fix usage of management.server.add-application-context-header
Closes gh-12190
2018-02-23 13:57:02 +01:00
Stephane Nicoll 976a23d977 Fix duration unit of spring.messages.cache-duration
Closes gh-12183
2018-02-23 13:38:20 +01:00
Stephane Nicoll 2b729bf114 Fix description of `checkpoint-interval`
See gh-12181
2018-02-23 13:03:08 +01:00
Stephane Nicoll 92d1c6126b Harmonize `accesslog.enabled` flag for Undertow
Closes gh-12178
2018-02-23 11:26:33 +01:00
Stephane Nicoll 09ff815f00 Harmonize metadata
Closes gh-12177
2018-02-23 11:02:28 +01:00
Phillip Webb f9da113943 Exclude FileEditor from binding conversion
Exclude `FileEditor` from the `BindConverter` since it uses slightly
unusual logic to create the file. Specifically, given a value of "."
the editor will locate a `ClassPathResource` then return `getFile()`
from that resource. For back-compatibility, binding should use the
simpler conversion service logic.

Fixes gh-12163
2018-02-22 22:01:37 -08:00
Phillip Webb 7e10d86ed3 Polish 2018-02-22 21:37:31 -08:00
Phillip Webb 3dea6fc645 Fix bind TypeConverter delegation with collections
Update `BindConverter` so that delegation to `SimpleTypeConverter` also
works with Collections and Arrays.

Prior to this commit, conversion that relied on a `PropertyEditor` would
only work for simple types. For example, "String -> Class<?>" would use
the `ClassEditor` but "String -> List<Class<?>>" would fail.

The `BindConverter` now uses a minimal `ConversionService` as an adapter
to the `SimpleTypeConverter`. This allows us to use the same delimited
string conversion logic as the `ApplicationConverter`.

Fixes gh-12166
2018-02-22 21:26:36 -08:00
Phillip Webb 4b9c3c137e Polish Collection.toArray
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
2018-02-22 21:11:30 -08:00
Johnny Lim 680287635c Rename TestRestTemplateTestContextCustomizer*
Closes gh-12182
2018-02-22 20:26:14 -08:00
Phillip Webb cd5266ac03 Polish 2018-02-22 20:25:28 -08:00
Andy Wilkinson 80ac4f85c9 Merge pull request #12172 from Raja Kolli
* gh-12172:
  Upgrade to JUnit Platform 1.1.0
2018-02-22 18:48:38 +00:00
Raja Kolli 8f2eea4dfd Upgrade to JUnit Platform 1.1.0
Closes gh-12172
2018-02-22 18:47:52 +00:00
Brian Clozel dcf61abe30 Fix Reactive Server auto-configuration ordering
This commit ensures that Tomcat is the first reactive server configured
if the Tomcat dependency is on classpath.

Spring Boot chose Reactor Netty as the default for the reactive web
starter, but the Reactor Netty dependency can be used also for its HTTP
client. In case developers are adding Tomcat, Undertow or Jetty on their
classpath, we must configure those and consider Reactor Netty for the
client only.

Fixes gh-12176
2018-02-22 18:04:53 +01:00
Stephane Nicoll 3fddfee65c Fix default value of endpoint's cache ttl
Closes gh-12173
2018-02-22 13:35:50 +01:00
Johnny Lim 2fe86da95b Use isTrue() and isFalse() for AssertJ
Closes gh-12170
2018-02-22 09:55:40 +01:00
Stephane Nicoll 865775e955 Fix statsd example
Closes gh-12162
2018-02-22 09:00:13 +01:00
Phillip Webb 5917a58bf1 Add Automatic-Module-Name to manifest file
Update build to add `Automatic-Module-Name` entry to the manifest file.
Also refined a few of the other entries that appear.

Fixes gh-11994
2018-02-21 16:03:13 -08:00
Johnny Lim 50c07d0772 Polish
Closes gh-12156
2018-02-21 17:46:57 +01:00
Stephane Nicoll 75505c78f5 Polish 2018-02-21 17:41:19 +01:00
Andy Wilkinson e7176c63f5 Stop DataSource initialization from preventing Hikari instrumentation
Closes gh-12129
2018-02-21 10:32:41 +00:00
Madhura Bhave 33be78a91e Add additional profile negation tests
Closes gh-8011
2018-02-21 01:57:03 -08:00
Phillip Webb 4bde6b80ee Refactor YAML profile to deal with "!" profiles
Drop `SpringProfileDocumentMatcher` and replace it with two new
implementations that restrict when YAML documents are loaded. YAML
sections are now restricted both on the specific profile that is being
loaded, and the profiles that are currently accepted.

The `PropertySourceLoader` interface has been refined to include a
predicate that determines when a profile is accepted. The
`ConfigFileApplicationListener` simply delegates the predicate logic to
the `Environment`.

Fixes gh-8011
2018-02-21 01:57:03 -08:00
Stephane Nicoll b03fd99209 Polish 2018-02-21 10:20:32 +01:00
Stephane Nicoll d7e000da53 Add missing JMX section 2018-02-21 10:19:41 +01:00
Johnny Lim 1bd94b3499 Remove an obsolete warning in doc
Closes gh-12150
2018-02-21 09:27:14 +01:00
Stephane Nicoll e7db69be7a Polish
See gh-11869
2018-02-21 07:39:40 +01:00
Phillip Webb 3076a5523a Fix checkstyle violation 2018-02-20 22:37:37 -08:00
Phillip Webb 8c24988faa Fix checkstyle violation 2018-02-20 22:02:02 -08:00
Phillip Webb 349987d9be Switch show details default to ShowDetails.NEVER
Closes gh-11869
2018-02-20 16:43:11 -08:00
Phillip Webb 46021928ba Rework common server customization
Update the configurable embedded web server factory interfaces to
extend `ConfigurableWebServerFactory` so that the can be used in a
`WebServerFactoryCustomizer`.

Extract server specific customization to their own auto-configuration
and align reactive/servlet server auto-configuration.

Closes gh-8573
2018-02-20 16:27:15 -08:00
Phillip Webb aafa1e9615 Rename MetricsIntegrationAutoConfiguration
Rename `MetricsIntegrationAutoConfiguration` to
`IntegrationMetricsAutoConfiguration`.

Closes gh-12147
2018-02-20 16:25:51 -08:00
Phillip Webb 0925a0957e Polish 2018-02-20 16:24:35 -08:00
Phillip Webb 8f5f0bda50 Upgrade to Spring Session Apple-SR1
Closes gh-12092
2018-02-20 16:08:13 -08:00
Phillip Webb fe1f0cf90e Upgrade to Micrometer 1.0.0
Closes gh-11877
2018-02-20 16:02:46 -08:00
Phillip Webb 3ec5f70c52 Upgrade to Spring Integration 5.0.2.RELEASE
Closes gh-12130
2018-02-20 15:55:40 -08:00
Phillip Webb 05faac2b09 Polish 2018-02-20 15:53:25 -08:00
Phillip Webb cdb5677375 Polish Binder constructor
Reinstate constructor signature used by Spring Cloud and improve
javadoc.

Closes gh-12095
2018-02-20 15:36:43 -08:00
Andy Wilkinson b5e2c5ec1c Polish 2018-02-20 19:58:39 +00:00
Stephane Nicoll a7cccac0d0 Remove deprecation note for property that was renamed in 2.0 2018-02-20 18:57:25 +01:00
Stephane Nicoll ce01a9145b Polish 2018-02-20 18:45:36 +01:00
Andy Wilkinson 8f699cd6f6 Use RoleVoter for role checks in ReactiveSecurityContext
See gh-11869
2018-02-20 17:11:57 +00:00
Andy Wilkinson ae45b6730b Apply ROLE_ prefix when needed in ReactiveSecurityContext isUserInRole
See gh-11869
2018-02-20 16:38:16 +00:00
Stephane Nicoll 20f104766b Add missing default values for enums 2018-02-20 17:33:32 +01:00
Andy Wilkinson daa280faff Drop AuthorityReactiveAuthorizationManager and avoid need to block
See gh-11869
2018-02-20 16:29:28 +00:00
Stephane Nicoll 45476961c1 Polish
See gh-12129
2018-02-20 17:02:03 +01:00
Andy Wilkinson 5e61b646fa Upgrade to Neo4j Ogm 3.1.0
Closes gh-12145
2018-02-20 15:52:56 +00:00
Andy Wilkinson 024a42a830 Upgrade to Mariadb 2.2.2
Closes gh-12144
2018-02-20 15:52:56 +00:00
Andy Wilkinson feb82b49f2 Upgrade to Johnzon Jsonb 1.1.6
Closes gh-12143
2018-02-20 15:52:56 +00:00
Andy Wilkinson ac69ec1f1b Upgrade to Junit Jupiter 5.1.0
Closes gh-12142
2018-02-20 15:52:56 +00:00
Stephane Nicoll 0492d53117 Polish 2018-02-20 16:52:15 +01:00
Andy Wilkinson e2315658e6 Merge branch '1.5.x' 2018-02-20 15:47:43 +00:00
Stephane Nicoll 6f59dd6b17 Polish "Update documentation to reference webjars-locator-core"
Closes gh-12135
2018-02-20 16:37:34 +01:00
Nikola Kološnjaji 4da4a4d385 Update documentation to reference webjars-locator-core
See gh-12135
2018-02-20 16:33:19 +01:00
Stephane Nicoll 0f75a9a9fe Rework Hikari metrics registration
This commits move the Hikari metrics registration to a BeanPostProcessor
as the Hikari datasource cannot be modified once its configuration has
been sealed (usually happens when `getConnection` is invoked on the
pool).

Closes gh-12129
2018-02-20 16:25:51 +01:00
Stephane Nicoll 1b8f0d06a7 Test that custom `ProtocolResolver` is invoked
See gh-11659
2018-02-20 14:45:51 +01:00
Stephane Nicoll 7c365bb253 Polish 2018-02-20 13:42:28 +01:00
Andy Wilkinson 87ef9a1d97 Polish 2018-02-20 12:37:24 +00:00
Stephane Nicoll 0a795b005e Add missing documentation
See gh-12129
2018-02-20 13:29:28 +01:00
Stephane Nicoll 784372e6b3 Polish "Auto-configure metrics for Hikari"
Closes gh-12129
2018-02-20 13:24:45 +01:00
Tommy Ludwig 05e1f22824 Auto-configure metrics for Hikari
HikariCP has metrics integration with Micrometer. This configures all
`HikariDataSource` beans with the `MicrometerMetricsTrackerFactory` if a
`MeterRegistry` is available.

See gh-12129
2018-02-20 13:22:42 +01:00
Andy Wilkinson 3e4baf744e Use role-based security to show details in the health endpoint
Closes gh-11869
2018-02-20 12:12:05 +00:00
Stephane Nicoll a5960bc0c3 Polish 2018-02-20 11:47:20 +01:00
Stephane Nicoll 44b7673ee6 Polish 2018-02-20 11:04:52 +01:00
Stephane Nicoll f19b43bacc Polish "Consistent prefix for datasource pool metrics"
Closes gh-12127
2018-02-20 10:07:00 +01:00
Jon Schneider 16867f866c Consistent prefix for datasource pool metrics
See gh-12127
2018-02-20 09:35:43 +01:00
Andy Wilkinson 8ffa146660 Upgrade to Spring Security 5.0.2.RELEASE
Closes gh-11870
2018-02-20 07:34:26 +00:00
Phillip Webb 20109e27be Add ApplicationConversionService and fix binder
Create a new `ApplicationConversionService` similar in design to the
DefaultFormattingConversionService from Spring Framework. The new
conversion service provides a central place for custom conversion logic
supported by Spring Boot.

Also replace the `BindingConversionService` with an internal
`BindConverter` class that now invokes the `SimpleTypeConverter`
directly. Binding for `@ConfigurationProperties` has been updated so
that any custom property editors registered with the BeanFactory can
be used.

Fixes gh-12095
2018-02-19 20:25:47 -08:00
Phillip Webb 61f44179cb Relocate XA wrapper types
Move `XADataSourceWrapper` to `jdb` and `XAConnectionFactoryWrapper` to
`jms` so that they are packaged in a similar way to the underlying XA
types.

Fixes gh-12061
2018-02-19 20:22:03 -08:00
igor-suhorukov fe023817c7 Polish static finals
Closes gh-12083
2018-02-19 20:10:58 -08:00
Johnny Lim 88b184ca23 Polish 2018-02-19 20:00:20 -08:00
Jon Schneider ec5ef0f246 Fix URI tag on RestTemplate requests based on URIs
Move leading slash logic from `MetricsClientHttpRequestInterceptor` to
`RestTemplateExchangeTags` so that URI based calls are also managed.

Closes gh-12126
2018-02-19 19:57:24 -08:00
Phillip Webb adf22d6e4a Polish 2018-02-19 19:54:10 -08:00
Andy Wilkinson 482ecc606c Polish 2018-02-19 22:46:31 +00:00
Andy Wilkinson 22bac1b54e Polish "Bind StatsD queue gauges"
Closes gh-12124
2018-02-19 21:24:24 +00:00
Jon Schneider 53e872bf4c Bind StatsD queue gauges
See gh-12124
2018-02-19 21:21:58 +00:00
Andy Wilkinson c7fafacb8d Upgrade to Spring Data Kay SR4
Closes gh-11884
2018-02-19 21:08:44 +00:00
Andy Wilkinson ce64f212b4 Upgrade to Reactor Bismuth SR 6
Closes gh-12085
2018-02-19 19:48:07 +00:00
Jon Schneider 9934285bca Remove destroy methods from auto-configured MeterRegistry beans
Closes gh-12121
2018-02-19 17:44:38 +00:00
Andy Wilkinson 73460a5b25 Use auto-configuration to create composite, not a BFPP
Closes gh-12122
2018-02-19 17:41:23 +00:00
Stephane Nicoll 1e932860c4 Specify default micrometer values
This commit adds micrometer's default values for each monitoring
system with tests that validate those defaults are consistent. This
makes sure that those defaults are part of the metadata and any tooling
support that uses it.

Closes gh-12089
2018-02-19 16:41:28 +01:00
Stephane Nicoll 202ed7b72b Polish 2018-02-19 16:20:56 +01:00
Andy Wilkinson 23905490d9 Upgrade to Mongo Driver Reactivestreams 1.7.1
Closes gh-12116
2018-02-19 14:59:46 +00:00
Andy Wilkinson 359ba0e96a Upgrade to Jooq 3.10.5
Closes gh-12115
2018-02-19 14:59:46 +00:00
Andy Wilkinson 4e2dc26d4c Upgrade to Infinispan 9.1.6.Final
Closes gh-12114
2018-02-19 14:59:46 +00:00
Andy Wilkinson 66a6181f18 Upgrade to Rxjava 1.3.6
Closes gh-12113
2018-02-19 14:59:46 +00:00
Stephane Nicoll cd0c81fe39 Restore prefix in ConditionalOnProperty 2018-02-19 15:46:39 +01:00
Andy Wilkinson c3a31fafe2 Remove tangle between actuate.endpoint and actuate.endpoint.invoke
See gh-11854
2018-02-19 13:04:23 +00:00
Stephane Nicoll 24e7a11222 Upgrade to Spring Framework 5.0.4
Closes gh-11894
2018-02-19 13:27:41 +01:00
Andy Wilkinson 990a0965f7 Upgrade to Lettuce 5.0.2
Closes gh-11870
2018-02-19 12:21:45 +00:00
Andy Wilkinson 39ece9a16f Merge branch '1.5.x' 2018-02-19 10:37:54 +00:00
Stephane Nicoll 6c85ed70e4 Polish "Add SignalFxConfig source property"
Closes gh-12066
2018-02-19 10:53:25 +01:00
Jon Schneider a732053afd Add SignalFxConfig source property
See gh-12066
2018-02-19 10:49:43 +01:00
Stephane Nicoll 1dab83adaa Polish "Restore behavior of management.metrics.export.simple.enabled"
Closes gh-12106
2018-02-19 10:44:09 +01:00
Jon Schneider da759f29d0 Restore behavior of management.metrics.export.simple.enabled
See gh-12106
2018-02-19 10:08:22 +01:00
Andy Wilkinson 19ce68d2d8 Prefix endpoint's path to controller endpoint mappings with no path
Previously, if a controll endpoint included a mapping with no path,
it would be mapped to the root of the application rather than the
root of the endpoint's path.

This commit updates the handler mappings for both reactive and Servlet
web applications to treat a mapping with no paths as being a mapping
with a single empty path. This ensures that a path with the endpoint's
path prepended is used for the mapping.

Closes gh-12104
2018-02-18 19:53:57 +00:00
Andy Wilkinson da5bebf574 Revert "Use Jersey BOM in dependency management"
This reverts commit da7bf05c87.

Closes gh-12103
2018-02-18 09:52:19 +00:00
Simon Braconnier 1a238bae29 Add JODConverter support
Closes gh-12098
2018-02-17 10:34:23 +01:00
Phillip Webb 1d83e87bcd Validate @ConfigurationProperties on @Bean methods
Refactor `ConfigurationPropertiesBindingPostProcessor` to allow JSR-303
validation on `@ConfigurationProperties` defined at the `@Bean` method
level.

JSR-303 validation is now applied when a JSR-303 implementation is
available and `@Validated` is present on either the configuration
properties class itself or the `@Bean` method that creates it.

Standard Spring validation is also supported using a validator bean
named `configurationPropertiesValidator`, or by having the configuration
properties implement `Validator`.

The commit also consolidates tests into a single location.

Fixes gh-10803
2018-02-16 18:11:54 -08:00
Phillip Webb 9e75680e6f Polish 2018-02-16 18:11:54 -08:00
Brian Clozel db7268b841 Fix TestRestTemplate request factory management
This commit fixes two issues in `TestRestTemplate`:

* it improves the detection of the underlying request factory, using
reflection to look inside the intercepting request factory if
interceptors were configured

* it avoids reusing the same request factory when creating a new
`TestRestTemplate` with `withBasicAuth`. Sharing the same instance would
result in sharing authentication state (HTTP cookies). Since the
original request factory can't be detected consistently, a new one is
selected automatically

See gh-8697
2018-02-16 22:36:20 +01:00
Madhura Bhave 51de220b55 Enable CSRF protection by default
Fixes gh-11758
2018-02-16 13:31:51 -08:00
Andy Wilkinson d1714a5c2a Upgrade to Hazelcast 3.9.3
Closes gh-12094
2018-02-16 20:32:14 +00:00
Andy Wilkinson c1c162ab0c Polish "Add auto-configuraton for exporting metrics to Wavefront"
Closes gh-12068
2018-02-16 20:30:31 +00:00
Jon Schneider 142dbb2213 Add auto-configuration for exporting metrics to Wavefront
See gh-12068
2018-02-16 20:00:45 +00:00
Andy Wilkinson 46eb88c299 Use Spring Session's bom for its dependency management
Closes gh-11853
2018-02-16 17:40:40 +00:00
Andy Wilkinson 17c7f027e0 Add details of the request mapping conditions to mappings endpoint
Closes gh-12080
2018-02-16 17:36:06 +00:00
Andy Wilkinson 2c19257d6d Add HandlerMethod and HandlerFunction details to mappings endpoint
Closes gh-11864
2018-02-16 17:08:47 +00:00
Brian Clozel 7ed4273fc3 Fix Redis Cache tests after key prefix changes
Update Redis Cache tests after changes in DATAREDIS-715.
2018-02-16 14:43:45 +01:00
Stephane Nicoll 99466e7fa6 Polish 2018-02-16 14:04:44 +01:00
Stephane Nicoll e2cb5349ba Merge micrometer docs
Closes gh-11930
2018-02-16 13:53:53 +01:00
Brian Clozel 03a6f97e76 TestRestTemplate should not override request factory
Previously `TestRestTemplate` would override the configured
`ClientHttpRequestFactory` if the Apache HTTP client library was on
classpath.

This commit fixes two issues:

1. The existing `ClientHttpRequestFactory` is overridden *only* if it is
using the Apache HTTP client variant, in order to wrap it with the
`TestRestTemplate` custom support

2. Calling `withBasicAuth` will no longer directly use the request
factory returned by the internal `RestTemplate`; if client interceptors
are configured, the request factory is wrapped with an
`InterceptingClientHttpRequestFactory`. If we don't unwrap it,
interceptors are copied/applied twice in the newly created
`TestRestTemplate` instance. For that, we need to use reflection as the
underlying request factory is not accessible directly.

Closes gh-8697
2018-02-16 12:29:47 +01:00
Andy Wilkinson 7872cda8c1 Try building against Spring Security 5.0.2 snapshots again
See gh-11870
2018-02-16 10:03:57 +00:00
Andy Wilkinson fe4c8f95ed Rename ReactiveWebServerAutoConfiguration
Closes gh-12086
2018-02-16 10:02:35 +00:00
Andy Wilkinson e72506c353 Protect TomcatMetrics auto-config against early MeterBinder init
Closes gh-11916
2018-02-16 09:07:12 +00:00
Andy Wilkinson 72740f6b59 Merge pull request #12082 from Vedran Pavic
* gh-12082:
  Use Jersey BOM in dependency management
2018-02-16 08:26:17 +00:00
Vedran Pavic da7bf05c87 Use Jersey BOM in dependency management
Closes gh-12082
2018-02-16 08:25:20 +00:00
Brian Clozel 7a97764539 Update to Reactor Bismuth SNAPSHOTs 2018-02-16 08:45:47 +01:00
Andy Wilkinson a8899feea3 Merge branch '1.5.x' 2018-02-15 16:23:17 +00:00
Andy Wilkinson 87953b32b1 Merge pull request #12073 from Sébastien Deleuze
* gh-12073:
  Polish "Add Kotlin support reference documentation"
  Add Kotlin support reference documentation
2018-02-15 15:56:46 +00:00
Andy Wilkinson d96c570664 Polish "Add Kotlin support reference documentation"
Closes gh-12073
2018-02-15 15:55:48 +00:00
sdeleuze 889a06b65b Add Kotlin support reference documentation
See gh-12073
2018-02-15 15:55:42 +00:00
Brian Clozel 0c1aac14a0 Move server.display-name configuration property
The `server.display-name` configuration property is used to configure
the application display name for Servlet-based applications.

This commit moves that property to:
`server.servlet.application-display-name` and keeps the same defaults.

Closes gh-8624
2018-02-15 15:28:28 +01:00