Commit Graph

2188 Commits

Author SHA1 Message Date
Stephane Nicoll
e354576c09 Merge branch '1.5.x' 2016-11-28 09:05:41 +01:00
Johnny Lim
cabb564804 Add ValidationAutoConfiguration to spring.factories
Closes gh-7494
2016-11-28 09:04:36 +01:00
Stephane Nicoll
e81f7d5811 Remove deprecated code
See gh-7362
2016-11-25 10:10:55 +01:00
Stephane Nicoll
f260cd9a07 Merge branch '1.5.x' 2016-11-25 10:10:17 +01:00
Stephane Nicoll
0befc310cd Add dedicated settings for maxHttpPostSize
This commit deprecates `server.max-http-post-size` and introduces a
dedicated property for each supported  container. In particular, Undertow
can now define a max size higher than 2GB.

Closes gh-7362
2016-11-25 09:54:10 +01:00
Stephane Nicoll
3bfbbeb9f4 Merge branch '1.5.x' 2016-11-24 17:44:17 +01:00
Stephane Nicoll
22208f6a9e Auto-configure validation constraints on bean methods
This commit auto-configures `MethodValidationPostProcessor` if necessary
when a JSR-303 validator implementation is detected on the classpath.

Closes gh-6228
2016-11-24 17:40:33 +01:00
Stephane Nicoll
fd62707cbb Merge branch '1.5.x' 2016-11-24 16:46:52 +01:00
Stephane Nicoll
7e25c0dcdd Fix build 2016-11-24 16:46:34 +01:00
Stephane Nicoll
c62f340c34 Merge branch '1.5.x' 2016-11-24 15:53:51 +01:00
Stephane Nicoll
57605b6749 Merge branch '1.4.x' into 1.5.x 2016-11-24 15:53:38 +01:00
Stephane Nicoll
65b6d8f4f7 Handle NoClassDefFoundError in OnBeanCondition
If `OnBeanCondition` is used with a `String` literal representing the
fully qualified name of a bean and such type does not exist, it
gracefully manages it as if it was not found. Prior to this commit, an
exception would be thrown if any related class such as the parent
class does not exist.

This commit handles this additional case, catching `NoClassDefFoundError`
the same way it did handle `ClassNotFoundException`. That way, a
missing type will now be considered as absent if it's not on the
classpath.

Closes gh-7459
2016-11-24 15:48:56 +01:00
Stephane Nicoll
662b05b90c Merge branch '1.5.x' 2016-11-24 10:01:53 +01:00
Stephane Nicoll
64a50b60ab Merge branch '1.4.x' into 1.5.x 2016-11-24 10:01:23 +01:00
Stephane Nicoll
5e8ba5cef6 Fix Couchbase condition on Spring Data class
This commit reverts 7e2d0fd so that the Couchbase auto-configuration can
work without Spring Data again. It also removes the `Class` reference to
a Spring Data class to a `String` reference to make sure the condition
operates properly when said class isn't on the classpath.

Closes gh-7453
2016-11-24 09:41:19 +01:00
Stephane Nicoll
94542cee1f Merge branch '1.5.x' 2016-11-23 15:17:12 +01:00
Stephane Nicoll
64e0899456 Polish customize Cassandra's Cluster
Closes gh-7320
2016-11-23 15:16:49 +01:00
Eddú Meléndez
cb3d14a305 Allow to customize Casssandra's Cluster
This commit allows to configure special customizers to be used by
Cluster.

Closes gh-7312
2016-11-23 15:16:49 +01:00
Stephane Nicoll
2f57e1885a Merge branch '1.5.x' 2016-11-23 14:40:29 +01:00
Stephane Nicoll
ea023618a4 Polish upgrade to Spring Session 1.3.0.RC1
Closes gh-7457
2016-11-23 14:39:56 +01:00
Vedran Pavic
ffec6fddd2 Upgrade Spring Session to 1.3.0.RC1
See gh-7457
2016-11-23 14:39:56 +01:00
Phillip Webb
e0dfff2b23 Merge branch '1.5.x' 2016-11-22 14:54:17 -08:00
Phillip Webb
88c84ce234 Merge branch '1.4.x' into 1.5.x 2016-11-22 14:53:30 -08:00
Phillip Webb
b6b8bef009 Polish 2016-11-22 14:51:56 -08:00
Phillip Webb
7e2d0fd1c0 Check for Spring Data before configuring Couchbase
Add guard to `CouchbaseAutoConfiguration` so ensure that Spring Data
Couchbase is on the classpath.

