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
Stephane Nicoll
cf30703fbe
Merge branch '1.5.x'
2017-01-16 09:50:42 +01:00
Stephane Nicoll
6064eda6c6
Merge pull request #7994 from vpavic:fix-docs
...
* pr/7994:
Fix Neo4j session documentation
2017-01-16 09:50:31 +01:00
Vedran Pavic
caa9cdcc02
Fix Neo4j session documentation
...
Closes gh-7994
2017-01-16 09:50:12 +01: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
Stephane Nicoll
e4876eb666
Merge branch '1.5.x'
2017-01-15 09:46:07 +01:00
Stephane Nicoll
de912c4c50
Merge pull request #7914 from kazuki43zoo:allow-lowercase-on-logger-endpoint
...
* pr/7914:
Polish contribution
Allow lowercase logger level on MVC endpoint
2017-01-15 09:45:56 +01:00
Stephane Nicoll
f21c767356
Polish contribution
...
Closes gh-7914
2017-01-15 09:45:32 +01:00
Kazuki Shimizu
a6756c9ed3
Allow lowercase logger level on MVC endpoint
...
See gh-7914
2017-01-15 09:42:40 +01:00
Stephane Nicoll
752a91c75b
Merge branch '1.5.x'
2017-01-14 04:36:47 -05:00
Stephane Nicoll
de1d450af7
Merge pull request #7916 from pravsingh:readmeFix
...
* pr/7916:
Polish contribution
Polish samples list in readme
2017-01-14 04:36:27 -05:00
Stephane Nicoll
7e557662a5
Polish contribution
...
Closes gh-7916
2017-01-14 04:35:58 -05:00
Praveendra Singh
36de58f0fe
Polish samples list in readme
...
See gh-7916
2017-01-14 04:34:10 -05:00
Andy Wilkinson
1d589fc55a
Merge branch '1.5.x'
2017-01-13 18:58:46 -05:00
Andy Wilkinson
7423ce5e5c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:58:40 -05:00
Andy Wilkinson
f92719c4be
Remove unwanted override of git-commit-id-plugin's version
2017-01-13 18:58:19 -05:00
Andy Wilkinson
db70252102
Merge branch '1.5.x'
2017-01-13 18:50:51 -05:00
Andy Wilkinson
9b184e3955
Polishing
2017-01-13 18:47:43 -05:00
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
Andy Wilkinson
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 15:36:06 -05:00
