1254 Commits

Author SHA1 Message Date
Phillip Webb
64a2e8d67f Update copyright year for changed files 2019-03-11 22:15:36 -07:00
Phillip Webb
dd3e8154d9 Merge branch '2.1.x' 2019-03-11 22:15:19 -07:00
Phillip Webb
fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Andy Wilkinson
aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson
8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson
361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Stephane Nicoll
430571b37b Perform binding at creation time if possible
Previously, environment binding always happened in a post processor once
the bean has been created. Constructor binding requires to perform the
binding at creating time so this commit performs binding at creation
time if possible.

When this happens, a special `ConfigurationPropertiesBeanDefinition` is
created with a supplier that invokes the binder. To avoid a case where
a bean is processed twice, the post-processor now ignores any bean that
has already been bound to the environment.

Closes gh-8762

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
2019-03-08 15:50:44 +01:00
Andy Wilkinson
b8dff5fe17 Merge branch '2.1.x' 2019-03-07 10:20:29 +00:00
Andy Wilkinson
36cbd00853 Disable AssertJ's bare-named property accessor discovery
AssertJ includes a change in 3.12 that means that, by default, it now incorrectly
identifies some of the builder methods on CacheControl as accessor methods for its fields.
This commit restores the behaviour of 3.11 so that a method is only considered to be a
property accessor if a matches the Java bean naming conventions.

Closes gh-16145
2019-03-06 19:42:38 +00:00
Andy Wilkinson
0959698c32 Upgrade to Jersey 2.28
Closes gh-16114
2019-03-06 12:58:35 +00:00
Andy Wilkinson
d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Brian Clozel
ce9626d00f Disable JMX by default
This commit switches the default value for the `spring.jmx.enabled`
configuration property.
JMX is now disabled by default and can be enabled with
`spring.jmx.enabled=true`.

Closes gh-16090
2019-03-05 18:51:00 +01:00
Johnny Lim
f4786d7d2e Polish
Closes gh-16083
2019-03-04 15:19:57 +01:00
Dmytro Nosan
c0a458e9d0 Remove unused constructor argument
Closes gh-16059
2019-02-28 14:09:34 +01:00
Stephane Nicoll
d5448eb124 Polish "Add failure analyzer for Flyway's bootstrap failure"
Closes gh-16015
2019-02-28 13:46:04 +01:00
anand
96315372ef Add failure analyzer for Flyway's bootstrap failure
See gh-16015
2019-02-28 13:46:04 +01:00
Stephane Nicoll
2ad234b605 Adapt to breaking change in Spring Hateoas 2019-02-28 13:42:27 +01:00
Stephane Nicoll
554bff6145 Merge branch '2.1.x' 2019-02-27 15:19:37 +01:00
Stephane Nicoll
eebd906c8a Polish contribution
Closes gh-16047
2019-02-27 15:10:43 +01:00
Dan Zheng
2c4afb3bd8 Fix NamedParameterJdbcTemplate precedence with database migration tools
See gh-16047
2019-02-27 15:10:20 +01:00
Stephane Nicoll
715db153e3 Polish "Remove code deprecated in 2.1"
Closes gh-16013
2019-02-27 11:15:48 +01:00
Mehmed Baždar
246111cd84 Remove code deprecated in 2.1
See gh-16013
2019-02-27 10:08:48 +01:00
Andy Wilkinson
f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson
53326695ea Polish 2019-02-21 08:13:54 +00:00
Andy Wilkinson
de0c065625 Inject single-use configuration dependencies into bean methods
Closes gh-15751
2019-02-20 17:02:43 +00:00
Johnny Lim
55f5f2f910 Polish
Closes gh-15987
2019-02-19 09:14:40 +01:00
Stephane Nicoll
ddfdc48161 Merge branch '2.1.x' 2019-02-18 21:25:25 +01:00
Stephane Nicoll
42c246cacb Polish contribution
Closes gh-15984
2019-02-18 21:18:51 +01:00
isank
e546ed4834 Order TaskExecution auto-config before TaskScheduling auto-config
See gh-15984
2019-02-18 21:18:09 +01:00
Stephane Nicoll
fa49dfcaaf Add support for task scheduling shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Stephane Nicoll
d2cbf08f09 Polish "Add support for task executor shutdown related properties"
Closes gh-15951
2019-02-18 21:13:32 +01:00
Filip Hrisafov
3b47ba21a8 Add support for task executor shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Andy Wilkinson
add8c6f295 Align HypermediaAutoConfigurationTests with latest HATEOAS API changes
See gh-15939
2019-02-18 09:41:11 +00:00
Stephane Nicoll
71df2f311b Polish "Expose Tomcat AccessLog Max days property"
Closes gh-15954
2019-02-14 16:01:21 +01:00
Dmytro Nosan
596f0c28c0 Expose Tomcat AccessLog Max days property
See gh-15954
2019-02-14 16:01:21 +01:00
Stephane Nicoll
8939a7eec3 Merge branch '2.1.x' 2019-02-14 15:35:18 +01:00
Stephane Nicoll
f3e142cb7c Polish "Stop using imports from shaded dependencies"
Closes gh-15950
2019-02-14 15:34:03 +01:00
Michael Simons
de7812aa3a Stop using imports from shaded dependencies
See gh-15950
2019-02-14 15:34:03 +01:00
Andy Wilkinson
747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00:00
Andy Wilkinson
9fb0b97f96 Decorate test containers so tests are skipped without Docker
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Stephane Nicoll
3d6def9f81 Handle BatchMessagingMessageConverter with Kafka batch listeners
Closes gh-15942
2019-02-13 17:06:38 +01:00
Andy Wilkinson
18174a8e9e Polish "Add opt-in support for Neo4j-OGM native types"
See gh-15637
2019-02-13 15:04:54 +00:00
Michael Simons
af21b847a0 Add opt-in support for Neo4j-OGM native types
This includes tests for the autoconfiguration using that new property.
The test require the native types for Bolt and embedded in the test
scope, so the Neo4j-OGM native types have been added to managed
dependencies.

