Commit Graph

5002 Commits

Author SHA1 Message Date
Stephane Nicoll 30fe10613d Improve how to configure configuration keys of a custom starter
Closes gh-17573
2019-07-22 15:28:17 +02:00
Stephane Nicoll 300f07b2a8 Polish 2019-07-22 15:20:37 +02:00
Stephane Nicoll 3c7ac4fe7f Polish 2019-07-22 13:17:51 +02:00
Stephane Nicoll 1661da8774 Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
See gh-17531
2019-07-22 13:09:31 +02:00
Dmytro Nosan 77b52b993b Configure ActiveMQConnectionFactory properly without spring-jms
See gh-17531
2019-07-22 13:08:42 +02:00
dreis2211 c2b6939ae1 Cover more known Java versions in JavaVersion
See gh-17590
2019-07-22 10:24:54 +02:00
Andy Wilkinson 74f0e42c98 Make it clearer when there will be no auto-configured MessageSource
Closes gh-17485
2019-07-19 15:44:00 +01:00
Stephane Nicoll 8eb6886388 Fix code formating 2019-07-19 11:29:12 +02:00
Stephane Nicoll e6a5895c05 Start build against Spring Session Bean snapshots
See gh-17581
2019-07-19 11:13:43 +02:00
Stephane Nicoll 32e00d5dd2 Start building against Spring Data Lovelace snapshots
See gh-17353
2019-07-19 11:11:42 +02:00
Stephane Nicoll 1d4e9cb6a4 Start building against Spring Framework 5.1 snapshots
See gh-17351
2019-07-19 11:10:58 +02:00
Stephane Nicoll b8d92cb0ae Fix @DataJdbcTest to be transactional as advertized
Closes gh-17513
2019-07-19 10:33:59 +02:00
Stephane Nicoll 5903e9a57a Polish 2019-07-19 10:33:52 +02:00
dreis2211 43833c7bf0 Remove unused java-statsd-client dependencies
See gh-17508
2019-07-18 17:54:48 +01:00
Andy Wilkinson 591250f75e Polish "Hide loader classes from Tomcat's ServletContext resource paths"
See gh-17538
2019-07-18 17:05:31 +01:00
adavid9 a81325bbbc Hide loader classes from Tomcat's ServletContext resource paths
See gh-17538
2019-07-18 17:05:27 +01:00
Andy Wilkinson b725c60177 Deprecate DeploymentInfo customization with reactive Undertow
Fixes gh-17555
2019-07-18 06:54:38 +01:00
Phillip Webb 30b5ba87ae Merge branch '2.0.x' into 2.1.x 2019-07-17 21:48:01 +01:00
Phillip Webb fd67f7ba3f Merge branch '1.5.x' into 2.0.x 2019-07-17 21:47:04 +01:00
Stephane Nicoll b6ca1eadeb Fix prefix for datasource metrics
Closes gh-17553
2019-07-17 14:28:12 +02:00
Andy Wilkinson 9dabc0e14d Cleared deferred lines after each test
Previously, DeferredLinesWriter would collect MockMvc output from
every test that has executed. If a test eventually failed, the
output from every test up to including the one that had failed would
be output, rather than just the output for the test that has just
failed.

This commit clears the deferred lines after each test, thereby
ensuring that when a failure occurs only the lines from the failing
test are output.

Fixes gh-17551
2019-07-17 12:29:41 +01:00
Stephane Nicoll a64317b114 Fix broken link to Spring Integration metrics section
Closes gh-17543
2019-07-17 10:26:40 +02:00
Andy Wilkinson e84477cfe2 Only perform Quartz DataSource init when using JDBC store
Fixes gh-17545
2019-07-17 09:04:17 +01:00
dreis2211 e9203a280c Test the Gradle Plugin against Gradle 5.5.1
See gh-17496
2019-07-14 13:13:17 +02:00
Madhura Bhave aebb60d8b8 Fix tests
Setting the log file name to a random value in smoke tests
doesn't work because the logger context has already been initialized.
2019-07-10 18:14:58 -07:00
Madhura Bhave 773dda3d55 Log file location should be evaluated just once
Using a random value for the logfile name caused
the logfile endpoint to return a 404 as the name
was resolved from the environment on every request.
This commit registers a bean for LogFile which is then
used by the logfile endpoint.

