Commit Graph

6453 Commits

Author SHA1 Message Date
Stephane Nicoll
e6588dbf70 Make LOGGING_SYSTEM_BEAN_NAME public
Since the `LoggingSystem` may be retrieved very early during the context
initialization, we should do a lookup by name even if only one instance
of that bean is ultimately expected in the context.

The constant defining the bean name is now public to ease that use case.

Closes gh-4584
2015-11-27 15:53:40 +01:00
Stephane Nicoll
5284cbd084 Merge branch '1.2.x' 2015-11-27 15:37:10 +01:00
Stephane Nicoll
1ab05326a9 Upgrade to Spring Social 1.1.4.RELEASE 2015-11-27 15:33:10 +01:00
Stephane Nicoll
d883f647ba Add test coverage for WebApplicationContextUtils
See gh-4370
2015-11-27 15:22:29 +01:00
Stephane Nicoll
43b8e65eee Add dedicated section for spring.main.banner-mode
One of the options of the new `banner-mode` property is `off`. YAML maps
`off` to `false` and since we are exposing the method from the
`SpringApplication` public class we can't change the signature to accept
a `String` and do the conversion ourselves.

This commit adds a dedicated section in the guide to warn users about
that particular situation. Adding quotes around the value prevents the
conversion.

Closes gh-4600
2015-11-27 14:04:58 +01:00
Dave Syer
4488bac4c3 Remove server.context-path from actuator endpoints if port set
If the user sets the management.port, he wants some of the
server.* properties, but not the context-path. This change
restores the behaviour in 1.2.x.

Fixes gh-4401
2015-11-27 12:49:43 +00:00
Dave Syer
dd7d587ea8 Add tests to assert behaviour of actuator endpoints with context path
See gh-4401
2015-11-27 12:49:43 +00:00
Dave Syer
7d04ca1e1b Add tests to assert behaviour of actuator endpoints with context path
See gh-4401
2015-11-27 10:56:04 +00:00
Stephane Nicoll
77190f126a Create dedicated section for property conversion
See gh-4604
2015-11-27 11:42:23 +01:00
Dave Syer
cccc3867eb Allow users to customize authentication entry point in OAuth2 SSO
The SsoSecurityConfigurer that gets added when a user has a custom
WebSecurityConfigurer with @EnableOAuth2Sso is quite opinionated, and
this is preventing users from custimizing the exception handling in the
customized UI security. This change makes it less opinionated, using
request matchers to configure the default instead of ovewriting the
single authentication entry point.

Also adds an entry point responding with a 401 for XHR clients (just like
the vanilla HTTP Basic auth).

Fixes gh-4629
2015-11-27 10:36:29 +00:00
Stephane Nicoll
e19d9ff09d Fix gradle config for the bootRun task
Closes gh-4627
2015-11-27 10:23:12 +01:00
Stephane Nicoll
141907c65f Merge branch '1.2.x'
# Conflicts:
#	spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
#	spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
2015-11-26 20:25:00 +01:00
Stephane Nicoll
ae13082e0d Generate meta-data for nested Lombok types
Closes gh-4397
2015-11-26 20:23:24 +01:00
Stephane Nicoll
89aba8b3d8 Merge branch '1.2.x' 2015-11-26 16:59:12 +01:00
Stephane Nicoll
8ede966708 Harmonize java.mail dependency management
Closes gh-4588
2015-11-26 16:58:47 +01:00
Stephane Nicoll
9c412232d5 Improve log message with active profiles
Closes gh-4612
2015-11-26 16:25:52 +01:00
Stephane Nicoll
1ff070f6e9 Fix broken build 2015-11-26 16:23:48 +01:00
Stephane Nicoll
091478e0fd Disable ehcache statistics if necessary
`EhCacheStatisticsProvider` uses the `StatisticsGateway` API introduced
in ehcache 2.7 (march 2013). If an older ehcache version is present, we
should back-off as this class is not available.

Closes gh-4621
2015-11-26 16:15:29 +01:00
Dave Syer
d6a424f94c Add support for UTF-8 in application.properties
Fixes gh-4622
2015-11-26 15:09:50 +00:00
Stephane Nicoll
9a60f740b0 Merge pull request #4617 from eddumelendez/mybatis-doc
* pr/4617:
  Add reference to mybatis-spring-boot project
2015-11-26 09:56:53 +01:00
Eddú Meléndez
74654f4877 Add reference to mybatis-spring-boot project
Closes gh-4617
2015-11-26 09:56:36 +01:00
Stephane Nicoll
a414ba8f9d Merge branch '1.2.x' 2015-11-25 09:55:56 +01:00
Stephane Nicoll
e5ea0252cd Upgrade to commons-collections 3.2.2
Closes gh-4520
2015-11-25 09:55:44 +01:00
Stephane Nicoll
ccd9feae97 Merge pull request #4608 from jadekler/batch_config_public
* pr/4608:
  BasicBatchConfigurer is public again
