Commit Graph

3765 Commits

Author SHA1 Message Date
Andy Wilkinson 76849c12e5 Merge branch '2.0.x' 2018-10-04 15:56:11 +01:00
Andy Wilkinson cf24d18139 Explicity set permissions on files in lib of Boot distribution
Previously, only the permissions for the scripts in bin/ were set. The
permissions for the files in lib/ were not explicity set, leaving them
with the same permissions as the source files in Gradle's cache. This
has proven to be a little brittle when building in certain
environments, leading to test failures. It also assumes that the
file permissions in Gradle's cache will be appropriate for entries in
a distribution archive. That may not always be a reasonable assumption
to make.

To avoid the above-described problems, this commit updates the copy
spec that's used to add files to lib/ in the archive so that each
file uses 0644 for its permissions.

Closes gh-14158
2018-10-04 15:55:48 +01:00
Andy Wilkinson 4a222cb4e5 Polish "Log a warning when using fallback for pid and log locations"
Closes gh-14519
2018-10-04 15:21:05 +01:00
Andreas Gebhardt 3f894cbeeb Log a warning when using fallback for pid and log locations
See gh-14519
2018-10-04 15:19:48 +01:00
Stephane Nicoll 5d0e812afe Merge branch '2.0.x' 2018-10-04 15:53:26 +02:00
Stephane Nicoll 1b10d3fcbf Fix missing metadata for nested POJO
This commit fixes missing descriptions and default values when
applicable for `management.server.ssl`, `server.compression`,
`server.http2`, `server.servlet.jsp`, `server.servlet.session` and
`server.ssl`.

Those nested namespace are managed by a POJO that is declared outside
of the module of the target @ConfigurationProperties type using it. As
a result, the annotation processor has no access to the source model and
can't extract the description and the default value, if any.

This commit migrates the misleading field-level Javadoc to manual meta
data for the time being.

Closes gh-14669
2018-10-04 15:49:04 +02:00
Stephane Nicoll d445ed7560 Merge branch '2.0.x' 2018-10-04 12:24:14 +02:00
Roland Weisleder d2a063b26a Clarify Javadoc of ConditionalOn annotations
Closes gh-14681
2018-10-04 12:22:52 +02:00
Andy Wilkinson da7daece08 Tolerate Integer values for port properties
Closes gh-14682
2018-10-04 10:53:02 +01:00
Andy Wilkinson b473f2996d Polish 2018-10-04 10:39:07 +01:00
Andy Wilkinson b4638b82d0 Prevent ApplicationListener that depends on EMF from creating a cycle
Previously, when an EntityManagerFactory was being initialized
synchronously, the DataSourceSchemaCreatedEvent would be published
during its initialization. This meant that an application listener that
depends on the EntityManagerFactory would create a dependency cycle if
it was a potential recipient of the event.

For the synchronous case, this commit moves the publication of the
event so that it occurs after the initialisation of the entity manager
factory. This allows an application listener that is a potential
recipient of the DataSourceSchemaCreatedEvent to depend on the
EntityManagerFactory without creating a cycle.

Closes gh-14651
2018-10-03 17:29:54 +01:00
Andy Wilkinson 7cbee701cd Allow user-provided ExecuteListenerProvider to go after Boot's
Closes gh-14598
2018-10-03 16:56:50 +01:00
Brian Clozel 7e4b22d25e Upgrade to Spring Framework 5.1.1 SNAPSHOTs
See gh-14677
2018-10-03 17:18:17 +02:00
Stephane Nicoll 00e122c7ec Merge branch '2.0.x' 2018-10-03 14:39:15 +02:00
Stephane Nicoll b4c5aea152 Fix detection of WebApplicationType with context class
Closes gh-14589
2018-10-03 14:37:31 +02:00
Johnny Lim 335775892b Polish
See gh-14667
2018-10-03 13:57:18 +02:00
Stephane Nicoll b4a8ad06de Merge branch '2.0.x' 2018-10-03 13:40:28 +02:00
Janne Valkealahti 26345d3900 Polish docs
This commit replaces tabs to spaces in a yaml example for configuring
endpoint web exposure include.

Closes gh-14670
2018-10-03 13:39:20 +02:00
Stephane Nicoll 84c8f38368 Merge branch '2.0.x' 2018-10-03 11:15:55 +02:00
Stephane Nicoll b248afc808 Clarify conversion system in Appendix
Closes gh-14645
2018-10-03 11:15:09 +02:00
Stephane Nicoll 42e6126066 Merge branch '2.0.x' 2018-10-03 10:34:02 +02:00
Stephane Nicoll 135797c347 Remove useless prerequisites section
Closes gh-14668
2018-10-03 10:33:24 +02:00
dreis2211 e68b9e8322 Remove unnecessary parameters for String.substring
Closes gh-14661
2018-10-03 09:34:56 +02:00
Phillip Webb 7087f90f2d Merge branch '2.0.x' 2018-10-02 23:01:46 -07:00
Phillip Webb bd9500290e Defer HttpHandler initialization
Update `ReactiveWebServerApplicationContext` so that the `HttpHandler`
bean is not longer created from `onRefresh`, but is instead created
only when the server starts.

Prior to this commit, the WebFlux hander would cause early
initialization of several beans, including Jackson Modules.

Closes gh-14666
2018-10-02 22:57:09 -07:00
Phillip Webb 7f35f8a982 Fix ConfigurationPropertyName.equals
Fix a regression in `ConfigurationPropertyName.equals` that was causing
incorrect results.

