Commit Graph

9236 Commits

Author SHA1 Message Date
Andy Wilkinson
bfee21730c Detect path of exploded war correctly on Windows
Previously, AbstractEmbeddedServletContainerFactory detected an
exploded war by looking for `/WEB-INF/` in the path of its code
source's location. This failed on Windows due to the use of `\` rather
than `/` separators.

This commit updates AbstractEmbeddedServletContainerFactory to
uses the OS's separator rather than hardcoding `/`.

Closes gh-8100
2017-01-25 11:26:03 +00:00
Stephane Nicoll
265a712294 Fix keys format for embedded mongodb support
Closes gh-8102
2017-01-25 10:41:47 +01:00
Andy Wilkinson
bd58a6de66 Upgrade to Jaybird 2.2.12
Closes gh-8086
2017-01-24 16:33:06 +00:00
Andy Wilkinson
f8056f9888 Upgrade to Elasticsearch 2.4.4
Closes gh-8085
2017-01-24 16:33:06 +00:00
Andy Wilkinson
96f6f42b32 Upgrade to Jetty 9.3.16.v20170120
Closes gh-8084
2017-01-24 16:33:05 +00:00
Andy Wilkinson
70cd5c42ed Upgrade to Groovy 2.4.8
Closes gh-8083
2017-01-24 16:33:05 +00:00
Andy Wilkinson
fcd5477334 Upgrade to Httpcore 4.4.6
Closes gh-8082
2017-01-24 16:33:04 +00:00
Andy Wilkinson
a736102a4b Upgrade to Activemq 5.13.5
Closes gh-8081
2017-01-24 16:33:04 +00:00
Andy Wilkinson
ec70046e27 Upgrade to Joda Time 2.9.7
Closes gh-8080
2017-01-24 16:33:03 +00:00
Andy Wilkinson
b5cecd42d1 Upgrade to Undertow 1.3.26.Final
Closes gh-8079
2017-01-24 16:33:03 +00:00
Andy Wilkinson
b43a8c2069 Upgrade to Jackson 2.8.6
Closes gh-8078
2017-01-24 16:33:02 +00:00
Andy Wilkinson
fe17a0efa2 Upgrade to Logback 1.1.9
Closes gh-69
2017-01-24 16:22:55 +00:00
Andy Wilkinson
1607f682db Start building against Spring Framework 4.3.6 snapshots
See gh-7774
2017-01-24 12:28:24 +00:00
Stephane Nicoll
4efa4590f8 Review doc on advanced datasource customization
Closes gh-7652
2017-01-24 09:55:13 +01:00
Stephane Nicoll
4760a1a6e1 Merge pull request #8057 from izeye:fix-test-20170122
* pr/8057:
  Fix entry in broken-initialization.factories
2017-01-22 11:14:23 +01:00
Johnny Lim
752b8bd650 Fix entry in broken-initialization.factories
Closes gh-8057
2017-01-22 11:14:12 +01:00
Andy Wilkinson
9e2e824098 Upgrade to Tomcat 8.5.11
Closes gh-7360
2017-01-20 15:51:18 +00:00
Andy Wilkinson
0ce7c9516a Document how to configure test- and profile-specific Flyway migrations
Closes gh-2753
2017-01-20 15:44:42 +00:00
Stephane Nicoll
93bc34c1eb Merge pull request #8039 from rafael-rollo:master
* pr/8039:
  Indenting SpringApplication javadoc code
2017-01-20 10:54:10 +01:00
Rafael Rollo
6fba1381c1 Indenting SpringApplication javadoc code
Closes gh-8039
2017-01-20 10:53:34 +01:00
Stephane Nicoll
2c5c539bf1 Document automatic scheduling of metrics export
Closes gh-8040
2017-01-20 10:52:55 +01:00
Stephane Nicoll
d9a0a55245 Upgrade to Spring AMQP 1.6.7.RELEASE
Closes gh-8033
2017-01-20 10:15:19 +01:00
Phillip Webb
b05bdbfe4f Polish 2017-01-19 12:31:43 -08:00
Andy Wilkinson
e04ace89b9 Fix LinkageError with ExpectedException and FilteredClassPathRunner
Previously, when the ExpectedException JUnit rule was used with
FilteredClassPathRunner a LinkageError would occur if any of
ExpectedException's methods that take a Hamcrest Matcher were called.
This was due to the FilteredClassLoader delegating loading of
org.junit classes to its parent but not org.hamcrest classes. This
resulted in JUnit classes loading one version of the Hamcrest class
and the test class loading another.

This commit ensures that both the JUnit classes and the test class
use the same version of Hamcrest classes by also delegating the
loading of org.hamcrest classes to FilteredClassLoader's parent.
2017-01-19 15:27:18 +00:00
Stephane Nicoll
9a9c4c75bf Merge pull request #8030 from michael-simons:fix-appendix-b
* pr/8030:
  Fix closing parentheses
2017-01-19 16:19:40 +01:00
Michael J. Simons
a852c49edd Fix closing parentheses
Closes gh-8030
2017-01-19 16:19:07 +01:00
Stephane Nicoll
ffa6d6d6e0 Improve error message used in TestDatabaseAutoConfiguration
By default, `@DataJpaTest` (and `@AutoConfigureTestDatabase`) attempt to
replace any existing `DataSource` by an embedded one. Previously, if
there is was no embedded database on the classpath, the exception message
did not provide that context in the error message.

