Commit Graph

9307 Commits

Author SHA1 Message Date
Stephane Nicoll a2d46dc16c Upgrade to Logback 1.1.8
Closes gh-7638
2016-12-15 14:01:03 +01:00
Stephane Nicoll 601b5ced49 Upgrade to Neo4j 2.0.6
Closes gh-7650
2016-12-15 13:37:39 +01:00
Stephane Nicoll 477c874eca Improve DatabaseDriver detection based on jdbc url
This commit fixes the detection of JDBC urls for DB2 AS400, Firebird and
Informix.

Closes gh-7651
2016-12-15 10:39:03 +01:00
Stephane Nicoll c8bdf74327 Expand ConfigurationProperties doc
Closes gh-7620
2016-12-15 09:20:24 +01:00
Stephane Nicoll cfad35ad21 Merge pull request #7596 from 166MMX:patch-1
* pr/7596:
  Update production-ready-features.adoc
2016-12-14 19:08:31 +01:00
Johannes Harth 9746c63209 Update production-ready-features.adoc
Replace line break with missing line fold "\\\n" to continue the property
value.

Closes gh-7596
2016-12-14 19:06:39 +01:00
Andy Wilkinson 4d5fb97127 Revert "Start building against Spring Framework 4.3.5 snapshots"
This reverts commit 727d626292. Sigh,
although the SPR issue is complete the change hasn't been backported
yet.
2016-12-14 16:33:55 +00:00
Andy Wilkinson 727d626292 Start building against Spring Framework 4.3.5 snapshots
See gh-7601
2016-12-14 14:59:38 +00:00
Andy Wilkinson 14a90aa52e Update SpringApplicationBuilder javadoc to reflect API changes
Closes gh-7609
2016-12-13 10:02:00 +00:00
Andy Wilkinson 4ec95b8308 Ensure that JolokiaMvcEndpoint destroys underlying controller
Closes gh-7606
2016-12-13 09:42:14 +00:00
Stephane Nicoll b80ad2a212 Harmonize Caffeine CacheManager bean name
Closes gh-6980
2016-12-12 11:40:39 +01:00
Andy Wilkinson 61f086591c Revert "Start building against Spring Framework 4.3.5 snapshots"
This reverts commit 47f1aeb589.
2016-12-08 20:55:57 +00:00
Andy Wilkinson 4a709ea86d Start building against snapshots for Spring Data Hopper SR6
See gh-7602
2016-12-08 17:35:53 +00:00
Andy Wilkinson 47f1aeb589 Start building against Spring Framework 4.3.5 snapshots
See gh-7601
2016-12-08 17:33:02 +00:00
Andy Wilkinson 2d8344d46d Ensure that JarLauncher doesn't cause root jar to be on class path twice
Closes gh-7595
2016-12-08 11:34:22 +00:00
Madhura Bhave 64da63aa96 Use empty message for Non-Spring Boot Condition
Update `AbstractNestedCondition` to use an empty message for non
Spring Boot nested conditions.

Fixes gh-7519
Closes gh-7529
2016-12-05 11:16:25 -08:00
Phillip Webb e430583eaf Polish 2016-12-05 11:08:38 -08:00
Andy Wilkinson 6061dd492e Increase timeout in DevTools integration tests and improve diagnostics 2016-12-02 13:40:22 +00:00
Andy Wilkinson c5af34bee4 Merge pull request #7535 from Pei-Tang Huang
* gh-7535:
  Quote $jarfile when creating arguments in launch script
2016-12-02 11:33:34 +00:00
Pei-Tang Huang 5a5e2db134 Quote $jarfile when creating arguments in launch script
Previously, if the pathname of fully executable contained any space
characters, the launch script would fail to locate the jar file

This commit fixes this issue by quoting the jarfile.