Closes gh-14665
2018-10-02 14:00:22 -07:00
Phillip Webb aa6a58d24c Merge branch '2.0.x' 2018-10-02 14:00:13 -07:00
Phillip Webb 7afde2ba43 Add another ConfigurationPropertyName.equals test
Include an additional test to ensure that `.equals` works for names
starting with the same value.

See gh-14665
2018-10-02 13:58:31 -07:00
Phillip Webb d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00
Phillip Webb 42cb0effc4 Merge branch '2.0.x' 2018-10-02 10:30:33 -07:00
Phillip Webb 3ff20b2440 Restore import-control checkstyle
Restore checkstyle import control and fix a few violations in the
process.

Closes gh-14660
2018-10-02 10:30:14 -07:00
Andy Wilkinson fcc73c6d88 Polish "Fix shellcheck warnings in CLI's bash script"
Closes gh-11458
2018-10-02 16:45:58 +01:00
leogtzr 69b844cb13 Fix shellcheck warnings in CLI's bash script
See gh-11458
2018-10-02 16:45:58 +01:00
Stephane Nicoll aaecdfb527 Deprecate Cassandra properties that require a default constructor
Closes gh-14473
2018-10-02 17:43:59 +02:00
Stephane Nicoll 068040e227 Register SpringBeanContainer with default Hibernate setup
Closes gh-13717
2018-10-02 16:41:02 +02:00
Stephane Nicoll 7bf32290c6 Update description of the `logger-name` hint
Closes gh-14456
2018-10-02 15:05:50 +02:00
Stephane Nicoll 3f9c41df81 Merge branch '2.0.x' 2018-10-02 10:48:14 +02:00
Rodolpho Couto e30f693699 Add reference to valiktor-spring-boot-starter
Closes gh-14514
2018-10-02 10:47:26 +02:00
Phillip Webb 2add65fe15 Polish Neo4J BookmarkManager auto-configuration
Closes gh-14568
2018-10-01 10:34:10 -07:00
Michael J. Simons b7847d98a7 Auto-configure Neo4J BookmarkManager when possible
Add `Neo4jBookmarkManagementConfiguration` which provides an instance
of `BookmarkManager` if necessary and Caffeine cache is on the
classpath. Depending on the kind of application, the `BookmarkManager`
will be request scoped or singleton, as recommended by Spring Data
Neo4j.

See gh-14568
2018-10-01 10:29:17 -07:00
Phillip Webb 94b366bc16 Make assertable context interfaces configurable
Update `Assertable*ApplicationContext` interfaces so that they also
extend the appropriate `Configurable*ApplicationContext` interface.

Closes gh-14650
2018-10-01 10:27:39 -07:00
Johnny Lim b079eeff1a Polish
Closes gh-14621
2018-10-01 10:51:13 -04:00
Stephane Nicoll 2d36a6f952 Merge branch '2.0.x' 2018-10-01 10:50:58 -04:00
Johnny Lim 1eca492c5e Polish
See gh-14621
2018-10-01 10:46:27 -04:00
Andy Wilkinson 121aad8397 Merge branch '2.0.x' 2018-10-01 15:39:15 +01:00
Andy Wilkinson da1fde6a5f Merge branch '1.5.x' into 2.0.x 2018-10-01 15:38:53 +01:00
Andy Wilkinson d145fab7e5 Merge branch '2.0.x' 2018-10-01 15:14:53 +01:00
Andy Wilkinson fd10226c54 Merge branch '1.5.x' into 2.0.x 2018-10-01 15:14:45 +01:00
Andy Wilkinson 9735774b4a Merge branch '2.0.x' 2018-10-01 14:28:16 +01:00
Andy Wilkinson 62b481c7db Merge branch '1.5.x' into 2.0.x 2018-10-01 14:28:09 +01:00
Andy Wilkinson 726579a910 Merge branch '2.0.x' 2018-10-01 14:01:38 +01:00
Andy Wilkinson 89f5cfc5a4 Merge branch '1.5.x' into 2.0.x 2018-10-01 13:51:55 +01:00
Johnny Lim 1e756db966 Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
Closes gh-14637
2018-09-30 17:47:18 -04:00
Andy Wilkinson 285f6bfd5f Merge branch '2.0.x' 2018-09-27 06:59:37 -04:00
jnizet eee07a840f Move away from deprecated Gradle configurations
Closes gh-14593
2018-09-27 06:58:31 -04:00
Johnny Lim 698bbd6a9e Polish
Closes gh-14597
2018-09-26 11:45:21 -04:00
Stephane Nicoll c403ac9db6 Merge branch '2.0.x' 2018-09-26 11:43:59 -04:00
Stephane Nicoll b6e5103dc4 Polish contribution
Closes gh-14592
2018-09-26 11:43:19 -04:00
Marten Deinum 77afe76ed5 Polish
The SpringBootContextLoader still checked if tests were annotated with
@IntegrationTest or @WebIntegrationTest. Those classes have been
removed in Spring Boot 1.5 and been deprecated since 1.4.

This commit removes the check on the annotations as well as the static
list of names.

See gh-14592
2018-09-26 11:41:25 -04:00
Andy Wilkinson f88ebf75cd Use Mongo 3.5.5 by default with Embedded mongo
Closes gh-14476
2018-09-25 16:44:38 -04:00
Andy Wilkinson 1a8f519922 Raise the default version of Mongo to 3.6.5 when using Embedded Mongo
While MongoDB 3.6.7 has been released, 3.6.5 is the latest version that's supported
by the version of Embedded Mongo that we're currently using.