Fixes gh-17434
2019-07-10 14:46:09 -07:00
Dmytro Nosan 93d0427fb5 Polish AbstractDependsOnBeanFactoryPostProcessor
See gh-17480
2019-07-10 13:36:57 +01:00
Andy Wilkinson f753c31988 Polish "Set up MongoClient beans' dependencies by type rather than name"
See gh-16627
2019-07-10 13:13:19 +01:00
ielatif 39f1039425 Set up MongoClient beans' dependencies by type rather than name
See gh-16627
2019-07-10 13:10:41 +01:00
Andy Wilkinson 80650f485d Polish "Allow depended on beans to be identified by type"
See gh-17020
2019-07-10 12:25:57 +01:00
Dmytro Nosan 9923ffe9bd Allow depended on beans to be identified by type
Prior to this commit, `AbstractDependsOnBeanFactoryPostProcessor`
could only identify depended on beans by name.

See gh-17020
2019-07-10 12:25:57 +01:00
Stephane Nicoll 852f4a280c Fix supported java version range in documentation
Closes gh-17476
2019-07-10 12:48:50 +02:00
Andy Wilkinson 6748b20863 Prevent JUL loggers from being GCed once their level has been set
Fixes gh-17217
2019-07-09 19:51:55 +01:00
Stephane Nicoll 3fb15a502b Remove outdated reference to Guava in the reference guide
Closes gh-17446
2019-07-09 18:00:57 +02:00
Andy Wilkinson acd9b61c8e Make Batch JPA auto-configuration back off without a DataSource
Fixes gh-17465
2019-07-09 15:46:45 +01:00
Andy Wilkinson c5241f0e82 Remove accidental usage of com.hazelcast.util.Base64
Closes gh-17461
2019-07-09 15:03:31 +01:00
Andy Wilkinson 02bea78229 Retain as much Batch auto-config as possible without Spring JDBC
Closes gh-17451
2019-07-08 15:35:16 +01:00
Andy Wilkinson a023f308ed Make JDBC-based batch configurer back off without a DataSource
Closes gh-17449
2019-07-08 14:43:26 +01:00
Andy Wilkinson 7f85aba546 Auto-configure Data Mongo if user provides MongoDbFactory but no client
Previously, if a user defined a MongoDbFactory bean but did not define
a client bean, MongoDataAutoConfiguration would back off leaving the
context without a MongoTemplate, etc.

This commit reworks the auto-configuration so that only the
auto-configuration of a MongoDbFactory is dependent on the existence
of a Mongo client bean. Auto-configuration of the other components
that depend on a MongoDbFactory will now continue in the absence of a
Mongo client bean.

Closes gh-17416
2019-07-04 12:36:03 +01:00
Andy Wilkinson 7553b60e68 Test the Gradle Plugin against Gradle 5.5
Closes gh-17428
2019-07-04 10:05:57 +01:00
Phillip Webb 2f88dd735e Polish 2019-07-03 15:52:51 -07:00
Phillip Webb cd5f40aec2 Validate onFailure returned binding results
Update `ValidationBindHandler` so that any non-null result returned by
the parent `onFailure` method triggers re-validation.

Fixes gh-17421
2019-07-03 15:52:51 -07:00
Phillip Webb d641a1e23a Polish BindHandler javaodc 2019-07-03 15:52:51 -07:00
Andy Wilkinson 82fd4ce9b9 Fix empty context path warning when using Jetty with WebFlux
Previously, the context path was set to an empty string. The led to
Jetty logging a warning about an empty context path and then using
/ instead.

This commit avoids the warning while leaving the context path's end
result unchanged by setting the context path to /.

Closes gh-17399
2019-07-02 17:24:34 +01:00
Andy Wilkinson e57579461a Prevent endpoint's shutdown() method from being a destroy method
Closes gh-17407
2019-07-02 14:05:49 +01:00
Andy Wilkinson 5997886897 Add dependency management for Infinispan's Spring 5 modules
This commit adds dependency management for Infinispan's Spring 5
modules that are introduced in 9.4.9.Final. It also removes redundant
exclusions for the dependency management for its Spring 4 modules.

Closes gh-17346
2019-07-02 11:41:33 +01:00
Phillip Webb 206ba2ad86 Append chars not ints in getLettersAndDigits
Update `StringToEnumIgnoringCaseConverterFactory` so that the
`getLettersAndDigits` method correctly appends `char` elements
rather than `int` elements.

Closes gh-17327
2019-07-01 21:49:29 -07:00
Phillip Webb 88b6a3308c Escape additional '{reference}' elements in asciidoc
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:39:49 -07:00
Phillip Webb a81f37dd68 Escape '{reference}' elements in asciidoc files
Escape lines that look like variable references but should actually be
included verbatim.

