Commit Graph

11353 Commits (287520a810e64e78cec9cbd6d0e419654c517225)
 

Author SHA1 Message Date
Stephane Nicoll 6a137260c1 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4158a6d50f Fix typo
Closes gh-8574
8 years ago
Andy Wilkinson b35c162593 Raise the minimum supported version of Gradle to 3.4
Closes gh-7922
8 years ago
Phillip Webb b1f679b1c5 Fix HttpHandlerAutoConfiguration
Fix HttpHandlerAutoConfiguration following upstream Spring Framework
changes.
8 years ago
Stephane Nicoll 4f7e5efac8 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5d27c7e501 Handle non supported JOOQ dialect
This commit uses a fallback translator if the JOOQ Dialect in use is not
one we support.

Closes gh-8521
8 years ago
Andy Wilkinson 62de505e43 Update tests to align with slight change in HtmlUnit's behaviour
See gh-8515
8 years ago
Stephane Nicoll 5ca197b5b6 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cbde6ed096 Merge pull request #8474 from Nowheresly:gh-8396
* pr/8474:
  Polish contribution
  Add Tomcat Access Log's fileDateFormat property
8 years ago
Stephane Nicoll f8bf05b91f Polish contribution
Closes gh-8474
8 years ago
srichard 0ddaca57fb Add Tomcat Access Log's fileDateFormat property
Closes gh-8396
8 years ago
Andy Wilkinson 030b566194 Upgrade to Selenium HtmlUnit 2.25
See gh-8515
8 years ago
Stephane Nicoll 361ad69a4b Merge branch '1.5.x' 8 years ago
Stephane Nicoll b5fc68dfed Merge pull request #8490 from schlauergerd:gh-8390
* pr/8490:
  Polish contribution
  Introduce reset method to OutputCapture
8 years ago
Stephane Nicoll c8ac94b75d Polish contribution
Closes gh-8490
8 years ago
Roland Weisleder a6f0da8cc6 Introduce reset method to OutputCapture
Closes gh-8390
8 years ago
Stephane Nicoll 7ed97d3e0b Merge pull request #8552 from sotuzun:master
* pr/8552:
  Remove unused parameter
8 years ago
Sabri Onur Tüzün bce5737215 Remove unused parameter
Closes gh-8552
8 years ago
Stephane Nicoll abef1ee4db Merge branch '1.5.x' 8 years ago
Stephane Nicoll feb1ab375f Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 095eb779e2 Merge pull request #8562 from eddumelendez:missing_cassandra_metadata
* pr/8562:
  Add missing spring-data-cassandra metadata
8 years ago
Eddú Meléndez 251090b1e5 Add missing spring-data-cassandra metadata
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.

Closes gh-8562
8 years ago
Stephane Nicoll dc3b2a70b9 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 544c73841d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 633e75dce2 Fix typo
Closes gh-8563
8 years ago
Stephane Nicoll 1223e9248b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6624fe47c3 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll e7922a574a Polish 8 years ago
Stephane Nicoll 68ef19b69b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 207ab3ecb4 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 07c56c60ba Make sure Hazelcast bootstraps before any JCache setup
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.

Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).

Closes gh-8484
8 years ago
Andy Wilkinson 019b0a3e9c Merge branch '1.5.x' 8 years ago
Andy Wilkinson 50c0204f2d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson d32c3a7f43 Correct the URL that's called to test servlet context resources
See gh-8299
Closes gh-8525
8 years ago
Andy Wilkinson b527e71474 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 1395f38ee7 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a2cf0455fd Fix static resource handling when run in IDE or using Maven or Gradle
The changes made for gh-8299 attempted to make static resource
handling consistent across Jetty, Tomcat, and Undertow. They did so
for application's launched using JarLauncher or WarLauncher but did
not consider application's launched in an IDE or using spring-boot:run
in Maven or bootRun in Gradle.

Running in an IDE or via Maven or Gradle introduces two new
resource locations:

 - Jars on the classpath with file protocol URLs (they are always
   jar protocol URLs when using either launcher)
 - Directories on the classpath from a project that is depended upon
   and contains resources in META-INF/resources

This commit updates the factories for all three containers to handle
these new resources locations. The integration tests have also been
updated.
8 years ago
Madhura Bhave f72c5b70c6 Merge branch '1.5.x' 8 years ago
Madhura Bhave 7da70a52fd Mask sensitive placeholders in env endpoint
Closes gh-8282
8 years ago
Andy Wilkinson c42312be79 Upgrade to RxJava 2.0.7
Closes gh-8539
8 years ago
Andy Wilkinson 884fedcefb Upgrade to Selenium 3.2.0
Closes gh-8538
8 years ago
Stephane Nicoll 407894e1df Merge pull request #8526 from izeye:polish-20170307
* pr/8526:
  Polish
8 years ago
Johnny Lim 709ee23255 Polish
Closes gh-8526
8 years ago
Madhura Bhave 8f903987da Merge branch '1.5.x' 8 years ago
Madhura Bhave 703b7d9268 Merge branch '1.4.x' into 1.5.x 8 years ago
Madhura Bhave 67068fc83d Ignore unresolvable nested placeholders
The NamePatternEnvironmentFilter used to throw an exception if
placeholders in property values could not be resolved.

Fixes gh-8510
8 years ago
Phillip Webb d75c8719ea Fix Javadoc link references
See gh-8517
See gh-814
8 years ago
Madhura Bhave 484c72cd19 Add OriginTrackedYamlLoader
Update the YAML parser so that origin  information can be tracked.
Line and column numbers are now available for each loaded property
value.

Fixes gh-8142
8 years ago
Madhura Bhave 7d793fd123 Add OriginTrackedPropertiesLoader
Use a custom parser to load `.properties` files so that origin
information can be tracked. Line and column numbers are now available
for each loaded property value.

Fixes gh-8517
8 years ago
Madhura Bhave 0593fd3db1 Add OriginTrackedMapPropertySource
Add `OriginTrackedMapPropertySource` that can be used for any `Map`
backed `PropertySource` that is also aware property origins. Rather than
directly storing the value in the `Map`, an `OriginTrackedValue` can
be used.

See gh-8142
See gh-8517
8 years ago