Closes gh-14476
2018-09-25 15:19:34 -04:00
Hanope e5ed5ebf8b Fix "Query Parameters" section name
Closes gh-14600
2018-09-25 14:24:34 -04:00
Phillip Webb 64627fa9d6 Restore Maven 3.3 compatibility
Downgrade the `spring-boot-maven-plugin` maven version to 3.3.

Closes gh-14464
2018-09-24 15:40:25 -04:00
Phillip Webb a04e913c22 Make ResourceHandlerRegistrationCustomizer public
Make `ResourceHandlerRegistrationCustomizer` a public top level class.

Closes gh-14587
2018-09-24 10:20:25 -04:00
Phillip Webb ff98ba0fa5 Allow early OnWebApplication filtering
Update `OnWebApplicationCondition` to be an
`AutoConfigurationImportFilter` and filter out classes early.

Closes gh-13328
2018-09-24 09:46:30 -04:00
Phillip Webb 75bde00334 Generate auto-configuration OnWebApplication data
Update the auto-configuration annotation processor to generate
properties for `@OnWebApplication`.

See gh-13328
2018-09-24 09:46:26 -04:00
Phillip Webb c2f8398c06 Allow early OnBeanCondition filtering
Update `OnBeanCondition` to be an `AutoConfigurationImportFilter` and
filter out classes early.

See gh-13328
2018-09-24 09:45:49 -04:00
Phillip Webb 586507c49a Generate auto-configuration OnBean data
Update the auto-configuration annotation processor to generate
properties for `@ConditionalOnBean` and `@ConditionalOnSingleCandidate`.

See gh-13328
2018-09-24 09:45:46 -04:00
Phillip Webb e4f54a45be Add AutoConfigurationImportFilter base classes
Add `FilteringSpringBootCondition` base class and refactor the existing
`OnClassCondition` to use it. Also update the `match` method so that
the `autoConfigurationClasses` array may include `null` elements.

See gh-13328
2018-09-24 09:45:05 -04:00
Stephane Nicoll 5765ed00e8 Polish 2018-09-24 10:53:22 +02:00
Stephane Nicoll 19779951a1 Handle class not found
See gh-14575
2018-09-24 10:23:59 +02:00
Brian Clozel 0f11e69ca3 Upgrade to Micrometer 1.1.0-m.1
Closes #14567
2018-09-24 07:02:10 +02:00
Phillip Webb 84e72193b3 Remove automatic devtools web debug logging
Rework `DevToolsPropertyDefaultsPostProcessor` so that web logging no
longer defaults to `DEBUG`. The post processor now logs an info hint
to suggest the user configure the logging themselves.

Closes gh-14575
2018-09-23 08:44:34 -07:00
Andy Wilkinson 6e00d13d68 Polish 2018-09-23 15:53:14 +01:00
Andy Wilkinson 4c3e2d10d1 Auto-configure Micrometer's Elastic registry
Closes gh-14523
2018-09-23 15:52:29 +01:00
Andy Wilkinson 95ecbc736b Update example for disk space health indicator to use DataSize
See gh-14549
2018-09-23 12:05:57 +01:00
Stephane Nicoll 6145b3d278 Polish 2018-09-23 10:56:40 +02:00
Stephane Nicoll 831b0d7bdd Merge branch '2.0.x' 2018-09-23 10:49:17 +02:00
Stephane Nicoll 885948ce3b Polish 2018-09-23 10:47:09 +02:00
Stephane Nicoll da59d5c6d9 Polish 2018-09-23 10:11:19 +02:00
Stephane Nicoll 47f9379305 Adapt to changes in latest Micrometer snapshot
See gh-14522
2018-09-22 20:02:28 +02:00
Johnny Lim 3dc78d19bf Add log messages to lines only when the destination isn't set
Closes gh-14565
2018-09-22 19:33:58 +02:00
Johnny Lim f1552029ea Add @since in ApplicationContextInitializedEvent
Closes gh-14579
2018-09-22 19:32:40 +02:00
Stephane Nicoll 92afd041b0 Merge branch '2.0.x' 2018-09-22 19:31:45 +02:00
artsiom 7fb13d0dc2 Fix WebSocket web server customizer bean names
Closes gh-14582
2018-09-22 19:29:48 +02:00
Andy Wilkinson 8e9a93e5f3 Align SessionAutoConfigurationRedisTests with changes in Bean-RC1
See gh-14573
2018-09-22 14:57:43 +01:00
Andy Wilkinson 86c2b4a335 Upgrade to Spring Batch 4.1.0.RC1
Closes gh-14577
2018-09-22 08:24:17 +01:00
Andy Wilkinson d4942a11a8 Upgrade to Spring Session Bean-RC1
Closes gh-14573
2018-09-22 08:23:48 +01:00
Andy Wilkinson 977f8b4479 Auto-configure Micrometer's Kafka consumer metrics
Closes gh-14525
2018-09-21 19:56:29 +01:00
Andy Wilkinson 5196e138fa Upgrade to Spring Integration 5.1.0.RC1
Closes gh-14572
2018-09-21 19:22:33 +01:00
Andy Wilkinson 06d05684e5 Upgrade to Spring Kafka 2.2.0.RC1
Closes gh-14491
2018-09-21 19:22:33 +01:00
Andy Wilkinson 5d0a1ee0da Upgrade to Spring AMQP 2.1.0.RC1
Closes gh-14574
2018-09-21 19:22:33 +01:00
Andy Wilkinson ce75a585b1 Make spring-data-jdbc available to javadoc generation
See gh-14489
2018-09-21 19:14:22 +01:00
Andy Wilkinson cce693f708 Upgrade to Spring Security 5.1.0.RELEASE
Closes gh-14571
2018-09-21 16:40:29 +01:00
Andy Wilkinson ade79f7ded Fix duplicate section ID in the docs 2018-09-21 16:07:24 +01:00
Stephane Nicoll 9d46fee6db Merge branch '2.0.x' 2018-09-21 16:47:33 +02:00
Gary Russell 26c1e389df Polish RabbitMQ properties doc
Fix description for `prefetch`; remove reference to transactions since
the direct container does not support transactionSize.

