Commit Graph

10856 Commits (53fcd5422e3fcc372952e2bc1e377557276e8478)
 

Author SHA1 Message Date
Andy Wilkinson 28f8e014da Merge branch '1.5.x' 8 years ago
Andy Wilkinson c2f4d027b4 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 9247cd9c36 Don't let standalone Tomcat render its error page after redirect
Previously, if the configured error controller responded with a
redirect to an error caused by an exception, standalone Tomcat would
render its default error page for the original exception. This
occurred because ErrorPageFilter sets the
javax.servlet.error.exception request attribute prior to dispatching
to the error controller and then does not clear it. As the request
unwinds, Tomcat's ErrorReportValve notices that the attribute is set
and renders an error page for the exception that is the attribute's
value.

This commit updates ErrorPageFilter to remove the
javax.servlet.error.exception and javax.servlet.error.exception_type
attributes upon successful completion of a forward to the error
controller. This prevents Tomcat from rendering an error page for
an exception that has already been handled by the error controller.

Closes gh-7920
8 years ago
Andy Wilkinson beecbe30b9 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 64b65e1fe5 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 30074431a7 Improve documentation of static resource reloading with devtools
Closes gh-5133
Closes gh-7886
8 years ago
Brian Clozel aeef41c977 Separate container customization from ServerProperties
This commit creates a separate
`ServerPropertiesServletContainerCustomizer` that holds the servlet
container customization code, separating that concern from the server
configuration keys.

See gh-8066
8 years ago
Stephane Nicoll 8899b93de0 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 45a91fca31 Fix parsing of spring.autoconfigure.exclude property
This commits makes sure that `AutoConfigureImportSelector` properly
parses comma separated lists that contain additional spaces.

Closes gh-8220
8 years ago
Andy Wilkinson 8e920075d0 Merge branch '1.5.x' 8 years ago
Andy Wilkinson e891fe0584 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 06017f688a Only auto-configure SpringSocialDialect for Thymeleaf 2
Previously, SocialWebAutoConfiguration would create a
SpringSocialDialect bean when SpringTemplateEngine was on the
classpath. This class exists in both Thymeleaf 2 and Thymeleaf 3 but
SpringSocialDialect is only compatible with Thymeleaf 2.

This commit updates the auto-configuration to require
SpringResourceResourceResolver to be on the classpath. This class
exists in Thymeleaf 2 but does not exist in Thymeleaf 3.

Closes gh-4858
8 years ago
Brian Clozel 12d883f6b9 Introduce "server.servlet" configuration prefix
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.

Closes gh-8066
8 years ago
Stephane Nicoll a31a792192 Merge branch '1.5.x' 8 years ago
Stephane Nicoll d42a54e880 Add explicit note about Mockito 2 in the documentation
Closes gh-8217
8 years ago
Stephane Nicoll 130e0808d0 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 570b0593a6 Document SMTP timeout settings
Closes gh-8213
8 years ago
Stephane Nicoll 008aef6142 Document @LiquibaseDataSource feature
Closes gh-8214
8 years ago
Stephane Nicoll f41801ee8c Narrow down ConditionalOnWebApplication
Use the new `type` attribute of `@ConditionalOnWebApplication` for the
configurations that have a hard dependency on the Servlet/MVC API.

See gh-8118
8 years ago
Stephane Nicoll 8e6f1218e1 Detect Reactive web applications
This commit improves `@ConditionalOnWebApplication` to specify the
requested web application type. By default, any web application will
match but it can also match only if a recactive (or servlet) web
application is present.

Closes gh-8118
8 years ago
Stephane Nicoll b2ec03cd4e Restore couchbase support
This commit effectively reverts the changes that were applied to
workaround the breakage in spring-data-couchbase.

Closes gh-8200
8 years ago
Stephane Nicoll 5f2bd1667b Merge branch '1.5.x' 8 years ago
Stephane Nicoll e88bda4682 Avoid extra space if condition is empty
Previously, if a builder was created with an empty condition, an extra
space was added before the message. This commit checks for this
particular case and adds a space only when necessary.

Closes gh-8218
8 years ago
Andy Wilkinson aa09dbbd79 Build against Social snapshots for better compatibility
The latest snapshots for Spring Social, Spring Social Facebook, and
Spring Social Twitter improve the compatibility with each other,
Spring Framework 5 and Thymeleaf 3.

See gh-6258
8 years ago
Andy Wilkinson 84be46a55f Merge branch '1.5.x' 8 years ago
Andy Wilkinson a1895336fb Merge pull request #8206 from Jack Stevenson
* gh-8206:
  Provide dependency management for HikariCP-java7
