Commit Graph

9646 Commits

Author SHA1 Message Date
Stephane Nicoll
a6f9e5b9fe Merge branch '1.5.x' 2016-11-28 10:42:04 +01:00
Stephane Nicoll
1e711d8f09 Merge branch '1.4.x' into 1.5.x 2016-11-28 10:41:48 +01:00
Stephane Nicoll
5e604437d7 Restore proper scope for spring-hateoas
Closes gh-7489
2016-11-28 10:41:34 +01:00
Stephane Nicoll
acb532f9d5 Merge branch '1.5.x' 2016-11-28 09:32:20 +01:00
Stephane Nicoll
0119c3a543 Fix metadata for spring.profiles.[include|active]
See gh-6995
2016-11-28 09:32:04 +01:00
Stephane Nicoll
e354576c09 Merge branch '1.5.x' 2016-11-28 09:05:41 +01:00
Stephane Nicoll
604d0cedd7 Merge pull request #7494 from izeye:validation
* pr/7494:
  Add ValidationAutoConfiguration to spring.factories
2016-11-28 09:04:56 +01:00
Johnny Lim
cabb564804 Add ValidationAutoConfiguration to spring.factories
Closes gh-7494
2016-11-28 09:04:36 +01:00
Andy Wilkinson
ec1cd44f02 Merge branch '1.5.x' 2016-11-25 11:18:58 +00:00
Andy Wilkinson
5236659a32 Add dependency management for spring-kafka-test
Closes gh-7485
2016-11-25 11:13:49 +00:00
Andy Wilkinson
e5e22af73e Merge branch '1.5.x' 2016-11-25 10:41:49 +00:00
Andy Wilkinson
3dcb2d5316 Merge branch '1.4.x' into 1.5.x 2016-11-25 10:41:41 +00:00
Andy Wilkinson
c6bdd136b1 Merge pull request #7271 from Aleksander Bartnikiewicz
* gh-7271:
  Test that a broken factory bean does not break resetting of mocks
  Prevent a broken factory bean from breaking the resetting of mocks
2016-11-25 10:41:20 +00:00
Andy Wilkinson
46e8cf4a43 Test that a broken factory bean does not break resetting of mocks
Previously, ResetMocksTestExecutionListener used getBean(name) to
retrieve each instantiated singleton. When the instantiated singleton
was a factory bean, this would cause getObject on the factory bean to
be called. If the factory bean was unable to produce its object, for
example due to test slicing excluding something, an exception would
be thrown.

The previous commit updated ResetMocksTestsExecutionListener to
use getSingleton(name) rather than getBean(name).  This will retrieve
the factory bean itself rather than causing the factory bean to
attempt to create an object. This commit updates the tests to verify
the new behaviour.

Closes gh-7270
2016-11-25 10:40:02 +00:00
Aleksander Bartnikiewicz
eb927f1b29 Prevent a broken factory bean from breaking the resetting of mocks
Closes gh-7271
2016-11-25 10:39:30 +00:00
Andy Wilkinson
4a10cfe112 Merge branch '1.5.x' 2016-11-25 10:24:43 +00:00
Andy Wilkinson
8757ca7785 Merge pull request #7175 from Phillip Johnson
* gh-7175:
  Document and test array support for spring.profiles.*
  Use data binding to access spring.profiles .active and .include
2016-11-25 10:24:34 +00:00
Phillip Johnson
f64d5303cf Document and test array support for spring.profiles.*
Closes gh-7175
Closes gh-6995
2016-11-25 10:24:14 +00:00
Andy Wilkinson
919d0c6172 Use data binding to access spring.profiles .active and .include
Previously, spring.profiles.active and spring.profiles.include were
looked up manually. This meant that configuration that used indexes
(for example spring.profiles.active[0]=dev) were not bound. As a
result, YAML lists did not work.

This commit updates ConfigFileApplicationListener to use a
RelaxedDataBinder to retrieve the values of spring.profiles.active
and spring.profiles.include, thereby reusing the data binding logic
that supports property names with indexes.

See gh-6995
2016-11-25 10:24:13 +00:00
Stephane Nicoll
2964e31186 Merge branch '1.5.x' 2016-11-25 11:18:17 +01:00
Stephane Nicoll
6e79521fff Expose skip property consistently
This commit makes sure that the `skip` command-line property can be used
for all goals of the maven plugin.

A dedicated sample for integration tests has also been added as this
change may confuse users, especially those who wish to skip a certain
goal and not the plugin execution altogether.

Closes gh-7313
2016-11-25 11:17:58 +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
Andy Wilkinson
e0d9352e80 Merge branch '1.5.x' 2016-11-24 20:59:43 +00:00
Andy Wilkinson
dce1487424 Merge branch '1.4.x' into 1.5.x 2016-11-24 20:57:34 +00:00
Andy Wilkinson
e19c6245ef Consider endpoints.sensitive when endpoints.health.sensitive is not set
Closes gh-7476
2016-11-24 20:57:29 +00: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
03ff6c5814 Merge branch '1.5.x' 2016-11-24 16:12:03 +01:00
Stephane Nicoll
25c4f0b5bb Merge branch '1.4.x' into 1.5.x 2016-11-24 16:11:51 +01:00
Stephane Nicoll
1f8281931d Merge pull request #7462 from kuhnroyal:gh-7460
* pr/7462:
  Polish contribution
  Fix undertow session persistence with spring-boot-devtools
2016-11-24 16:07:16 +01:00
Stephane Nicoll
4c61c9f26a Polish contribution
Closes gh-7462
2016-11-24 16:07:03 +01:00
Peter Leibiger
203b6f2f2c Fix undertow session persistence with spring-boot-devtools
Fixes gh-7460
2016-11-24 16:00:23 +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
c212f1078f Merge branch '1.5.x' 2016-11-24 15:31:55 +01:00
Stephane Nicoll
ca788a90e6 Merge branch '1.4.x' into 1.5.x 2016-11-24 15:31:40 +01:00
Stephane Nicoll
4bf645c615 AutoconfigureTestDatabase replace with a fresh database
Previously, two or more `@DataJpaTest` tests in the same test suite were
sharing the same in-memory database instance. This commit makes sure
that `TestDatabaseAutoConfiguration` creates a unique embedded database
for each test it operates on.

Closes gh-7473
2016-11-24 15:31:27 +01:00
Stephane Nicoll
e687d3aeba Merge branch '1.5.x' 2016-11-24 10:40:08 +01:00
Stephane Nicoll
c9fa1a1f70 Merge branch '1.4.x' into 1.5.x 2016-11-24 10:39:51 +01:00
Stephane Nicoll
0359b2f6f5 Document how to disable JMS transacted session
Closes gh-7463
2016-11-24 10:39:40 +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
Andy Wilkinson
15401a3078 Correct the version of spring-boot-junit-runners in dependencies pom 2016-11-23 20:42:30 +00:00
Stephane Nicoll
94542cee1f Merge branch '1.5.x' 2016-11-23 15:17:12 +01:00