Also fix `transactionSize` to just reference acks; autoConfiguration
doesn't support enabling transactions.

Closes gh-14569
2018-09-21 16:46:12 +02:00
Stephane Nicoll cbae22f0c9 Polish "Migrate size properties to DataSize"
Closes gh-14549
2018-09-21 16:27:28 +02:00
qct eb9f635004 Migrate size properties to DataSize
See gh-14549
2018-09-21 16:01:55 +02:00
Andy Wilkinson def02deaf0 Make micrometer-registry-dynatrace available to javadoc generation
See gh-14522
2018-09-21 14:46:43 +01:00
Andy Wilkinson 258c4838b1 Auto-configure Micrometer's Log4j2 metrics
Closes gh-14524
2018-09-21 14:45:20 +01:00
Andy Wilkinson 0f7897a0ca Upgrade to Spring Data Lovelace-RELEASE
Closes gh-14510
2018-09-21 14:22:11 +01:00
Andy Wilkinson 4b00dc8a5c Add support for Spring Data JDBC (auto-config, starter, and test slice)
Closes gh-14489
2018-09-21 14:18:52 +01:00
Andy Wilkinson fe75f966ff Auto-configure Micrometer's Dynatrace meter registry
Closes gh-14522
2018-09-21 13:11:33 +01:00
Andy Wilkinson 42abf733be Start building against snapshots for Micrometer 1.1.0 M1
See gh-14567
2018-09-21 11:56:00 +01:00
Stephane Nicoll 61858767ed Merge branch '2.0.x' 2018-09-21 11:49:35 +02:00
Stephane Nicoll 5506d972c6 Polish "Fix and improve Neo4j related documentation"
Closes gh-14548
2018-09-21 11:44:50 +02:00
Michael J. Simons 8a53adf3d2 Fix and improve Neo4j related documentation
See gh-14548
2018-09-21 11:44:32 +02:00
Stephane Nicoll f3c637f5c2 Upgrade to Spring Framwork 5.1.0.RELEASE
Closes gh-14481
2018-09-21 10:57:48 +02:00
Stephane Nicoll f1a38c461f Merge branch '2.0.x' 2018-09-21 10:00:22 +02:00
Stephane Nicoll 8cce5d3f64 Polish "Add dependency management for Neo4J OGM embedded driver"
Closes gh-14560
2018-09-21 09:59:18 +02:00
Michael J. Simons ad449e9520 Add dependency management for Neo4J OGM embedded driver
See gh-14560
2018-09-21 09:56:33 +02:00
Phillip Webb 11b1318cad Reduce GC pressure in JAR handler
Update the JAR `Hander` so that URL `startsWith` checks produce less
garbage. Comparisons are now performed first on the `path` rather than
the full `toString`. URL `toString` operations produce quite a lot of
garbage since a `StringBuilder` is always used.

In addition, we now also cache the JarFile URL toString to save repeated
calculation.

Closes gh-14561
2018-09-20 22:33:19 -07:00
Phillip Webb d0de4657d4 Reduce ConfigurationPropertyName GC pressure
Rewrite `ConfigurationPropertyName` in an attempt to consume less memory
and to reduce GC pressure from `toString()`.

Prior to this commit the `toString()` method would always construct a
new value from the name elements. This is sub-optimal since on on many
occasions the `ConfigurationPropertyName` is created from an already
well-formed String. The updated code now attempts to directly use the
original value for both `toString` and `equals` whenever possible.

Further refinements have also been made to the way that elements are
stored. Rather than a list or objects, we now use arrays that contains
the split points and types. This helps to reduce the amount of memory
required to store the name.

Closes gh-13414
2018-09-20 22:27:06 -07:00
Phillip Webb 0a187675b5 Reduce GC in SpringConfigurationPropertySource
Update `SpringConfigurationPropertySource` so that the
`DelegatingPropertyMapper` accepts a maximum of two values and does
not need to wrap arguments in an array. Also optimize the merge
operation to return a single result directly rather than always using
a new `List`.

Closes gh-14563
2018-09-20 22:21:18 -07:00
Phillip Webb 2bc3d8d01f Use shared BindConverter when possible
Update the `Binder` so that a single shares static `BindConverter` is
used whenever possible.

Closes gh-14562
2018-09-20 22:15:31 -07:00
Phillip Webb 865b7ae47f Reduce object creation when binding
Use static finals and private instances to reduce the number of objects
created when binding from the `ConfigFileApplicationListener`.

Closes gh-13436
2018-09-20 22:14:47 -07:00
Phillip Webb 624cd40598 Reduce GC pressure creating load descriptions
Update `ConfigFileApplicationListener` to build description methods
using a `StringBuilder` and not to use `String.format`.

See gh-13436
2018-09-20 22:13:09 -07:00
Andy Wilkinson 426ff3ada7 Store ObjectProvider rather than their Streams to allow reuse
Generally speaking, methods on configuration classes will only be called once
and, therefore, it should be safe to hold a reference to a Stream for later
one-time usage. However, there are some scenarios in Spring Fu where functional
registration results in an attempt being made to use a Stream more than use.