This commit clarifies the error message to conduct
`TestDatabaseAutoConfiguration` (that is replacing the existing
`DataSource`).

Closes gh-7797
2017-01-19 16:13:49 +01:00
Andy Wilkinson
80a1e1ae64 Polishing 2017-01-19 11:03:18 +00:00
Andy Wilkinson
b7a02e7237 Update TestRestTemplate to apply template handler to URIs
Previously, TestRestTemplate would only apply the UriTemplateHandler
to Strings and not to URIs. When using the auto-configured
TestRestTemplate, this prevented relative URIs from being
made absolute using LocalHostUriTemplateHandler.

The commit updates TestRestTemplate to turn URIs into Strings before
passing them to the delegate RestTemplate. Turning them into Strings
ensures that the delegate calls the UriTemplateHandler.

Closes gh-7891
2017-01-19 10:39:02 +00:00
Andy Wilkinson
6a0fb8e44c Update DevTools' ResourceLoader to delegate to user's custom loader
Previously, when DevTools' was used it would set the application
context's ResourceLoader and overwrite any custom ResourceLoader that
had been configured. On the rare occasion when the user had customized
the ResourceLoader this meant that the customization was lost and
certain resources would become unavailable.

This commit updates DevTools' ResourceLoader to delegate a custom
ResourceLoader if one has been configured. If one has not been
configured it delegates as before, i.e. to
WebApplicationContextResourceLoader for web applications and to
DefaultResourceLoader for all others apps.

Closes gh-8010
2017-01-19 09:28:09 +00:00
Phillip Webb
b28d537c78 Disable unwanted m2e activations
Add m2e activation properties to disable unwanted Eclipse facets.
2017-01-18 13:48:49 -08:00
Stephane Nicoll
b242543545 Backport missing 3rd party starter reference 2017-01-18 16:34:11 +01:00
Stephane Nicoll
b7d3e91e38 Merge pull request #8014 from larsgrefer:patch-1
* pr/8014:
  Add OkHttp starter reference
2017-01-18 16:25:20 +01:00
Lars Grefer
f5d1b7807c Add OkHttp starter reference
Closes gh-8014
2017-01-18 16:24:23 +01:00
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.
2017-01-18 13:38:10 +00:00
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
2017-01-17 15:40:53 +00:00
Andy Wilkinson
a02c2d4155 Improve the documentation of Health.Status constants
Closes gh-7784
2017-01-17 14:59:53 +00:00
Andy Wilkinson
9695e0a9d1 Document breakpoint config for remote debug tunnel and IntelliJ IDEA
Closes gh-7732
See gh-5047
2017-01-17 14:43:38 +00:00
Andy Wilkinson
0463350d2e Document that spring(Profile|Property) cannot be used with scan=true
Closes gh-5611
2017-01-17 14:23:43 +00:00
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
2017-01-17 10:30:47 +00:00
Andy Wilkinson
7c2664f959 Ensure that jar entry names use forward slashes, even on Windows
Previously, in the DevTools integration tests, portions of a File's
path were used to create the name of a jar entry. On Windows this
resulted in the entry containing \ characters. As a result the
directory structure was incorrect and the classes could not be loaded
from the jar.

This commit ensures that any \ characters are replaced with /
characters.

See gh-7782
2017-01-16 20:42:04 +00:00
Andy Wilkinson
a72365e1a2 Expose context hierarchy in beans endpoint
Previously, the beans endpoint would only expose the context that
contained the endpoint. This commit updates the endpoint so that
the context that contains the endpoint and all of its ancestors are
exposed.

In a context hierarhcy, the relation ship is child -> parent and there
is no way to navigate from a parent to a child. As a result, any
contexts that are descendants of the context containing the endpoint
are not exposed.

Closes gh-5188
2017-01-16 11:47:14 +00:00
Stephane Nicoll
dbee44a6b5 Merge pull request #7997 from slaskawi:ISPN-6561/Infinispan_starters
* pr/7997:
  Add Infinispan starter reference
2017-01-16 10:44:14 +01:00
Sebastian Laskawiec
16de86f917 Add Infinispan starter reference
Closes gh-7997
2017-01-16 10:43:44 +01:00
Andy Wilkinson
7f492a56c2 Merge pull request #4902 from Karsten Sperling
* gh-4902:
  Test that double registration of ServletContextInitializers does not happen
  Avoid double-reg when a Servlet or Filter implements ServletContextInitializer
2017-01-16 04:00:20 -05:00
Andy Wilkinson
5158f6e5fc Test that double registration of ServletContextInitializers does not happen
Closes gh-4902
2017-01-16 03:59:53 -05:00
Karsten Sperling
600e74b6c9 Avoid double-reg when a Servlet or Filter implements ServletContextInitializer
See gh-4902
2017-01-16 03:59:53 -05:00
Stephane Nicoll
c04fd325f1 Merge pull request #7993 from vpavic:gh-7944
* pr/7993:
  Document use of `OpenEntityManagerInViewInterceptor`
2017-01-16 09:45:58 +01:00
Vedran Pavic
a7fce6b048 Document use of OpenEntityManagerInViewInterceptor
Closes gh-7993
2017-01-16 09:45:32 +01:00
Andy Wilkinson
f92719c4be Remove unwanted override of git-commit-id-plugin's version 2017-01-13 18:58:19 -05:00