2015-11-25 09:52:06 +01:00
Jean de Klerk
91a10e12b6 BasicBatchConfigurer is public again
Closes gh-4533
Closes gh-4608
2015-11-25 09:51:33 +01:00
Stephane Nicoll
095e7291d8 Merge branch '1.2.x' 2015-11-23 10:45:10 +01:00
Stephane Nicoll
d9f09e46f8 Cherry-pick 398d06e
Fixed initially in #3725

The target attribute is effectively checked for null beforehand so this
additional defensive check can be removed.

Closes gh-4567
2015-11-23 10:43:44 +01:00
Stephane Nicoll
0c387a82b7 Add datasource meta-data for Commons DBCP2
Closes gh-4562
2015-11-23 10:41:56 +01:00
Stephane Nicoll
e57244d8bc Merge branch '1.2.x' 2015-11-23 09:42:27 +01:00
Dimitri
c605675b7a Fix wrong class reference
Closes gh-4551
2015-11-23 09:41:34 +01:00
Stephane Nicoll
67c75bb6bc Merge pull request #4571 from mkopylec/master
* pr/4571:
  Add ref to reCAPCTHA Spring Boot Starter
2015-11-22 14:10:31 +01:00
Mariusz Kopylec
51f352e8ba Add ref to reCAPCTHA Spring Boot Starter
Closes gh-4571
2015-11-22 14:09:53 +01:00
Stephane Nicoll
58b84936cf Merge pull request #4572 from izeye/polish-20151121
* pr/4572:
  Polish
2015-11-21 08:26:10 +01:00
Johnny Lim
8ec00c35bf Polish
Closes gh-4572
2015-11-21 08:12:21 +01:00
Stephane Nicoll
31d7ebc96e Merge pull request #4554 from izeye/polish-20151119
* pr/4554:
  Polish
2015-11-20 11:02:23 +01:00
Johnny Lim
efff4a0051 Polish
Closes gh-4554
2015-11-20 11:02:08 +01:00
Stephane Nicoll
30791599a5 Merge pull request #4561 from vpavic/update-docs
* pr/4561:
  Fix incorrect default value for executable flag
2015-11-20 10:52:31 +01:00
Vedran Pavic
fc868155ff Fix incorrect default value for executable flag
Closes gh-4561
2015-11-20 10:51:58 +01:00
Dave Syer
8708a07a98 Ensure RestTemplate interceptors remain mutable
Fixes gh-4553
2015-11-19 10:01:38 +00:00
Stephane Nicoll
3dda029c64 Merge pull request #4537 from izeye/polish-20151118
* pr/4537:
  Polish
2015-11-19 09:49:53 +00:00
Johnny Lim
36ed0f5c20 Polish
Closes gh-4537
2015-11-19 09:49:33 +00:00
Stephane Nicoll
6146817ba3 Polish 2015-11-18 12:36:41 +00:00
Andy Wilkinson
ea8107b6a5 Merge branch '1.2.x' 2015-11-18 11:55:27 +00:00
Stephane Nicoll
dd4b9b1788 Merge pull request #4509 from izeye/else
* pr/4509:
  Add missing else statement
2015-11-18 11:42:17 +00:00
Johnny Lim
fde70909ce Add missing else statement
Closes gh-4509
2015-11-18 11:41:37 +00:00
Stephane Nicoll
5d8410f694 Merge pull request #4503 from izeye/polish-20151116
* pr/4503:
  Polishing
2015-11-18 11:40:45 +00:00
Johnny Lim
da16d6d306 Polishing
Closes gh-4503
2015-11-18 11:40:19 +00:00
Stephane Nicoll
d4a7c09b4e Polish 2015-11-18 11:21:23 +00:00
Andy Wilkinson
2fe0819495 Isolate multiple Undertow deployments
Previously, UndertowEmbeddedServletContainerFactory always used
Undertow’s default ServletContainer. This meant that if there were two
UndertowEmbeddedServletContainers created, they would share the same
ServletContainer and the second one that was created would overwrite
the deployment for the first. This resulted in a async request
handling failing as the attempt to look up the deployment for the
first embedded Undertow instance would incorrectly find the deployment
for the second.

This commit fixes the problem by ensuring that each 
UndertowEmbeddedServletContainerFactory uses a separate Undertow
ServletContainer instance.

Closes gh-4329
2015-11-17 18:04:22 +00:00
Stephane Nicoll
169fd53976 Fix typo
Closes gh-4515
2015-11-17 10:23:23 +00:00