This commit protects against multiple use by storing the ObjectProvider and
getting a new ordered Stream each time it's needed.

Closes gh-14467
2018-09-20 16:16:42 +01:00
Andy Wilkinson cc6cf880cf Stop using ObjectProvider<List> and ObjectProvider<Collection>
Closes gh-14467
2018-09-20 13:19:40 +01:00
Stephane Nicoll 5323095e44 Fix broken build 2018-09-20 13:32:41 +02:00
Stephane Nicoll 22e77e02b6 Polish "Add support for SAP Hana Database"
Closes gh-14513
2018-09-20 12:02:55 +02:00
Michael cea95c303f Add support for SAP Hana Database
See gh-14513
2018-09-20 11:56:17 +02:00
Stephane Nicoll cd45343d41 Upgrade to Maven Shade Plugin 3.2.0
Closes gh-14546
2018-09-20 11:45:36 +02:00
Stephane Nicoll 90f4da0dac Upgrade to Mongo Driver Reactivestreams 1.9.2
Closes gh-14545
2018-09-20 11:45:35 +02:00
Stephane Nicoll 8b2bf3e0d9 Upgrade to Mongodb 3.8.2
Closes gh-14544
2018-09-20 11:45:34 +02:00
Stephane Nicoll 2a2f1e4023 Upgrade to Jooq 3.11.5
Closes gh-14543
2018-09-20 11:45:34 +02:00
Stephane Nicoll fd8c074371 Upgrade to Kotlin 1.2.70
Closes gh-14542
2018-09-20 11:45:33 +02:00
Stephane Nicoll ad340d253c Upgrade to Influxdb Java 2.13
Closes gh-14541
2018-09-20 11:45:32 +02:00
Stephane Nicoll 705ac1b4f3 Upgrade to Elasticsearch 6.4.1
Closes gh-14540
2018-09-20 11:45:32 +02:00
Stephane Nicoll a176e64ad8 Upgrade to Htmlunit 2.33
Closes gh-14539
2018-09-20 11:45:31 +02:00
Stephane Nicoll 310d6a5c79 Upgrade to Lettuce 5.1.0.RELEASE
Closes gh-14538
2018-09-20 11:45:30 +02:00
Stephane Nicoll 1ce6fdeeb8 Upgrade to Hazelcast 3.10.5
Closes gh-14537
2018-09-20 11:45:29 +02:00
Stephane Nicoll a376ebafd3 Merge branch '2.0.x' 2018-09-20 11:39:13 +02:00
Stephane Nicoll 63d276da58 Upgrade to Neo4j Ogm 3.1.3
Closes gh-14536
2018-09-20 11:37:13 +02:00
Stephane Nicoll 75c893164e Upgrade to Hibernate Validator 6.0.13.Final
Closes gh-14535
2018-09-20 11:37:12 +02:00
Stephane Nicoll 5cac8ac70b Upgrade to Elasticsearch 5.6.12
Closes gh-14534
2018-09-20 11:37:12 +02:00
Stephane Nicoll 0143cb6193 Upgrade to Janino 3.0.10
Closes gh-14533
2018-09-20 11:37:11 +02:00
Stephane Nicoll f49f407b99 Upgrade to Johnzon Jsonb 1.1.10
Closes gh-14532
2018-09-20 11:37:10 +02:00
Stephane Nicoll 59ecfea104 Upgrade to Unboundid Ldapsdk 4.0.8
Closes gh-14531
2018-09-20 11:37:09 +02:00
Stephane Nicoll 380696de58 Upgrade to Jackson 2.9.7
Closes gh-14530
2018-09-20 11:37:09 +02:00
Stephane Nicoll 8652f40781 Allow Quartz property to set the scheduler name
This commit makes sure that "org.quartz.scheduler.instanceName" is
honoured if set. Previously, "spring.quartz.scheduler-name" had a
default value and was always set. As a result, `SchedulerFactoryBean`
did not take the quartz property into account.

Closes gh-14243
2018-09-20 11:27:57 +02:00
Stephane Nicoll 9bca95e499 Upgrade to Reactor Californium RELEASE
Closes gh-14507
2018-09-20 10:47:19 +02:00
Stephane Nicoll 1e7c236589 Merge branch '2.0.x' 2018-09-20 10:46:01 +02:00
Stephane Nicoll 8aece088a4 Upgrade to Spring Web Services 3.0.4.RELEASE
Closes gh-14526
2018-09-20 10:43:52 +02:00
Stephane Nicoll ac2fefb6c3 Merge branch '2.0.x' 2018-09-20 10:25:20 +02:00
Stephane Nicoll 957321492f Merge branch '1.5.x' into 2.0.x 2018-09-20 10:24:57 +02:00
Johnny Lim 521f746151 Polish
Closes gh-14517
2018-09-20 09:51:10 +02:00
Andy Wilkinson efae363974 Register functional rather than reflective bean definitions where possible
Closes gh-14516
2018-09-19 19:59:09 +01:00
Andy Wilkinson 65295e0e14 Merge branch '2.0.x' 2018-09-19 19:52:19 +01:00
Andy Wilkinson bff93a67ce Fix remote DevTools restart when a previously added class is then changed
Previously, if a class was added and then changed, a restart would be triggered
and things would behave as if the class had been deleted. This occurred
because, when looking for additional classes that were not on the original
classpath, only files that had been added were considered. The subsequent
change to the class was noticed as a modified rather than an addition,
resulting in the class being skipped.

This commit updates the resource resolver to only ignore deleted files and
consider both added files and modified files when looking for additional
resources.

