Commit Graph

10096 Commits (38271b73977bab5036cb93cab724ed571eeb9e83)
 

Author SHA1 Message Date
Stephane Nicoll 64e0899456 Polish customize Cassandra's Cluster
Closes gh-7320
8 years ago
Eddú Meléndez cb3d14a305 Allow to customize Casssandra's Cluster
This commit allows to configure special customizers to be used by
Cluster.

Closes gh-7312
8 years ago
Andy Wilkinson c714880001 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 655ab9871b Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll 2f57e1885a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 2826cd3856 Merge pull request #7457 from vpavic:upgrade-spring-session
* pr/7457:
  Polish upgrade to Spring Session 1.3.0.RC1
  Upgrade Spring Session to 1.3.0.RC1
8 years ago
Stephane Nicoll ea023618a4 Polish upgrade to Spring Session 1.3.0.RC1
Closes gh-7457
8 years ago
Vedran Pavic ffec6fddd2 Upgrade Spring Session to 1.3.0.RC1
See gh-7457
8 years ago
Stephane Nicoll d96e013c71 Upgrade to Artemis 1.5.0
Closes gh-7458
8 years ago
Stephane Nicoll 3fb90f1078 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 85e835d3ff Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a5681c018d Add dependency management for hazelcast-client
Closes gh-7452
8 years ago
Phillip Webb ab3a001286 Merge branch '1.5.x' 8 years ago
Phillip Webb dc237043b8 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Phillip Webb e0dfff2b23 Merge branch '1.5.x' 8 years ago
Phillip Webb 88c84ce234 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb b6b8bef009 Polish 8 years ago
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
8 years ago
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
8 years ago
Phillip Webb ce58e16860 Add additional Tomcat timeout test
Update the Tomcat sample to also test that the connection timeout is
set.

See gh-7425
8 years ago
Grigory Fadeev 1ea829e003 Fix connector used to configure connection timeout
Fix Tomcat customization so that the main connection is configured with
any timeout.

Closes gh-7425
8 years ago
Phillip Webb a3b79be6b3 Support @MockBean on FactoryBeans
Update @MockBean support so that FactoryBean classes can be mocked.

Fixes gh-7439
8 years ago
Phillip Webb 1452d3cd51 Ensure withBasicAuth keeps error handler
Fix `TestRestTemplate` so that any custom `ErrorHandler` isn't lost
when calling `withBasicAuth`.

Fixes gh-7441
8 years ago
Andy Wilkinson 50c19250f2 Merge branch '1.5.x' 8 years ago
Andy Wilkinson af67decab6 Merge pull request #6957 from Vedran Pavić
* gh-6957:
  Update Docker images used by launch script integration tests
8 years ago
Vedran Pavic 8bd2e69915 Update Docker images used by launch script integration tests 8 years ago
Andy Wilkinson 2913ea9733 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 617a8259b4 Merge pull request #6782 from sangwook
* gh-6782:
  Make it easier to override FILE_LOG_PATTERN
8 years ago
sangwook 7e46f8e2e3 Make it easier to override FILE_LOG_PATTERN
Closes gh-6782
8 years ago
Andy Wilkinson 8d589b9a05 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 112ec53baa Merge pull request #7407 from Madhura Bhave
* gh-7407:
  Polish "Validate excluded autoconfiguration classes"
  Validate excluded autoconfiguration classes
8 years ago
Andy Wilkinson 65d0c07fd6 Polish "Validate excluded autoconfiguration classes"
- Apply code formatting
- Move configuration of excepted exception to immediately before line
  that will throw the exception
- Use String.format with %n to produce platform-specific new lines

See gh-7407
8 years ago
Madhura Bhave a9ffdca6f2 Validate excluded autoconfiguration classes
Closes gh-7407
See gh-6865
8 years ago
Andy Wilkinson bc6b2a9c75 Merge branch '1.5.x' 8 years ago
Andy Wilkinson c7a566fd24 Merge pull request #7234 from Christian Koops
* gh-7234:
  Make launch script's logFilename and pidFilename configurable via properties
8 years ago
Christian Koops 5c11059e1d Make launch script's logFilename and pidFilename configurable via properties
Closes gh-7234
8 years ago
Andy Wilkinson 9e4a370a98 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 09a235b1e8 Upgrade to Neo4j OGM 2.1.0-M01
Closes gh-7448
8 years ago
Andy Wilkinson fd2b417252 Merge branch '1.5.x' 8 years ago
Andy Wilkinson d12c21ae2f Add spring-kafka dependency to spring-boot-docs for Javadoc links
See gh-6961
8 years ago
Andy Wilkinson 0b94d71671 Merge branch '1.5.x' 8 years ago
Andy Wilkinson ff4bbd9291 Fix javadoc and apply code formatting to Kafka contribution
See gh-6961
8 years ago
Andy Wilkinson 95a763d528 Merge branch '1.5.x' 8 years ago
Andy Wilkinson f5dd90815b Polishing: fix some compiler warnings 8 years ago
Andy Wilkinson 9e4fea5f54 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 29f0ae3fa8 Use a random port in new tests in SpringBootWebSecurityConfigurationTests
See gh-7373
8 years ago
Stephane Nicoll e3688455fa Merge branch '1.5.x' 8 years ago
Stephane Nicoll cc07f56c87 Merge pull request #6961 from garyrussell:kafkaAutoConfig
* pr/6961:
  Polish "Apache Kafka support" contribution
  Add Apache Kafka support
8 years ago