Commit Graph

9676 Commits

Author SHA1 Message Date
Stephane Nicoll
fcb405ebde Merge branch '1.5.x' 2016-11-29 10:04:49 +01:00
Stephane Nicoll
140379fc5a Fix Maven warnings 2016-11-29 10:03:49 +01:00
Stephane Nicoll
cb6a7b79fe Fix build failure 2016-11-29 10:03:30 +01:00
Phillip Webb
a055ef8614 Fix parent POM version following 1.5.x merge 2016-11-28 23:12:49 -08:00
Stephane Nicoll
9c374e7755 Merge branch '1.5.x' 2016-11-29 08:03:08 +01:00
Stephane Nicoll
06e44c71ec Merge branch '1.4.x' into 1.5.x 2016-11-29 08:02:50 +01:00
Stephane Nicoll
d89cf94397 Merge pull request #7510 from oscr:fix-redundant-tostring
* pr/7510:
  Remove redundant toString() invocation
2016-11-29 08:02:01 +01:00
Oscar Utbult
88b83a909c Remove redundant toString() invocation
Closes gh-7510
2016-11-29 08:01:27 +01:00
Phillip Webb
068a38fb2e Downgrade maven-assembly-plugin to 2.6
Downgrade `maven-assembly-plugin` from 3.0 to 2.6 since the later
version contains a bug that means `recompressZippedFiles` is not
respected.

See gh-7513
2016-11-28 21:02:20 -08:00
Phillip Webb
450ab28163 Merge branch '1.5.x' 2016-11-28 17:27:05 -08:00
Phillip Webb
d0c3ece0ea Merge pull request #7263 from dsyer/feature/custom-layout
* gh-7263-2:
  Add custom LayoutFactory sample
  Support custom fat jar layouts
  Rework Repacakger timeout code
2016-11-28 17:25:47 -08:00
Phillip Webb
8432c52369 Add custom LayoutFactory sample
Add a sample that shows how a custom LayoutFactory can be used with
both Maven and Gradle.

Closes gh-7263
2016-11-28 16:31:53 -08:00
Dave Syer
c6c6524b40 Support custom fat jar layouts
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.

See gh-7263
2016-11-28 16:31:53 -08:00
Phillip Webb
f5b03c81f3 Rework Repacakger timeout code
Pull up common timeout code into Repackager and remove the need for
custom subclasses.

See gh-7263
2016-11-28 16:15:39 -08:00
Phillip Webb
fe63c981f8 Merge branch '1.5.x' 2016-11-28 15:40:20 -08:00
Phillip Webb
dada7423b0 Polish 2016-11-28 15:40:08 -08:00
Phillip Webb
b4c3f4f504 Merge branch '1.5.x' 2016-11-28 15:37:43 -08:00
Phillip Webb
ec73144240 Fix warnings 2016-11-28 15:31:49 -08:00
Phillip Webb
5ed00b3501 Merge branch '1.4.x' into 1.5.x 2016-11-28 15:27:07 -08:00
Phillip Webb
9fdb563d5a Polish 2016-11-28 15:27:01 -08:00
Phillip Webb
357d072a60 Polish 2016-11-28 15:14:46 -08:00
Andy Wilkinson
4870349438 Merge branch '1.5.x' 2016-11-28 16:01:39 +00:00
Andy Wilkinson
2be554456e Introduce SearchStrategy.ANCESTORS as a replacement for .PARENTS
Closes gh-6763
2016-11-28 15:41:53 +00:00
Stephane Nicoll
a2803f4139 Merge branch '1.5.x' 2016-11-28 14:29:56 +01:00
Stephane Nicoll
5d876125de Refine validation auto-configuration
Checking for the presence of a `ValidationProvider` resource is
unfortunately not enough to trigger the validation auto-configuration.

If `hibernate-validator` is added on the classpath without a `javax.el`
implementation, the former will blow up on startup. So far this was a
pilot error so we didn't have to care about it. Now that we have an
auto-configuration that may lead to this error, we need to be extra
careful and check that scenario ourselves.

This commit adds an extra condition that runs as late as possible and
attempt to actually initialize a `Validator`. If that fails for whatever
reason, the auto-configuration will now back off.

Several additional tests have been added to exercise this scenario.

Closes gh-6228
2016-11-28 14:29:05 +01:00
Stephane Nicoll
4f7fffb127 Upgrade maven plugins to fix compatibility with JDK9
See gh-7226
2016-11-28 13:30:45 +01:00
Andy Wilkinson
4c01e940ea Merge branch '1.5.x' 2016-11-28 11:33:13 +00:00
Andy Wilkinson
50c39661ad Merge branch '1.4.x' into 1.5.x 2016-11-28 11:33:00 +00:00
Andy Wilkinson
491bd745de Document Jersey's package scanning limitations
Closes gh-7496
2016-11-28 11:32:48 +00:00
Stephane Nicoll
e15b3e463f Fix compatibility with JDK9
Cast runtime object retrieved reflectively to their public interface
counterpart.

See gh-7226
2016-11-28 11:30:34 +01:00
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