Closes gh-14205
2018-09-19 18:02:01 +01:00
Johnny Lim fd97f07209 Use meaningful name for MockServerConfigurer bean
Closes gh-14512
2018-09-19 15:31:38 +02:00
Andy Wilkinson 6164c9e8b6 Start building against Spring Data Lovelace snapshots
See gh-14510
2018-09-19 14:21:20 +01:00
Stephane Nicoll ce60f82998 Merge branch '2.0.x' 2018-09-19 12:09:29 +02:00
Marcel Overdijk 0870f23902 Fix dependency management for Caffeine
Closes gh-14505
2018-09-19 12:04:49 +02:00
yongsungjeon 11864f2bb6 Use constant for produces attribute
Closes gh-14501
2018-09-19 11:38:29 +02:00
Stephane Nicoll 36d22c8541 Merge branch '2.0.x' 2018-09-19 11:34:39 +02:00
DK Lee 01cf52447c Fix typo in WebClient example
Closes gh-14499
2018-09-19 11:34:04 +02:00
Stephane Nicoll 390fc03769 Polish "Add reference to ssh shell spring boot starter"
Closes gh-14496
2018-09-19 11:27:26 +02:00
François Onimus b416a46674 Add reference to ssh shell spring boot starter
See gh-14496
2018-09-19 11:26:08 +02:00
Stephane Nicoll f42891489d Polish key description
Closes gh-14450
2018-09-19 10:31:01 +02:00
Johnny Lim d0a252181b Polish
Closes gh-14449
2018-09-19 09:58:31 +02:00
Brian Clozel 1b7325df52 Switch to Reactor Californium SNAPSHOTs
See gh-14507
2018-09-18 19:35:04 +02:00
Andy Wilkinson c974192497 Polish "Add outcome tag to MVC and WebFlux HTTP request metrics"
Closes gh-14486
2018-09-18 12:30:28 +01:00
Michael McFadyen 9e9dd40959 Add outcome tag to MVC and WebFlux HTTP request metrics
See gh-14486
2018-09-18 12:00:12 +01:00
Andy Wilkinson 6da483f970 Merge branch '2.0.x' 2018-09-18 11:59:52 +01:00
Andy Wilkinson 6fba477d5e Remove redundant handling of a null exchange from WebFluxTags.uri()
Closes gh-14504
2018-09-18 11:59:19 +01:00
Andy Wilkinson eefa7e9f78 Merge branch '2.0.x' 2018-09-18 11:30:44 +01:00
Andy Wilkinson 6020cb67d3 Polish javadoc of status method on WebFluxTags and WebMvcTags 2018-09-18 11:30:35 +01:00
Andy Wilkinson c1b864c826 Polish 2018-09-18 11:18:28 +01:00
Madhura Bhave 9201e23f67 Revert "Raised the default version of Mongo to 3.6.5 when using Embedded Mongo."
This reverts commit 1a4ad96dd0. Reverting
to see if this fixes CI timeouts.
2018-09-17 15:25:54 -07:00
Madhura Bhave b2dd162572 Merge branch '2.0.x' 2018-09-17 14:30:38 -07:00
Madhura Bhave d7d5cbf959 Simplify printing ConditionEvaluationReport when using context runner
Closes gh-13119
2018-09-17 14:23:47 -07:00
Andy Wilkinson e1328f05e7 Merge branch '2.0.x' 2018-09-17 15:55:35 +01:00
Andy Wilkinson fc60d9f6d4 Merge branch '1.5.x' into 2.0.x 2018-09-17 15:50:12 +01:00
Gary Russell 19cea75e74 Start building against Spring Kafka 2.2.0 snapshots
See gh-14491
Closes gh-14420
2018-09-17 12:35:37 +01:00
Andy Wilkinson 1a4ad96dd0 Raised the default version of Mongo to 3.6.5 when using Embedded Mongo.
While MongoDB 3.6.7 has been released, 3.6.5 is the latest version that's supported
by the version of Embedded Mongo that we're currently using.

Closes gh-14476
2018-09-17 12:29:48 +01:00
Andy Wilkinson a1d1a7392f Polish "Use ExecutorProvider bean if available when auto-configuring jOOQ"
Closes gh-14471
2018-09-17 11:20:45 +01:00
davinkevin 620419f9e4 Use ExecutorProvider bean if available when auto-configuring jOOQ
See gh-14471
2018-09-17 11:15:47 +01:00
durigon 7aaeefbc0e Use Matcher from pre-compiled Pattern rather than String for replaceAll
Closes gh-14483
2018-09-17 10:54:54 +01:00
Andy Wilkinson 5e0e941632 Polish "Publish ApplicationContextInitializedEvent on contextPrepared"
Closes gh-14478
2018-09-17 10:50:28 +01:00
artsiom b4c6cef526 Publish ApplicationContextInitializedEvent on contextPrepared
See gh-14478
2018-09-17 10:43:12 +01:00
Phillip Webb d127d071fd Ensure classpath resource are also filtered
Update `ExtendedGroovyClassLoader` to also filter resources.

Closes gh-14482
2018-09-15 18:03:53 -07:00
Phillip Webb 99908fdfe7 Polish 2018-09-15 18:03:53 -07:00
Phillip Webb 5cc1a830b2 Fixup abstract configuration following SPR-16839
Spring Framework now requires that all nested configuration classes
are contained within a `@Component` class (see SPR-16839). This means
that our abstract `JpaBaseConfiguration` class should have a
`@Configuration` annotation.