Closes gh-17386
2019-07-01 11:02:05 -07:00
Andy Wilkinson 34e0db2c25 Merge branch '2.0.x' into 2.1.x
Closes gh-17382
2019-07-01 15:57:21 +01:00
Andy Wilkinson 0c44584b44 Merge branch '1.5.x' into 2.0.x 2019-07-01 15:57:00 +01:00
Andy Wilkinson 4083c721f2 Fix URL normalization when replacing /./ with /
Previously, a regular expression of /./ was used to replace /./ with
/.  The '.'' in the expression matches any single character so the
replacement was more broadly applicable than it should have been. For
example, /a/ would be replaced with /.

This commit uses Pattern.LITERAL to compile the regular expression
from the CURRENT_DIR (/./) contant. This allows the constant to be
used to check for occurances of /./ in the string before attempting
replacement, while also ensuring that the '.' is treated literally.

Closes gh-17341
2019-07-01 15:42:54 +01:00
Dmytro Nosan ae184874e9 Polish WebServiceTemplateBuilder
See gh-17289
2019-06-29 22:19:03 +01:00
Johnny Lim 408035fb3f Remove System.out.println() in a test
See gh-17358
2019-06-29 21:18:44 +01:00
Johnny Lim 8dea74a2e9 Add a missing quote in DebugLogbackConfigurator
See gh-17357
2019-06-29 21:14:42 +01:00
Andy Wilkinson f4e7b80651 Merge branch '2.0.x' into 2.1.x
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson 761856ac70 Merge branch '1.5.x' into 2.0.x 2019-06-29 20:29:16 +01:00
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb 9aa4887376 Merge branch '2.0.x' into 2.1.x 2019-06-28 14:14:52 -07:00
Phillip Webb ed3e1e076d Fix AbstractFilterRegistrationBean merge error
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb de35efd1ef Merge branch '2.0.x' into 2.1.x 2019-06-28 12:21:57 -07:00
Phillip Webb bb34846630 Merge branch '1.5.x' into 2.0.x 2019-06-28 12:19:46 -07:00
Andy Wilkinson 91786bc712 Merge branch '2.0.x' into 2.1.x
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson 256a0d636d Merge branch '1.5.x' into 2.0.x 2019-06-27 11:39:02 +01:00
Andy Wilkinson 3fb06ee29e Merge branch '2.0.x' into 2.1.x
Closes gh-17320
2019-06-26 17:39:13 +01:00
Andy Wilkinson 4973a2b217 Merge branch '1.5.x' into 2.0.x 2019-06-26 17:37:39 +01:00
Phillip Webb 02e705c8e4 Relax nohttp requirement for service.wsdl
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.

Fixes gh-17307
2019-06-25 11:17:27 -07:00
Stephane Nicoll 374e02cac8 Simplify HibernateJpaAutoConfiguration classes check
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.

Closes gh-17288
2019-06-21 15:26:07 +02:00
Stephane Nicoll 86ace26049 Fix broken link to Spring Integration reference guide
Closes gh-17279
2019-06-21 09:09:01 +02:00
Andy Wilkinson a5ae1de706 Fix spring-boot-loader's tests on Windows
Closes gh-17275
2019-06-20 11:08:35 +01:00
Stephane Nicoll 7e5ca6d280 Merge branch '2.0.x' into 2.1.x
Closes gh-17268
2019-06-19 15:30:13 +02:00
Stephane Nicoll 11dee3c0d8 Merge branch '1.5.x' into 2.0.x 2019-06-19 15:27:49 +02:00
Phillip Webb 3eb7af1506 Upgrade to Infinispan 9.4.15.Final
Closes gh-17235
2019-06-17 19:42:33 -07:00
Phillip Webb d82ccf1405 Ensure META-INF/MANIFEST.MF remains as first entry
Update Gradle archive tasks to ensure that `META-INF/` and
`META-INF/MANIFEST.MF` remain as the first entries of the archive.

Prior to this commit, rewritten archives would violate the implicit
specification of `JarInputStream` that these entries should be first.

Fixes gh-16698
2019-06-17 15:48:14 -07:00
Phillip Webb 692bda1595 Polish "Fix connection timeout configuration for Netty"
See gh-16535
2019-06-17 11:26:36 -07:00
ayudovin b0e4c716d3 Fix connection timeout configuration for Netty
Update `NettyWebServerFactoryCustomizer` to deal with the fact that
Netty treats `0` and negative connection timeout values differently to
Tomcat, Undertow and Jetty.

