Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
2973d3ed4b Polishing 2017-01-17 14:35:30 +00:00
Andy Wilkinson
467350a65d Merge branch '1.5.x' 2017-01-17 14:27:02 +00:00
Andy Wilkinson
ed18478054 Give FileWritingMessageHandler more time to sort itself out
See 3927dca3
2017-01-17 14:26:14 +00:00
Andy Wilkinson
5d84c4246b Merge branch '1.5.x' 2017-01-17 14:25:43 +00:00
Andy Wilkinson
c71abbf6cd Merge branch '1.4.x' into 1.5.x 2017-01-17 14:25:33 +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
3fd597481f Merge branch '1.5.x' 2017-01-17 13:19:31 +00:00
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
2017-01-17 13:17:32 +00:00
Andy Wilkinson
f87e8d1def Merge branch '1.5.x' 2017-01-17 12:25:12 +00:00
Andy Wilkinson
8666248d27 Polishing 2017-01-17 12:25:01 +00:00
Andy Wilkinson
1ad7a66f03 Merge branch '1.5.x' 2017-01-17 11:53:14 +00:00
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.
2017-01-17 11:48:57 +00:00
Andy Wilkinson
5f4848cf21 Merge branch '1.5.x' 2017-01-17 10:39:16 +00:00
Andy Wilkinson
6cab03de0b Merge branch '1.4.x' into 1.5.x 2017-01-17 10:39:09 +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
Stephane Nicoll
f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Stephane Nicoll
5b7292212f Merge pull request #8001 from kazuki43zoo:improve-log
* pr/8001:
  Prevent unnecessary debug log message creation
2017-01-17 09:57:42 +01:00
Kazuki Shimizu
bd6ae47d68 Prevent unnecessary debug log message creation
Closes gh-8001
2017-01-17 09:57:15 +01:00
Stephane Nicoll
75438ff1a9 Merge pull request #8004 from izeye:polish-20170117
* pr/8004:
  Polish contribution
  Polish
2017-01-17 09:56:18 +01:00
Stephane Nicoll
d556e82cf7 Polish contribution
Closes gh-8004
2017-01-17 09:56:05 +01:00
Johnny Lim
acc36c076d Polish
See gh-8004
2017-01-17 09:53:50 +01:00
Andy Wilkinson
8f201d6de5 Merge branch '1.5.x' 2017-01-16 20:42:42 +00:00
Andy Wilkinson
69e7e31b1c Merge branch '1.4.x' into 1.5.x 2017-01-16 20:42:40 +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
Stephane Nicoll
7f16a36c59 Merge branch '1.5.x' 2017-01-16 18:07:18 +01:00
Stephane Nicoll
a5d67b9be8 Upgrade to Git Commit ID Plugin 2.2.2
Closes gh-7980
2017-01-16 18:06:18 +01:00
Stephane Nicoll
f714b1d4be Merge branch '1.5.x' 2017-01-16 16:09:48 +01:00
Stephane Nicoll
ada441bccc Allow custom override of user info OAuth2RestTemplate
Closes gh-5996
2017-01-16 16:09:32 +01:00
Andy Wilkinson
9a4b6a90ae Merge branch '1.5.x' 2017-01-16 11:47:59 +00:00
Andy Wilkinson
f72799186e Merge branch '1.4.x' into 1.5.x 2017-01-16 11:47:52 +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
a9399639a0 Merge branch '1.5.x' 2017-01-16 11:25:39 +01:00
Stephane Nicoll
ad77b655aa Merge pull request #7905 from eddumelendez:ldap_actuator
* pr/7905:
  Polish contribution
  Add LDAP health actuator
2017-01-16 11:25:23 +01:00
Stephane Nicoll
8bef0a1e60 Polish contribution
Closes gh-7905
2017-01-16 11:24:36 +01:00
Eddú Meléndez
b2250f4ad8 Add LDAP health actuator
Provide specific health actuator endpoint to verify if LDAP connection
is valid.

See gh-7905
2017-01-16 10:56:49 +01:00
Stephane Nicoll
85c66aedb7 Merge branch '1.5.x' 2017-01-16 10:46:36 +01:00
Stephane Nicoll
db99ed843e Remove LDAP 3rd party starter reference
Spring Boot provides now a LDAP starter based on this work so this
reference is no longer needed.
2017-01-16 10:46:19 +01:00
Stephane Nicoll
c72e61cbcd Merge branch '1.4.x' into 1.5.x 2017-01-16 10:44:32 +01: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
Stephane Nicoll
87cf236aae Merge branch '1.5.x' 2017-01-16 10:41:56 +01:00
Stephane Nicoll
3e05329fd7 Order internal RepositoryRestConfigurer
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.

Closes gh-7981
2017-01-16 10:41:44 +01:00
Stephane Nicoll
d271b54f63 Merge branch '1.5.x' 2017-01-16 10:08:55 +01:00
Stephane Nicoll
ddf1408679 Merge pull request #7995 from vpavic:improve-logging
* pr/7995:
  Improve `UserInfoTokenServices` logging
2017-01-16 10:08:37 +01:00
Vedran Pavic
8f6a0e96fd Improve UserInfoTokenServices logging
Closes gh-7995
2017-01-16 10:08:28 +01:00
Andy Wilkinson
d477223d77 Merge branch '1.5.x' 2017-01-16 04:01:03 -05:00
Andy Wilkinson
89e3335ca1 Merge branch '1.4.x' into 1.5.x 2017-01-16 04:00:39 -05: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