Closes gh-14480
2018-09-15 18:03:53 -07:00
Phillip Webb 0f653e69cd Start building against Spring Framework SNAPSHOTs
See gh-14481
2018-09-15 18:03:52 -07:00
Madhura Bhave d5a197fe66 Support random actuator port in SpringBootTest
This commit changes @SpringBootTest(randomPort = true) to
generate a random port for the actuator endpoints if the
management server runs on a different port from the main
server.

Closes gh-4424
2018-09-14 15:42:08 -07:00
Madhura Bhave 01e61d88e7 Merge branch '2.0.x' 2018-09-14 11:48:37 -07:00
Madhura Bhave 5708792d82 Merge branch '1.5.x' into 2.0.x 2018-09-14 11:43:33 -07:00
Madhura Bhave d9efca146e Merge branch '2.0.x' 2018-09-14 11:21:31 -07:00
Madhura Bhave 09ccf875b7 Merge branch '1.5.x' into 2.0.x 2018-09-14 11:17:59 -07:00
Madhura Bhave 1113c356dc ReactiveOAuth2ClientAutoConfiguration backs off for servlet env
Fixes gh-14463
2018-09-13 12:39:18 -07:00
Phillip Webb d4b11c8fa6 Attempt to fix test failures on Java 9+
See gh-14453
2018-09-12 18:31:50 -07:00
Phillip Webb cef635d86c Reinstate devtools debug logging with opt-out
Reinstate `web` logging when devtools is in use, making use of the new
logging groups support. Devtools now also logs an `INFO` message
informing that properties defaults are offers an easy way to disable
them.

Closes gh-14450
2018-09-12 16:25:14 -07:00
Phillip Webb c4caf2705a Defer devtools logging
Defer logging from devtools classes until the context is prepared.

Closes gh-14453
2018-09-12 16:25:14 -07:00
Phillip Webb bc92becfd8 Allow DeferredLogger to replay and switch loggers
Add additional `switchTo` methods to allow a `DeferredLogger` to behave
like a regular logger once it has been replayed.

This commit also improves thread thread safety within the implementation.

Closes gh-14452
2018-09-12 16:25:14 -07:00
Phillip Webb b32887b8eb Add support for logging groups
Provide a way for users to quickly group related loggers together for
easier configuration. The `loggers.group` property can be used to define
a group that can then be configured in the usual `loggers.level.<group>`
way.