See gh-16535
2019-06-17 11:24:35 -07:00
ayudovin c2d1cb2c70 Chain predicates in PropertyMapper when methods
Update `PropertyMapper` to correctly combine predicates when repeated
calls are made to `when` and `whenNot`. Prior to this commit, subsequent
invocations would replace the previous predicate.

Fixes gh-17225
2019-06-17 11:21:56 -07:00
Andy Wilkinson 88fbc529e6 Upgrade to Micrometer 1.1.5
Closes gh-17222
2019-06-17 16:15:44 +01:00
Andy Wilkinson fe9db792ee Complete dependency management for JavaBeans Activation Framework
Fixes gh-17062
2019-06-17 16:00:39 +01:00
Andy Wilkinson 645514f848 Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"
See gh-16485
2019-06-17 13:54:41 +01:00
Lorenzo Dee 7340d546b8 Honour base path from @WebAppConfiguration in @WebMvcTest
See gh-16485
2019-06-17 13:37:55 +01:00
Andy Wilkinson 5dc2339ec2 Polish "Consider properties from @AutoConfigureTestDatabase"
See gh-16814
2019-06-17 11:38:13 +01:00
András Deák 92256c80d0 Consider properties from @AutoConfigureTestDatabase
Both Flyway and Liquibase makes use of DataSourceProperties to get
default properties. Previously, both used strictly the configuration
properties and failed to consider embedded datasource properties
autoconfigured by @AutoConfigureTestDatabase. In case a database layer
test e.g. @JdbcTest relies on the autoconfigured embedded datasource,
Flyway and Liquibase autoconfiguration fails as they are not aware of
the embedded datasource properties.

See gh-16814
2019-06-17 11:09:29 +01:00
Andy Wilkinson c2a4a3f630 Polish "Auto-configure caching in jOOQ sliced tests"
See gh-17066
2019-06-17 10:55:35 +01:00
Dmytro Nosan 4701d8f82a Auto-configure caching in jOOQ sliced tests
See gh-17066
2019-06-17 10:55:35 +01:00
Andy Wilkinson 13a7a52c71 Revert "Work around Framework regression in handling of null model values"
This reverts commit 5fc67c545c.

Closes gh-16991
2019-06-17 10:44:23 +01:00
Andy Wilkinson 7d59b78829 Fix handling of jar files with + chars in their path
Closes gh-17208
2019-06-17 10:31:51 +01:00
Andy Wilkinson 84c6313332 Upgrade to Spring Session Bom Bean-SR6
Closes gh-17209
2019-06-16 08:47:40 +01:00
Andy Wilkinson fa8dc04751 Upgrade to Spring Kafka 2.2.7.RELEASE
Closes gh-17206
2019-06-15 10:42:14 +01:00
Andy Wilkinson e842dc7f0c Upgrade to Spring Integration 5.1.6.RELEASE
Closes gh-17205
2019-06-15 10:42:14 +01:00
Andy Wilkinson 88df70c4d0 Upgrade to Spring Amqp 2.1.7.RELEASE
Closes gh-17204
2019-06-15 10:42:14 +01:00
Andy Wilkinson 1b495f5a42 Merge branch '2.0.x' into 2.1.x
Closes gh-17195
2019-06-14 15:47:39 +01:00
Andy Wilkinson 4bae91d933 Merge branch '1.5.x' into 2.0.x 2019-06-14 15:47:22 +01:00
Andy Wilkinson 96ac42e405 Upgrade to Spring Data Lovelace-SR9
Closes gh-17193
2019-06-14 15:24:32 +01:00
Andy Wilkinson d5d96dff96 Honor logback.debug property and write Logback statuses to console
Closes gh-16876
2019-06-14 15:12:05 +01:00
Andy Wilkinson 1aa193e30b Upgrade to Maven War Plugin 3.2.3
Closes gh-17168
2019-06-14 12:13:55 +01:00
Andy Wilkinson a3bc383019 Upgrade to Neo4j Ogm 3.1.11
Closes gh-17167
2019-06-14 12:13:55 +01:00
Andy Wilkinson 491f5f3233 Upgrade to Infinispan 9.4.14.Final
Closes gh-17166
2019-06-14 12:13:55 +01:00
Andy Wilkinson 53c0860151 Upgrade to Hibernate Validator 6.0.17.Final
Closes gh-17165
2019-06-14 12:13:55 +01:00