Closes gh-7535
2016-12-02 11:31:51 +00:00
Andy Wilkinson d9bd211062 Link to correct branch on GitHub from snapshot documentation
Closes gh-7548
2016-12-01 14:46:39 +00:00
Andy Wilkinson b798b5a40b Update docs to reflect Gradle plugin being available in the Plugin Portal
Closes gh-1567
2016-12-01 14:37:01 +00:00
Stephane Nicoll 2a85a2557d Fix health indicator auto-configuration order
Previously, the health auto-configuration `AutoconfigureOrder` entry for
couchbase was referring to the standard couchbase auto-configuration that
is not responsible to configure the `CouchbaseOperations` bean. Yet, the
health indicator implementation was relying on the presence of such a
bean.

This commit fixes the `AutoconfigureOrder` entry so that it refers to
`CouchbaseDataAutoConfiguration` now.

Closes gh-7543
2016-12-01 15:25:51 +01:00
Andy Wilkinson 36981259a5 Document that CRaSH commands written in Java are not supported
Closes gh-7471
2016-12-01 13:29:49 +00:00
Andy Wilkinson 356edc725c Handle request mappings with regular expressions in MetricsFilter
Closes gh-7503
2016-12-01 13:22:55 +00:00
Andy Wilkinson d9b8fc960c Correct the scope of the spock-core dependency in spring-boot-test
See gh-7524
2016-12-01 09:38:07 +00:00
Andy Wilkinson 45d672f5b3 Ignore Spock annotations when creating test context cache key
Closes gh-7524
2016-11-30 20:59:09 +00:00
Stephane Nicoll c51d836a15 Use standard file name for Maven dependencies
This commit uses standard files for libraries managed by the repackage
goal of the Maven plugin. Previously, only the name of the file was used
which could lead to duplicate libraries if the name of the target file
deviates from the default. This typically happens when the
`build.finalName` property is specified on a dependent module.

Note that the `maven-war-plugin` has an additional mechanism to customize
the file name structure of dependencies. This feature isn't supported by
the repackage goal so an explicit mention has been added in the
documentation.

Closes gh-7389
2016-11-30 15:13:25 +01:00
Stephane Nicoll e5ca4990d0 Fix bootstrap-hosts property detection with list
Previously, if `spring.couchbase.bootstrap-hosts` was specified in YAML
or with the `[Idx]` notation, the auto-configuration would not kick in.

This is due to a limitation of `@ConditionalOnProperty` on a property of
type Collection. This commit workarounds this limitation for now with a
dedicated condition.

Closes gh-7508
2016-11-30 13:49:44 +01:00
Stephane Nicoll d89cf94397 Merge pull request #7510 from oscr:fix-redundant-tostring
* pr/7510:
  Remove redundant toString() invocation
2016-11-29 08:02:01 +01:00
Oscar Utbult 88b83a909c Remove redundant toString() invocation
Closes gh-7510
2016-11-29 08:01:27 +01:00
Phillip Webb 357d072a60 Polish 2016-11-28 15:14:46 -08:00
Andy Wilkinson 491bd745de Document Jersey's package scanning limitations
Closes gh-7496
2016-11-28 11:32:48 +00:00
Stephane Nicoll 5e604437d7 Restore proper scope for spring-hateoas
Closes gh-7489
2016-11-28 10:41:34 +01:00
Andy Wilkinson c6bdd136b1 Merge pull request #7271 from Aleksander Bartnikiewicz
* gh-7271:
  Test that a broken factory bean does not break resetting of mocks
  Prevent a broken factory bean from breaking the resetting of mocks
2016-11-25 10:41:20 +00:00
Andy Wilkinson 46e8cf4a43 Test that a broken factory bean does not break resetting of mocks
Previously, ResetMocksTestExecutionListener used getBean(name) to
retrieve each instantiated singleton. When the instantiated singleton
was a factory bean, this would cause getObject on the factory bean to
be called. If the factory bean was unable to produce its object, for
example due to test slicing excluding something, an exception would
be thrown.

The previous commit updated ResetMocksTestsExecutionListener to
use getSingleton(name) rather than getBean(name).  This will retrieve
the factory bean itself rather than causing the factory bean to
attempt to create an object. This commit updates the tests to verify
the new behaviour.