Fixes gh-7453
2016-11-22 14:32:38 -08:00
Grigory Fadeev
1ea829e003 Fix connector used to configure connection timeout
Fix Tomcat customization so that the main connection is configured with
any timeout.

Closes gh-7425
2016-11-22 14:28:57 -08:00
Andy Wilkinson
8d589b9a05 Merge branch '1.5.x' 2016-11-22 14:38:07 +00:00
Andy Wilkinson
65d0c07fd6 Polish "Validate excluded autoconfiguration classes"
- Apply code formatting
- Move configuration of excepted exception to immediately before line
  that will throw the exception
- Use String.format with %n to produce platform-specific new lines

See gh-7407
2016-11-22 14:10:37 +00:00
Madhura Bhave
a9ffdca6f2 Validate excluded autoconfiguration classes
Closes gh-7407
See gh-6865
2016-11-22 14:02:51 +00:00
Andy Wilkinson
0b94d71671 Merge branch '1.5.x' 2016-11-22 11:35:20 +00:00
Andy Wilkinson
ff4bbd9291 Fix javadoc and apply code formatting to Kafka contribution
See gh-6961
2016-11-22 11:34:29 +00:00
Andy Wilkinson
9e4fea5f54 Merge branch '1.5.x' 2016-11-22 11:03:11 +00:00
Andy Wilkinson
29f0ae3fa8 Use a random port in new tests in SpringBootWebSecurityConfigurationTests
See gh-7373
2016-11-22 11:03:05 +00:00
Stephane Nicoll
e3688455fa Merge branch '1.5.x' 2016-11-22 10:30:31 +01:00
Stephane Nicoll
cc07f56c87 Merge pull request #6961 from garyrussell:kafkaAutoConfig
* pr/6961:
  Polish "Apache Kafka support" contribution
  Add Apache Kafka support
2016-11-22 10:29:01 +01:00
Stephane Nicoll
642af52d01 Polish "Apache Kafka support" contribution
Closes gh-6961
2016-11-22 10:22:00 +01:00
Gary Russell
c4188c8e4a Add Apache Kafka support
See gh-6961
2016-11-22 09:34:01 +01:00
Andy Wilkinson
bbf6fee446 Merge branch '1.5.x' 2016-11-21 13:35:35 +00:00
Andy Wilkinson
5a9fc9aa49 Merge branch '1.4.x' into 1.5.x 2016-11-21 13:35:22 +00:00
Andy Wilkinson
3464c0b16e Ensure that Hypermedia-related auto-config works without Jackson
Previously, both HypermediaAutoConfiguration and HttpMessageConverters
assumed that if Spring HATEOAS was on the class path, then Jackson
would be too. When this was not the case, an application would fail
to start.

This commit updates both classes to back off appropriately when
Spring HATEOAS is on the classpath but Jackson is not.

Closes gh-7434
2016-11-21 13:25:25 +00:00
Stephane Nicoll
77bef0536f Merge branch '1.5.x' 2016-11-20 15:53:04 +09:00
Stephane Nicoll
9423b9831c Merge branch '1.4.x' into 1.5.x 2016-11-20 15:52:49 +09:00
Stephane Nicoll
249ed899a6 Fix use of KB and MB in Multipart documentation
Closes gh-7364
2016-11-20 15:51:47 +09:00
Phillip Webb
20d7dd5747 Merge branch '1.5.x' 2016-11-18 17:30:03 -08:00
Phillip Webb
1657120286 Move ModifiedClassPathRunner to its own module
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
2016-11-18 17:27:54 -08:00
Phillip Webb
9e18021e8c Merge branch '1.4.x' into 1.5.x 2016-11-18 15:59:05 -08:00
Phillip Webb
fce17ca6d9 Polish 2016-11-18 15:50:19 -08:00
Andy Wilkinson
9273b1789b Merge branch '1.5.x' 2016-11-18 16:41:22 +00:00
Andy Wilkinson
1cd781b242 Make spring-boot-test compatible with Mockito 2.1 and 2.2
We use some internal Mockito classes and some  breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.

To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.

Closes gh-6520
2016-11-18 16:39:44 +00:00
Andy Wilkinson
ae8ad454b3 Merge branch '1.5.x' 2016-11-18 11:26:08 +00:00