Stephane Nicoll
ffe994335e
Merge branch '1.5.x' into 2.0.x
2018-07-16 14:12:16 +02:00
Johnny Lim
f2cef87878
Fix since on JdbcOperationsDependsOnPostProcessor
...
Closes gh-13778
2018-07-16 10:50:55 +02:00
Johnny Lim
068e22d60b
Polish
...
See gh-13776
2018-07-16 10:34:00 +02:00
Johnny Lim
4314dc2972
Remove a List creation in CompositePropertySources.iterator()
...
Closes gh-13774
2018-07-16 10:20:49 +02:00
Stephane Nicoll
e6ea28dec5
Polish
2018-07-13 09:36:37 +02:00
Johnny Lim
13202eb278
Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
...
Closes gh-13706
2018-07-13 09:35:34 +02:00
Stephane Nicoll
174cc2bc4e
Merge branch '1.5.x' into 2.0.x
2018-07-13 09:25:42 +02:00
dreis2211
ac8eebfbad
Fix typos
...
Closes gh-13762
2018-07-13 07:54:03 +02:00
Stephane Nicoll
19709f7dea
Polish
2018-07-12 16:57:52 +02:00
Madhura Bhave
d7822ba135
Update copyright header for modified files
2018-07-11 15:25:39 -07:00
Madhura Bhave
c8c32cfa33
Migrate tests to ApplicationContextRunner
2018-07-11 15:06:36 -07:00
Andy Wilkinson
cced3514a7
Polish
2018-07-11 17:49:10 +01:00
Andy Wilkinson
c489c6c5f6
Polish test following forward merge
2018-07-11 17:13:45 +01:00
Andy Wilkinson
67dfa0a720
Merge branch '1.5.x' into 2.0.x
2018-07-11 16:51:43 +01:00
Andy Wilkinson
44273ee093
Merge branch '1.5.x' into 2.0.x
2018-07-11 14:38:49 +01:00
Stephane Nicoll
48819253eb
Fix dependency order between JdbcTemplate and database migration tools
...
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.
This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.
Closes gh-13155
2018-07-11 11:23:44 +02:00
Stephane Nicoll
331775d6c0
Document latest version of gradle-git-properties plugin
...
Closes gh-13747
2018-07-11 10:13:41 +02:00
Johnny Lim
f94ce495d8
Fix parameter order for RequestMatcherAssert.doesNotMatch()
...
Closes gh-13707
2018-07-10 11:36:47 -07:00
Stephane Nicoll
177c54d441
Migrate JdbcTemplateAutoConfiguration tests to context runner
2018-07-10 19:45:20 +02:00
Stephane Nicoll
3423c5dddb
Detect DispatcherServlets registered via ServletRegistrationBean
...
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.
This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.
Closes gh-13186
2018-07-10 17:06:36 +02:00
Johnny Lim
46e6aa5963
Fix query string encoding in TraceableHttpServletRequest
...
Closes gh-13545
2018-07-10 15:56:10 +02:00
Johnny Lim
0de8317979
Separate logging from getUrlMappings()
...
Closes gh-13710
2018-07-10 15:27:43 +02:00
Andy Wilkinson
57e2bb9c6a
Merge branch '1.5.x' into 2.0.x
2018-07-10 10:27:28 +01:00
Madhura Bhave
4e7719f1c7
Fix typo
2018-07-09 14:15:19 -07:00
Andy Wilkinson
9eb5c9bd18
Merge branch '1.5.x' into 2.0.x
2018-07-09 13:39:11 +01:00
Stephane Nicoll
44b9aa168e
Polish "Improve description of Endpoint exclude"
...
Closes gh-13619
2018-07-09 13:20:43 +02:00
Miguel Gomes
838e6cdbbb
Improve description of Endpoint exclude
...
See gh-13619
2018-07-09 13:12:13 +02:00
Johnny Lim
ab6adc8265
Polish
...
Closes gh-13616
2018-07-09 10:45:01 +02:00
Andy Wilkinson
809e30506f
Merge branch '1.5.x' into 2.0.x
2018-07-06 13:52:53 +01:00
Andy Wilkinson
58be01a790
Try to make Jest auto-configuration tests more robust
2018-07-04 15:25:10 +01:00
Andy Wilkinson
468453b66e
Upgrade to Kotlin 1.2.51
...
Closes gh-13705
2018-07-04 14:22:39 +01:00
Andy Wilkinson
0e8206cdf4
Start building against Spring Framework 5.0.8 snapshots
...
See gh-13704
2018-07-04 14:18:32 +01:00
Andy Wilkinson
f173429327
Upgrade to Flatten Maven Plugin 1.0.1
...
Closes gh-13650
2018-07-03 13:33:04 +01:00
Andy Wilkinson
5220a08228
Upgrade to Xml Maven Plugin 1.0.2
...
Closes gh-13649
2018-07-03 13:33:03 +01:00
Andy Wilkinson
573f736374
Upgrade to Maven Resources Plugin 3.0.2
...
Closes gh-13648
2018-07-03 13:33:02 +01:00
Andy Wilkinson
83a56bac60
Upgrade to Maven Javadoc Plugin 3.0.1
...
Closes gh-13647
2018-07-03 13:33:01 +01:00
Andy Wilkinson
d3ef9fd2ba
Upgrade to Maven Enforcer Plugin 3.0.0-M2
...
Closes gh-13646
2018-07-03 13:33:00 +01:00
Andy Wilkinson
1c64496470
Upgrade to Jooq 3.10.8
...
Closes gh-13645
2018-07-03 13:32:59 +01:00
Andy Wilkinson
797efbd259
Upgrade to Solr 6.6.5
...
Closes gh-13644
2018-07-03 13:32:58 +01:00
Andy Wilkinson
c6dae8f305
Upgrade to Johnzon Jsonb 1.1.8
...
Closes gh-13643
2018-07-03 13:32:57 +01:00
Andy Wilkinson
aa5b70c43c
Upgrade to Rxjava2 2.1.16
...
Closes gh-13642
2018-07-03 13:32:57 +01:00
Andy Wilkinson
9120f49721
Merge branch '1.5.x' into 2.0.x
2018-07-03 13:24:19 +01:00
Madhura Bhave
673a08d228
Support microseconds in Duration conversions
...
Closes gh-13624
2018-07-02 13:18:09 -07:00
Andy Wilkinson
06a8c41943
Preserve trailing whitespace in origin-tracked property values
...
Closes gh-13602
2018-07-02 19:17:02 +01:00
Andy Wilkinson
032d5488cd
Tolerate non-existent source folders in DevTools
...
Closes gh-13620
2018-07-02 16:26:19 +01:00
Madhura Bhave
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
2018-06-28 12:36:58 -07:00
Andy Wilkinson
a5d20ffed7
Avoid NPE when creating method tag for WebFlux req with non-standard method
...
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.
This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.
Closes gh-13596
2018-06-28 14:27:02 +01:00
dreis2211
17edf0e2fe
Fix typo
2018-06-27 11:31:06 -07:00
Madhura Bhave
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
2018-06-27 11:06:56 -07:00
Andy Wilkinson
04119585e8
Merge branch '1.5.x' into 2.0.x
2018-06-25 13:13:34 +01:00
Andy Wilkinson
911453d478
Merge branch '1.5.x' into 2.0.x
2018-06-25 11:25:10 +01:00
Andy Wilkinson
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
Andy Wilkinson
fd125b4a4a
Remove assumption that a file URI can be turned into a File
...
Closes gh-13493
2018-06-21 12:47:23 +01:00
Stephane Nicoll
f2cc6e2ef2
Fix link of RESTEasy repository
...
Closes gh-13538
2018-06-21 13:32:07 +02:00
Stephane Nicoll
c594768640
Remove wro4j starter reference
...
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Stephane Nicoll
8858c88a4c
Remove GraphQL starter reference
...
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Andy Wilkinson
48c5e70ac8
Merge branch '1.5.x' into 2.0.x
2018-06-21 12:18:35 +01:00
Andy Wilkinson
2624748911
Merge branch '1.5.x' into 2.0.x
2018-06-21 11:41:02 +01:00
Johnny Lim
b9ea0fd5a7
Polish
...
See gh-13534
2018-06-21 09:20:50 +02:00
Stephane Nicoll
9e9e746554
Merge branch '1.5.x' into 2.0.x
2018-06-21 09:17:05 +02:00
Andy Wilkinson
4fc0a33094
Merge branch '1.5.x' into 2.0.x
2018-06-20 16:49:53 +01:00
Andy Wilkinson
e2d6280d83
Merge branch '1.5.x' into 2.0.x
2018-06-20 13:56:55 +01:00
Andy Wilkinson
e730382718
Merge branch '1.5.x' into 2.0.x
2018-06-20 11:12:51 +01:00
Andy Wilkinson
e1774672af
Prefer servlet to reactive when Jersey and WebFlux are both available
...
Closes gh-13521
2018-06-20 10:10:35 +01:00
Andy Wilkinson
814e90805e
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:06:44 +01:00
Stephane Nicoll
864a6b3e91
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:59:27 +02:00
Andy Wilkinson
497902de4e
Only bridge JUL into SLF4J when JUL has not be customized
...
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.
A secondary, related problem was that LogbackLoggingSystem installs a
LevelChangePropagator so that Logback’s log level configuration is
propagated into JUL. This meant that an individual Boot app with
custom log level configuration could change the log levels of Tomcat
itself and of any other applications that had been deployed to Tomcat
and use JUL.
This commit updates both Slf4jLoggingSystem and LogbackLoggingSystem
so that they only change JUL’s configuration if it hasn’t already been
customized. The configuration is deemed to have not been customised if
there’s a single root handler and its a console handler.
Closes gh-13470
2018-06-19 15:29:46 +01:00
Stephane Nicoll
7ae82b070b
Stop calling Charset.availableCharsets() early
...
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.
Closes gh-13423
2018-06-19 14:12:00 +02:00
Johnny Lim
1e7ed2ffdb
Add log level guards in ConfigFileApplicationListener
...
Closes gh-13512
2018-06-19 11:10:45 +02:00
Madhura Bhave
87680b4ee5
Fix profile precedence when active and include provided
...
Before 2.0.2, if profiles were activated via the environment using the
active and include profile property, profiles specified via the active
property would take precedence. This commit restores that behavior.
Fixes gh-13513
2018-06-18 16:24:49 -07:00
Stephane Nicoll
62c93a4b9a
Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
...
Closes gh-13508
2018-06-18 17:54:10 +02:00
Johnny Lim
dd3bfdbe42
Use @ManagementContextConfiguration consistently
2018-06-18 13:28:30 +02:00
Andy Wilkinson
b3927cfd10
Start building against Spring REST Docs 2.0.2 snapshots
...
See gh-13505
2018-06-18 08:18:15 +01:00
Johnny Lim
f34fb5f1ee
Reduce object creation in findMatchingItemMetadata()
...
Closes gh-13473
2018-06-15 13:36:55 +02:00
Andy Wilkinson
b96f9d635f
Upgrade to Elasticsearch 5.6.10
...
Closes gh-13479
2018-06-14 09:40:08 +01:00
Stephane Nicoll
438f0b008a
Upgrade to Spring Amqp 2.0.4
...
Closes gh-13477
2018-06-14 08:48:36 +02:00
Stephane Nicoll
2483ed3e4e
Upgrade to Spring Kafka 2.1.7
...
Closes gh-13476
2018-06-14 08:47:20 +02:00
Stephane Nicoll
d47d84ff7a
Merge branch '1.5.x' into 2.0.x
2018-06-14 08:36:18 +02:00
Stephane Nicoll
de6ce79d5f
Upgrade to Spring Session Apple-SR3
...
Closes gh-13461
2018-06-14 08:30:11 +02:00
Stephane Nicoll
40ba15047b
Upgrade to Spring Integration 5.0.6
...
Closes gh-13457
2018-06-14 08:28:17 +02:00
Brian Clozel
6e9fee35a7
Upgrade to Spring Data Kay SR8
...
Closes gh-13455
2018-06-13 23:05:47 +02:00
Andy Wilkinson
42c307b744
Upgrade to Solr 6.6.4
...
Closes gh-13468
2018-06-13 10:54:36 +01:00
Andy Wilkinson
bbcbc2d113
Upgrade to Reactor Bom Bismuth-SR10
...
Closes gh-13467
2018-06-13 10:54:35 +01:00
Andy Wilkinson
ed3f43fd25
Upgrade to Jackson 2.9.6
...
Closes gh-13466
2018-06-13 10:54:34 +01:00
Andy Wilkinson
0e867aec97
Upgrade to Couchbase Client 2.5.9
...
Closes gh-13465
2018-06-13 10:54:33 +01:00
Andy Wilkinson
71b8b2d242
Merge branch '1.5.x' into 2.0.x
2018-06-13 10:52:27 +01:00
Andy Wilkinson
a79c8918ff
Upgrade to Spring Security 5.0.6.RELEASE
...
Closes gh-13459
2018-06-13 09:36:47 +01:00
Johnny Lim
870d7fe16a
Use @SpringBootTest.properties in tests and samples
...
Closes gh-13453
2018-06-13 09:24:28 +02:00
Jon Schneider
96a6d2923c
Upgrade to Micrometer 1.0.5
...
Closes gh-13454
2018-06-13 08:56:04 +02:00
Stephane Nicoll
d24647b07c
Upgrade to Spring Framework 5.0.7.RELEASE
...
Closes gh-13353
2018-06-13 08:51:40 +02:00
Andy Wilkinson
6f2171c282
Improve error message when BootJar or BootWar has no known main class
...
Closes gh-12712
2018-06-08 18:07:24 +01:00
Andy Wilkinson
7b3be82cfa
Merge branch '1.5.x' into 2.0.x
2018-06-08 15:47:50 +01:00
Madhura Bhave
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
Madhura Bhave
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
Madhura Bhave
ed734d7e43
Trace filter ignores invalid requests
...
Fixes gh-12987
2018-06-07 09:27:49 -07:00
Brian Clozel
59746de63b
Backport web server configuration doc changes
...
Closes gh-13401
2018-06-07 14:38:19 +02:00
Stephane Nicoll
5c96943e59
Merge branch '1.5.x' into 2.0.x
2018-06-07 10:45:59 +02:00
Phillip Webb
dc1c459cde
Polish "Fix caching issues with map property sources"
...
Refine the property source cache key fix so that a copy of the
key is only taken when the values change. This allows us to
retain the previous performance optimization of not creating
unnecessary string arrays.
Closes gh-13344
2018-06-06 15:17:07 -07:00
Fahim Farook
c556d2b58f
Fix caching issues with map property sources
...
Update `SpringIterableConfigurationPropertySource` so that the cache
key from a `MapPropertySource` is invalidated when the map contents
changes.
Prior to this commit, the actual keys of the map were used as the key.
This meant that if the underlying map changed, they key wouldn't be
invalidated because it ultimately pointed to the same object instance.
See gh-13344
2018-06-06 15:02:59 -07:00
Madhura Bhave
461202bc25
EndpointRequest uses empty servlet path if not available
...
Fixes gh-13399
2018-06-06 10:48:42 -07:00