Closes gh-7270
2016-11-25 10:40:02 +00:00
Aleksander Bartnikiewicz eb927f1b29 Prevent a broken factory bean from breaking the resetting of mocks
Closes gh-7271
2016-11-25 10:39:30 +00:00
Andy Wilkinson e19c6245ef Consider endpoints.sensitive when endpoints.health.sensitive is not set
Closes gh-7476
2016-11-24 20:57:29 +00:00
Stephane Nicoll 1f8281931d Merge pull request #7462 from kuhnroyal:gh-7460
* pr/7462:
  Polish contribution
  Fix undertow session persistence with spring-boot-devtools
2016-11-24 16:07:16 +01:00
Stephane Nicoll 4c61c9f26a Polish contribution
Closes gh-7462
2016-11-24 16:07:03 +01:00
Peter Leibiger 203b6f2f2c Fix undertow session persistence with spring-boot-devtools
Fixes gh-7460
2016-11-24 16:00:23 +01:00
Stephane Nicoll 65b6d8f4f7 Handle `NoClassDefFoundError` in `OnBeanCondition`
If `OnBeanCondition` is used with a `String` literal representing the
fully qualified name of a bean and such type does not exist, it
gracefully manages it as if it was not found. Prior to this commit, an
exception would be thrown if any related class such as the parent
class does not exist.

This commit handles this additional case, catching `NoClassDefFoundError`
the same way it did handle `ClassNotFoundException`. That way, a
missing type will now be considered as absent if it's not on the
classpath.

Closes gh-7459
2016-11-24 15:48:56 +01:00
Stephane Nicoll 4bf645c615 `AutoconfigureTestDatabase` replace with a fresh database
Previously, two or more `@DataJpaTest` tests in the same test suite were
sharing the same in-memory database instance. This commit makes sure
that `TestDatabaseAutoConfiguration` creates a unique embedded database
for each test it operates on.

Closes gh-7473
2016-11-24 15:31:27 +01:00
Stephane Nicoll 0359b2f6f5 Document how to disable JMS transacted session
Closes gh-7463
2016-11-24 10:39:40 +01:00
Stephane Nicoll 5e8ba5cef6 Fix Couchbase condition on Spring Data class
This commit reverts 7e2d0fd so that the Couchbase auto-configuration can
work without Spring Data again. It also removes the `Class` reference to
a Spring Data class to a `String` reference to make sure the condition
operates properly when said class isn't on the classpath.

Closes gh-7453
2016-11-24 09:41:19 +01:00
Andy Wilkinson 5e79657d4b Treat URLs for same file in nested archive and from jar root as equal
Consider the following two URLs:

jar:file:/test.jar!/BOOT-INF/classes!/foo.txt
jar:file:/test.jar!/BOOT-INF/classes/foo.txt

They both reference the same foo.txt file in the BOOT-INF/classes
directory of test.jar, however the first URL does so via the
nested BOOT-INF/classes archive. Previously, this difference in the
URLs would lead to PathMatchingResourcePatternResolver returning two
resources for foo.txt when asked to find all resources matching the
pattern classpath*:/**/*.txt.

This commit updates our Handler that is used for jar: URLs to consider
the two URLs above to be equivalent such that url1 is equal to url2
and the two urls will produce the same hash code.

Closes gh-7449
2016-11-23 14:04:45 +00:00
Stephane Nicoll a5681c018d Add dependency management for hazelcast-client
Closes gh-7452
2016-11-23 10:55:46 +01:00
Phillip Webb 74670cb20f Allow WebDriver beans to define their own scope
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.

Fixes gh-7454
2016-11-22 15:48:28 -08:00
Phillip Webb 7e2d0fd1c0 Check for Spring Data before configuring Couchbase
Add guard to `CouchbaseAutoConfiguration` so ensure that Spring Data
Couchbase is on the classpath.

Fixes gh-7453
2016-11-22 14:32:38 -08:00
Phillip Webb 288398b8b7 Merge pull request #7425 from PostalBear/1.4.x
* pr/7425:
  Add additional Tomcat timeout test
  Fix connector used to configure connection timeout
2016-11-22 14:31:37 -08:00