8 years ago
Jack Stevenson 549f90e996 Provide dependency management for HikariCP-java7
Closes gh-8206
8 years ago
Andy Wilkinson 218d05232e Merge branch '1.5.x' 8 years ago
Andy Wilkinson 4b0abc7afc Merge pull request #8199 from John Blum
* gh-8199:
  Upgrade to GemFire 8.2.2
8 years ago
John Blum d83ed7f3b3 Upgrade to GemFire 8.2.2
Closes gh-8201
8 years ago
Brian Clozel 8619d6a229 Rename EmbeddedServletContainer -> EmbeddedWebServer
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).

Fixes gh-8208
8 years ago
Andy Wilkinson 457d0414ea Make ConditionalOnBean a logical AND rather than an OR
Previously ConditionalOnBean was the inverse of
ConditionalOnMissingBean. This meant that the former was a logical OR
while the latter was a logical AND of the requiremnts declared via the
annotation's attributes.

This commit changes the logic for ConditionalOnBean so that it is now
a logical AND. A side-effect of this change is that more information
about what has and has not matched must be tracked during the
evaluation. This extra information is now used to provide more
informative messages in the condition evaluation report that indicate
exactly why @ConditionalOnBean or @ConditionalOnMissingBean did not
match.

Closes gh-5279
8 years ago
Brian Clozel 250a1601d7 Add WebApplicationType.REACTIVE type
This commit introduces a new variant of web applications: there are now
Servlet based and Reactive web applications.
The mere presence of `Servlet` and `ConfigurableWebApplicationContext`
classes is not enough to make a difference between those variants.
This is why the decision process is now the following:

* if `DispatcherHandler` is present but not `DispatcherServlet`, the
WebApplicationType is detected as REACTIVE
* if `DispatcherHandler` is present and `DispatcherServlet`, this is a
case where we consider that developers are using Spring MVC in
combination with the reactive web client. So WebApplicationType is
detected as SERVLET
* if `Servlet` and `ConfigurableWebApplicationContext` are present,
WebApplicationType is detected as SERVLET
* if none of the above match, WebApplicationType is NONE

Fixes gh-8017
8 years ago
Brian Clozel 0aaea05a4b Add Reactor Netty and WebFlux Starters
These starters bring the Spring WebFlux experience to Boot.
By default, the Reactor Netty web server is chosen.
8 years ago
Stephane Nicoll 3c6d630a62 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 519a03ccda Polish 8 years ago
Stephane Nicoll 8c31000efa Merge pull request #8204 from izeye:fix-test-20170206
* pr/8204:
  Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
8 years ago
Johnny Lim 09998d1155 Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
Closes gh-8204
8 years ago
Stephane Nicoll 6af6e8e31b Remove auto-configuration for ServerProperties
This commit removes `ServerProperties` and `ManagementServerProperties`
auto-configurations. Those properties objects are now created using
`@EnableConfigurationProperties` only.

Closes gh-8108
8 years ago
Stephane Nicoll e0c8e1f514 Ignore test until couchbase support is restored
The changes required to restore our Couchbase support are too involved
and we should hear from the data couchbase team first.

See gh-8200
8 years ago
Stephane Nicoll 1061afbe00 Reuse `ConfigurationProperties` bean defined in parent
This commit makes sure that if a `ConfigurationProperties` annotated bean
already exists in the parent context, a new one is not created in the
child anymore.

This makes sure that a single bean exists in a parent/child hierarchy if
`@EnableConfigurationProperties` is processed in both context on the same
class.

Closes gh-8187
8 years ago
Stephane Nicoll 98d2ed85e4 Fix broken build
Fix couchbase support until a solution is determined for
https://jira.spring.io/browse/DATACOUCH-279

See gh-8200
8 years ago
Stephane Nicoll e9029d223a Upgrade to Couchbase client 2.4.1
Closes gh-8203
8 years ago
Stephane Nicoll cfdc75d384 Merge branch '1.5.x' 8 years ago
Stephane Nicoll e9057354c2 Merge pull request #8198 from izeye:logical-and
* pr/8198:
  Use logical 'and' instead of bitwise 'and'
8 years ago
Johnny Lim 0adab8a2be Use logical 'and' instead of bitwise 'and'
Closes gh-8198
8 years ago
Stephane Nicoll b4858882f3 Merge pull request #8202 from jxblum:spring-boot-sample-cache-ux-improvements
* pr/8202:
  Polish contribution
  Improve spring-boot-sample-cache UX by using Maven profiles
8 years ago
Stephane Nicoll 4d7b03b002 Polish contribution
Closes gh-8202
8 years ago
John Blum 31ed70e1b8 Improve spring-boot-sample-cache UX by using Maven profiles
See gh-8202
8 years ago
Phillip Webb d8e1297eed Merge branch '1.5.x' 8 years ago