The enhanced autoconfiguration throws an
InvalidConfigurationPropertyValueException when native types cannot be
used due to missing dependencies or wrong transport mode.

See gh-15637
2019-02-13 14:38:44 +00:00
Andy Wilkinson
e924745bf8 Start building against Spring Data Moore M2 snapshots
See gh-15197
2019-02-13 11:26:37 +00:00
Andy Wilkinson
c41924f7d4 Merge branch '2.1.x' 2019-02-12 15:45:55 +00:00
Andy Wilkinson
ab8fcf0d71 Polish "Use class for @ConditionalOnClass"
See gh-15775
2019-02-12 15:45:05 +00:00
Johnny Lim
b423962c89 Use class for @ConditionalOnClass
See gh-15775
2019-02-12 15:45:00 +00:00
Andy Wilkinson
48e781181e Merge branch '2.1.x' 2019-02-12 14:15:20 +00:00
Andy Wilkinson
799ac24da1 Reinstate auto-config of RequestContextFilter with Jersey
Previously, the auto-configuration for both Jersey and WebMvc would auto-configure
a RequestContextFilter bean. In 2.1.0, this led to a startup failure due to the latter
attempting to override the bean defined by the former. In addition to the override there
were also problems with the order of the filter as Jersey uses -1 and MVC uses -105.

To avoid the above-described problems, the auto-configuration of the RequestContextFilter
was removed from JerseyAutoConfiguration in 2.1.1. Unfortunately, the broke
request-scoped beans for those using only Jersey.

This commit attempts to strike a better balance by reintroducing the auto-configuration
of RequestContextFilter in JerseyAutoConfiguration. It will back off if the user defines
their own filter or filter registration. WebMvcAutoConfiguration has been updated to
back off in the same manner. This leaves the potential for ordering problems, but they
are no worse than they were before. Furthermore, the user has the means to correct any
problems by using the various filter ordering properties that are provided for Jersey,
Spring Session, Spring Security, etc.

Closes gh-15376
2019-02-12 14:05:36 +00:00
Andy Wilkinson
db31e42751 Merge branch '2.1.x' 2019-02-12 09:58:21 +00:00