Commit Graph

10441 Commits (9685b84523f6851a730b9352a40a7b09638cca33)
 

Author SHA1 Message Date
Andy Wilkinson 9685b84523 Merge branch '1.5.x' 8 years ago
Andy Wilkinson ba8f7214d8 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 0e72ef1a10 Improve diagnostics for in StarterDependenciesIntegrationTests
The root cause of the build failure something has a null message which
means there's no information available about why the build failed.
Instead of calling fail when a BuildException occurs, this commit
wraps it in a RuntimeException and rethrows it. This should make the
entire chain of exceptions available when a failure occurs.
8 years ago
Andy Wilkinson 5036fc50fc Merge branch '1.5.x' 8 years ago
Andy Wilkinson 29adf2d85e Ensure that test closes InputStream that reads contents of output files 8 years ago
Andy Wilkinson 357b9d6671 Correct the version of parent pom in new WLP deployment test module 8 years ago
Andy Wilkinson f7f764ffe1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5c9aa41c07 Update InMemoryRichGaugeRepository to support increments
Closes gh-2902
8 years ago
Andy Wilkinson 70a8836909 Merge branch '1.5.x' 8 years ago
Andy Wilkinson cb7ae2e60a Add a deployment test for WebSphere Liberty Profile
Closes gh-7419
8 years ago
Andy Wilkinson 8eeeb73015 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 69f362baca Use properties for versions of plugins managed in spring-boot-dependencies
Closes gh-4952
8 years ago
Andy Wilkinson a608e09990 Merge branch '1.5.x' 8 years ago
Andy Wilkinson e19400ba4c Merge pull request #7973 from Kazuki Shimizu
* gh-7973:
  Use constructor injection in DataSourceInitializer
8 years ago
Kazuki Shimizu 19e117c9cb Use constructor injection in DataSourceInitializer
Closes gh-7973
8 years ago
Andy Wilkinson 19b2794467 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 8d67a2fabc Merge pull request #7436 from Eddú Meléndez
* gh-7436:
  Simplify Jackson dependency management by importing its bom
8 years ago
Eddú Meléndez 7c33125eb0 Simplify Jackson dependency management by importing its bom
Closes gh-7436
8 years ago
Andy Wilkinson 803f1444a9 Merge branch '1.5.x' 8 years ago
Andy Wilkinson bb2058bf66 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 2a5586fbcf Ensure that JarResourceManager correctly handles path without leading /
Previously, JarResourceManager assumed that the path would begin with
a / but this isn't always the case. For example, it may be an empty
string. This could lead to a malformed jar:file: URL that used ! as
the separator rather than the required !/.

This commit updates JarResourceManager to prepend / to any path that
does not being with one before using it to construct the URL.

Closes gh-7717
8 years ago
Andy Wilkinson 14e24462f2 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 7fa33cddd7 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a02c2d4155 Improve the documentation of Health.Status constants
Closes gh-7784
8 years ago
Andy Wilkinson 4b35091b3c Merge branch '1.5.x' 8 years ago
Andy Wilkinson d76e1ef95e Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 9695e0a9d1 Document breakpoint config for remote debug tunnel and IntelliJ IDEA
Closes gh-7732
See gh-5047
8 years ago
Andy Wilkinson c2efae06f0 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2973d3ed4b Polishing 8 years ago
Andy Wilkinson 467350a65d Merge branch '1.5.x' 8 years ago
Andy Wilkinson ed18478054 Give FileWritingMessageHandler more time to sort itself out
See 3927dca3
8 years ago
Andy Wilkinson 5d84c4246b Merge branch '1.5.x' 8 years ago
Andy Wilkinson c71abbf6cd Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 0463350d2e Document that spring(Profile|Property) cannot be used with scan=true
Closes gh-5611
8 years ago
Andy Wilkinson 3fd597481f Merge branch '1.5.x' 8 years ago
Andy Wilkinson 682d0f524f Test insecure, insensitive endpoint with property that's always available
The user property is only available on Unix-like platforms (due to
the USER environment variable). This commit updates the test to
explicitly set a specific property and then check that it's accessible
via the env endpoint rather than using one that is OS-specific.

See gh-7868
See gh-7881
8 years ago
Andy Wilkinson f87e8d1def Merge branch '1.5.x' 8 years ago
Andy Wilkinson 8666248d27 Polishing 8 years ago
Andy Wilkinson 1ad7a66f03 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 3927dca3e0 Tolerate files being briefly left open by FileWritingMessageHandler
When the context is closed, FileWritingMessageHandler is stopped and
it closes its output files. However, it appears to do so in a manner
which means that they may be closed after the call to close the
context is completed. This causes problems on Windows as files that
are still open cannot be deleted.

This commit adds a workaround to SampleIntegrationApplicationTests
so that it makes up to 10 attempts each 0.5s apart to clean up the
input and output directories.
8 years ago
Andy Wilkinson 5f4848cf21 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 6cab03de0b Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 69320180d9 Make FileSystemWatcherTests.waitsForPollingInterval more robust
The intent of the test is to:

1. Make a change
2. Sleep for long enough for that change to be picked up
3. Make another change
4. Stop that watcher after 1 further scan has been performed
5. Assert that a further scan was performed by checking that two
   separate sets of changes (step 1 and step 3) have been picked up

Previously, step 2 relied on simply sleeping for a period of time
longer than the polling interval. In reality, the polling interval
is only a minimum time between scans and the actual time between them
depends on thread scheduling, GC pauses, etc. This lead to the
test failing intermittently if the scan didn't happen in a timely
manner.

This commit removes the sleep and replaces it with a while loop that
waits for first change to be picked up. This ensures that the second
change will be detected separately from the first and that two
separate change sets should always be available once the watcher has
stopped.

See gh-7782
8 years ago
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5b7292212f Merge pull request #8001 from kazuki43zoo:improve-log
* pr/8001:
  Prevent unnecessary debug log message creation
8 years ago
Kazuki Shimizu bd6ae47d68 Prevent unnecessary debug log message creation
Closes gh-8001
8 years ago
Stephane Nicoll 75438ff1a9 Merge pull request #8004 from izeye:polish-20170117
* pr/8004:
  Polish contribution
  Polish
8 years ago
Stephane Nicoll d556e82cf7 Polish contribution
Closes gh-8004
8 years ago
Johnny Lim acc36c076d Polish
See gh-8004
8 years ago
Andy Wilkinson 8f201d6de5 Merge branch '1.5.x' 8 years ago