spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-26 20:09:02 +00:00
Code Issues Projects Releases Wiki Activity
10,401 Commits 28 Branches 395 Tags
5f4848cf216697f2fdbd91fcc57907db6509c2c1
Commit Graph
1829 Commits
Author SHA1 Message Date
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Johnny Lim acc36c076d Polish 
See gh-8004
 2017-01-17 09:53:50 +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
Stephane Nicoll a9399639a0 Merge branch '1.5.x' 2017-01-16 11:25:39 +01:00
Stephane Nicoll 8bef0a1e60 Polish contribution 
Closes gh-7905
 2017-01-16 11:24:36 +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
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
Stephane Nicoll cf30703fbe Merge branch '1.5.x' 2017-01-16 09:50:42 +01:00
Vedran Pavic caa9cdcc02 Fix Neo4j session documentation 
Closes gh-7994
 2017-01-16 09:50:12 +01:00
Vedran Pavic a7fce6b048 Document use of OpenEntityManagerInViewInterceptor 
Closes gh-7993
 2017-01-16 09:45:32 +01:00
Andy Wilkinson ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -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
Stephane Nicoll 5898a17807 Merge branch '1.5.x' 2017-01-10 09:30:21 -05:00
Stephane Nicoll 766816f600 Merge branch '1.4.x' into 1.5.x 2017-01-10 09:30:09 -05:00
drumonii bb5819b879 Fix configure a datasource reference doc link 
Closes gh-7911
 2017-01-10 09:29:35 -05:00
Andy Wilkinson ce2256d7dc Merge branch '1.5.x' 2017-01-10 09:13:37 -05:00
Andy Wilkinson db56e1cd00 Merge branch '1.4.x' into 1.5.x 2017-01-10 09:13:27 -05:00
Michael J. Simons 3c291150d6 Update springloaded version to 1.2.6.RELEASE in Maven-related docs 
Closes gh-7937
 2017-01-10 09:13:00 -05:00
Andy Wilkinson 891045880d Merge branch '1.5.x' 2017-01-10 09:10:36 -05:00
Andy Wilkinson 8934dfaecf Merge branch '1.4.x' into 1.5.x 2017-01-10 09:10:26 -05:00
Michael J. Simons ddca9a1687 Update springloaded version to 1.2.6.RELEASE in Gradle-related docs 
Closes gh-7937
 2017-01-10 09:08:35 -05:00
Stephane Nicoll a2bd186a78 Merge branch '1.5.x' 2017-01-09 14:09:55 -05:00
Kazuki Shimizu 0401ba8429 Fix heading level for kafka docs 
Closes gh-7915
 2017-01-09 14:08:54 -05:00
Stephane Nicoll d039e4a94f Merge branch '1.5.x' 2017-01-08 09:05:54 +01:00
Stephane Nicoll 49828d9377 Merge branch '1.4.x' into 1.5.x 2017-01-08 09:05:27 +01:00
Stephane Nicoll b9eda3f26b Document favicon support 
Closes gh-7903
 2017-01-08 09:04:53 +01:00
Stephane Nicoll 9afa52c18f Merge branch '1.5.x' 2017-01-06 12:45:20 +01:00
Stephane Nicoll 4523927e28 Polish 2017-01-06 12:44:32 +01:00
Stephane Nicoll 1efb0cbcdf Merge branch '1.5.x' 2017-01-06 11:50:19 +01:00
Stephane Nicoll 7d81de1469 Fix doc generation 
For some reason the documentation worked locally with 973a18d but does not
on CI.
 2017-01-06 10:36:29 +01:00
Stephane Nicoll dbb9a1bd20 Merge branch '1.5.x' 2017-01-06 10:13:20 +01:00
Stephane Nicoll 7a75fb0f38 Fix test-specific configuration metadata 
Most of the config keys defined by the `spring-boot-test-autoconfigure`
module can't be overridden because they are mapped with `@PropertyMapping`
on an annotation. It is confusing that such keys are exposed in content
assistance as using them will have no effect.

This commit removes the annotation processor from the build so that the
`@ConfigurationProperties` beans aren't processed anymore. Instead, manual
metadata is written for the two only keys that are effectively used in
regular configuration.

As a result, the `additional-spring-configuration-metadata` file has been
renamed to `spring-configuration-metadata` since nothing is processing it
anymore.

Closes gh-7887
 2017-01-06 10:12:57 +01:00
Stephane Nicoll 53accf920f Merge branch '1.5.x' 2017-01-06 09:44:33 +01:00
Stephane Nicoll 973a18db2a Fix javadoc generation 2017-01-06 09:44:18 +01:00
Phillip Webb c35454e5f4 Merge branch '1.5.x' 2017-01-05 23:40:58 -08:00
Phillip Webb 554f6c8714 Document LDAP support 
Add documentation for the LDAP support.

Closes gh-7733
 2017-01-05 23:37:12 -08:00
Phillip Webb 10de30ff11 Polish LDAP contribution 
See gh-7733
 2017-01-05 23:35:43 -08:00
Eddú Meléndez 6a84c369fd Add LDAP auto-configuration support 
Add auto-configuration support for spring-ldap and spring-data-ldap.

See gh-2645
See gh-7733
 2017-01-05 23:34:50 -08:00
Phillip Webb 6776ec2704 Merge branch '1.5.x' 2017-01-05 11:04:37 -08:00
Phillip Webb 565f75438e Polish 2017-01-05 11:04:07 -08:00
Stephane Nicoll 66a9d4e744 Merge branch '1.5.x' 2017-01-05 16:32:10 +01:00
Stephane Nicoll 615804ff34 Polish configuration keys documentation 2017-01-05 16:19:12 +01:00
Dave Syer 21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 2017-01-05 11:59:49 +00:00
Dave Syer fe344df9c5 Change default order of OAuth2 resource server filter chain 
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
 2017-01-05 11:58:36 +00:00
Stephane Nicoll 0cfc32e5a1 Merge branch '1.5.x' 2017-01-05 12:25:19 +01:00
Vedran Pavic 6eea679535 Add LoggersEndpoint to application properties appendix 
Closes gh-7877
 2017-01-05 12:24:48 +01:00