Additionally, provide pre-defined groups for `web` and `sql.

Closes gh-14421
2018-09-12 16:25:14 -07:00
Andy Wilkinson 5bc56671cb Upgrade to Jest 6.3.1
Closes gh-14429
2018-09-12 17:48:54 +01:00
Andy Wilkinson a2cf2cd87f Raise the minimum supported version of Gradle to 4.4
Closes gh-14418
2018-09-12 17:06:03 +01:00
Andy Wilkinson ae4e1d0372 Test the Gradle plugin against Gradle 4.10
Closes gh-14417
2018-09-12 12:57:27 +01:00
Andy Wilkinson 630e2d0b41 Correct the permissions of scripts in archives of boot distribution
Closes gh-14158
2018-09-12 12:57:27 +01:00
Phillip Webb f99df98588 Unify maven-shade-plugin version in parent POM
Closes gh-14440
2018-09-11 22:49:36 -07:00
Phillip Webb 670d9bd6f8 Upgrade to classmate 1.4.0
Closes gh-14424
2018-09-11 22:49:35 -07:00
Phillip Webb b41e135713 Upgrade to mockito-kotlin 1.6.0
Closes gh-14426
2018-09-11 22:49:35 -07:00
Phillip Webb f0bfcd8947 Drop okhttp 2.x managed dependency
Closes gh-14442
2018-09-11 22:49:35 -07:00
Phillip Webb 9beab013f9 Upgrade to okhttp 3.11.0
Closes gh-14427
2018-09-11 22:49:35 -07:00
Phillip Webb 372fee11f5 Upgrade to JOpt Simple 5.0.4
Closes gh-14430
2018-09-11 22:49:34 -07:00
Phillip Webb 83a2031934 Upgrade to Commons Compress 1.18
Closes gh-14431
2018-09-11 22:36:13 -07:00
Phillip Webb 4adceec45f Upgrade to Ivy 2.4.0
Closes gh-14432
2018-09-11 22:36:13 -07:00
Phillip Webb 6e64ae0921 Upgrade to maven-archiver 3.2.0
Closes gh-14433
2018-09-11 22:36:12 -07:00
Phillip Webb e00a254729 Upgrade to maven-plugin-annotations 3.5.2
Closes gh-14434
2018-09-11 22:36:11 -07:00
Phillip Webb 8b16630a49 Upgrade to sisu-inject-plexus 2.6.0
Closes gh-14435
2018-09-11 22:36:11 -07:00
Phillip Webb abd08418c0 Upgrade to testcontainers 1.8.3
Closes gh-14436
2018-09-11 22:36:11 -07:00
Phillip Webb 3f8a5fd2e3 Upgrade to zt-zip 1.13
Closes gh-14437
2018-09-11 22:36:10 -07:00
Phillip Webb d5ba03c2ae Upgrade to maven-common-artifact-filters 3.0.1
Closes gh-14441
2018-09-11 22:36:10 -07:00
Phillip Webb c6398d3eef Polish 2018-09-11 22:36:06 -07:00
Phillip Webb bb19d5690c Fix spring-boot-actuator-autoconfigure test logs
Add log4j to `spring-boot-actuator-autoconfigure` test scope so that
we get valid log output.

See gh-14148
2018-09-11 20:13:27 -07:00
Phillip Webb 894e0e11d4 Switch from Aether to Maven Resolver
Replace Aether dependencies with Maven Resolver following the Eclipse
EOL announcement for Aether.

Closes gh-7627
2018-09-11 18:08:59 -07:00
Phillip Webb 1f9754fc81 Upgrade to plexus-archiver to 3.6.0
Closes gh-14411
2018-09-11 18:08:59 -07:00
Phillip Webb 59e210642b Upgrade plexus-utils to 3.1.0
Closes gh-14422
2018-09-11 18:08:59 -07:00
Madhura Bhave 6c1915e81f Merge branch '2.0.x' 2018-09-11 17:03:38 -07:00
Madhura Bhave 7af6665a0e Ignore management.server.port for war
Fixes gh-14148
2018-09-11 16:56:03 -07:00
Phillip Webb 8ed516e9ae Polish 2018-09-11 15:10:25 -07:00
Phillip Webb aa2da0bb0d Remove logging level changes from devtools
Update `DevToolsPropertyDefaultsPostProcessor` to remove custom logging
level configuration. Unfortunately it's not easy to back-off logging
overrides when the user has a custom logback/log4j configuration.

Closes gh-14310
2018-09-11 15:07:34 -07:00
Phillip Webb 84b6fff8c0 Update copyright year for changed files 2018-09-11 14:28:28 -07:00
Phillip Webb 57ec09a55f Polish 2018-09-11 14:27:10 -07:00
Phillip Webb 0c00508b3c Register ApplicationConversionService for context
Update `SpringApplication` to automatically register the shared
`ApplicationConversionService` instance with the `BeanFactory` and
`Environment`.

Closes gh-12148
2018-09-11 14:24:27 -07:00
Madhura Bhave ab6bdc7ae2 Apply springSecurity configurer to WebTestClient
Also, @WebFluxTest now adds any ServerHttpSecurity beans
to the context.

Closes gh-13632
2018-09-11 13:28:13 -07:00
Phillip Webb 424dfc398b Move 'insights.web' properties to 'spring.http'
Relocate the 'spring.insights.web.log-request-details' property to
'spring.http.log-request-details'.

Closes gh-14313
2018-09-11 12:51:14 -07:00
Andy Wilkinson e4b9316613 Merge branch '2.0.x' 2018-09-11 20:33:40 +01:00
Andy Wilkinson 78464f999f Test the Gradle plugin against Gradle 4.10
Closes gh-14417
2018-09-11 20:33:26 +01:00
Andy Wilkinson 6041bc5bb0 Correct the permissions of scripts in archives of boot distribution
Closes gh-14158
2018-09-11 20:32:18 +01:00
Andy Wilkinson cd2323358e Upgrade to Junit Jupiter 5.3.1
Closes gh-14416
2018-09-11 20:06:44 +01:00
Andy Wilkinson 634c7bcc42 Upgrade to Infinispan 9.3.3.Final
Closes gh-14415
2018-09-11 20:06:43 +01:00
Andy Wilkinson 6b8e23b265 Merge branch '2.0.x' 2018-09-11 20:05:47 +01:00
Andy Wilkinson 39d383006c Upgrade to Spring Cloud Connectors 2.0.3.RELEASE
Closes gh-14414
2018-09-11 20:04:58 +01:00
Brian Clozel 2872579efe Upgrade to Spring AMQP 2.1.0.M3
Closes gh-14409
2018-09-11 15:24:34 +02:00
Brian Clozel f51a7e7d46 Upgrade to Tomcat 9.0.12
Closes gh-14408
2018-09-11 15:23:39 +02:00
Andy Wilkinson 79e3deec0e Merge branch '2.0.x' 2018-09-11 12:41:27 +01:00
Andy Wilkinson 2e86a6f479 Merge branch '1.5.x' into 2.0.x 2018-09-11 12:31:09 +01:00
Andy Wilkinson 1332fcb0ad Polish "Issue a warning from launch script when app will run as root"
Closes gh-10275
2018-09-11 12:12:43 +01:00
Oliver B. Fischer 94ebd33747 Issue a warning from launch script when app will run as root
See gh-10275
2018-09-11 12:12:05 +01:00
LEVI PAUL 74891a75bb Include TaskExecutionAutoConfiguration in @WebMvcTest
Closes gh-14400
2018-09-11 11:29:17 +01:00
Brian Clozel ff0ae3b5c0 Upgrade to Spring Session Bean-M3
Closes gh-14333
2018-09-11 11:41:24 +02:00
Brian Clozel dcd568c4e3 Upgrade to Spring Security 5.1.0.RC2
Closes gh-14407
2018-09-11 11:40:19 +02:00
Andy Wilkinson 9b1e74b2f1 Upgrade to Spring Session Apple-SR5
Closes gh-14332
2018-09-11 10:13:25 +01:00
Andy Wilkinson 856f9cb0ea Merge branch '1.5.x' into 2.0.x 2018-09-11 07:45:53 +01:00
Madhura Bhave 968a637e50 Refactor ReactiveOAuth2ClientAutoConfiguration for non webapps
Non web applications might want to leverage
`ReactiveClientRegistrationRepository` and
`ServerOAuth2AuthorizedClientRepository` to configure `WebClient`.

Closes gh-14350
2018-09-10 14:13:26 -07:00
Andy Wilkinson d09436872c Upgrade to Spring Integration 5.0.8.RELEASE
Closes gh-14330
2018-09-10 22:02:21 +01:00
Andy Wilkinson 144bc69afc Upgrade to Spring Kafka 2.2.0.M3
Closes gh-14331
2018-09-10 20:22:17 +01:00