Stephane Nicoll
e034b383db
Fix checkstyle violation
...
Closes gh-14125
2018-08-20 11:19:01 +02:00
Stephane Nicoll
d80ed27339
Fix checkstyle violation
2018-08-20 10:33:46 +02:00
Stephane Nicoll
eedeaa29e5
Polish "Replace loops with Arrays.setAll where possible"
...
Closes gh-14125
2018-08-20 10:23:16 +02:00
dreis2211
0bc66dc4a9
Replace loops with Arrays.setAll where possible
...
See gh-14125
2018-08-20 10:16:50 +02:00
Gerrit Meier
7e570acf07
Upgrade to Neo4j Ogm 3.1.1
...
Closes gh-14132
2018-08-19 15:14:45 +02:00
Madhura Bhave
f7135ff18f
Use ResolverStyle.SMART when a custom format is specified
...
Fixes gh-13970
2018-08-17 16:01:10 -07:00
artsiom
51fd27fad4
Configure HiddenHttpMethodFilter for Spring WebFlux
...
Closes gh-14008
2018-08-17 13:40:43 +02:00
Stephane Nicoll
22bc2bd7ba
Upgrade to Httpasyncclient 4.1.4
...
Closes gh-14098
2018-08-17 11:34:43 +02:00
Stephane Nicoll
412ff051e3
Upgrade to Derby 10.14.2.0
...
Closes gh-14097
2018-08-17 11:34:43 +02:00
Stephane Nicoll
b1805f4d37
Upgrade to Activemq 5.15.5
...
Closes gh-14096
2018-08-17 11:34:42 +02:00
Stephane Nicoll
bffc542409
Upgrade to Jest 5.3.4
...
Closes gh-14095
2018-08-17 11:34:41 +02:00
Stephane Nicoll
05dfdfad1d
Upgrade to Rxjava2 2.1.17
...
Closes gh-14094
2018-08-17 11:34:41 +02:00
Stephane Nicoll
83ee7fc934
Upgrade to Netty 4.1.28.Final
...
Closes gh-14093
2018-08-17 11:34:40 +02:00
Stephane Nicoll
8c29586699
Upgrade to Lettuce 5.0.5.RELEASE
...
Closes gh-14092
2018-08-17 11:34:40 +02:00
Stephane Nicoll
a303109d93
Upgrade to Unboundid Ldapsdk 4.0.7
...
Closes gh-14091
2018-08-17 11:34:39 +02:00
Madhura Bhave
b93c2b9a9f
Allow actuator endpoints to be used with mvcMatchers
...
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.
For all other applications, AntPathRequestMatcher is used as
a delegate.
Closes gh-13962
2018-08-16 15:41:02 -07:00
Stephane Nicoll
376ef83dc0
Merge branch '1.5.x' into 2.0.x
2018-08-16 16:31:39 +02:00
Andy Wilkinson
3e093035b4
Merge branch '1.5.x' into 2.0.x
2018-08-16 10:18:52 +01:00
Johnny Lim
5f3f1a1f11
Polish
...
Closes gh-14067
2018-08-15 16:54:46 -07:00
Stephane Nicoll
ca4ca15ef2
Restore Jade Templates starter as it is compatible with Spring Boot 2
2018-08-15 14:44:48 +03:00
dreis2211
59d911d6e0
Remove @UsesUnsafeJava annotations
...
Closes gh-14072
2018-08-15 14:36:51 +03:00
Johnny Lim
b4abccc07c
Polish
...
See gh-14049
2018-08-15 10:43:04 +03:00
Madhura Bhave
895d092640
PropertySourcesLoader with highest precedence should win
...
Fixes gh-13955
2018-08-14 11:23:55 -07:00
Andy Wilkinson
1973e342c9
Do not use lambda for task action as it breaks up-to-date checks
...
Due to gradle/gradle#5510 , using a lambda for a task action breaks
up-to-date checks in certain circumstances.
This commit updates JavaPluginAction to use an inner-class in place
of a lambda for the action that it adds to JavaCompile tasks. A test
has not been added as it does not appear to be possible to reproduce
it with a TestKit-based test.
Closes gh-14054
2018-08-14 12:32:36 +01:00
Stephane Nicoll
da1858f620
Upgrade to Hibernate Validator 6.0.12.Final
...
Closes gh-14053
2018-08-14 08:48:16 +03:00
Madhura Bhave
dfb97eb0f5
Convert environment if webApplicationType changes
...
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.
Fixes gh-13977
2018-08-13 12:12:30 -07:00
Andy Wilkinson
6e5ff77bb0
Merge branch '1.5.x' into 2.0.x
...
The 3.0.1 version of the Maven Javadoc Plugin contains a bug [1] that
means that a link URL must redirect otherwise it is ignored.
[1] https://issues.apache.org/jira/browse/MJAVADOC-532
2018-08-13 13:16:50 +01:00
Andy Wilkinson
58aaf4863f
Merge pull request #14032 from Nikolay Rybak
...
* gh-14032:
Propagate retryWrites flag from connection URI to ReactiveMongoClient
2018-08-13 12:30:00 +01:00
Nikolay Rybak
7759dcd9df
Propagate retryWrites flag from connection URI to ReactiveMongoClient
...
Closes gh-14032
2018-08-13 12:10:47 +01:00
Andy Wilkinson
29e38f4af8
Merge branch '1.5.x' into 2.0.x
2018-08-13 11:35:46 +01:00
Stephane Nicoll
f4b0101632
Merge branch '1.5.x' into 2.0.x
2018-08-13 13:10:05 +03:00
Andy Wilkinson
263e157ef0
Merge branch '1.5.x' into 2.0.x
2018-08-10 12:50:15 +01:00
Andy Wilkinson
27f5e46587
Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
...
Closes gh-14019
2018-08-09 11:10:21 +01:00
artsiom
83fbdc6ea8
Fix NPE in FlywayEndpoint when migration.installedOn is null
...
See gh-14019
2018-08-09 11:10:02 +01:00
Stephane Nicoll
a023bd030a
Add configurable timeout for Couchbase health indicator
...
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.
Closes gh-13879
2018-08-08 16:01:58 +02:00
Stephane Nicoll
21691f0b20
Merge branch '1.5.x' into 2.0.x
2018-08-08 14:46:55 +02:00
Stephane Nicoll
fbf3c48bf8
Fix setter detection in `configprops` endpoint
...
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).
This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.
Closes gh-13878
2018-08-08 11:13:03 +02:00
dreis2211
72707b9d58
Polish OnWebApplicationCondition
...
Closes gh-14015
2018-08-08 09:51:51 +02:00
dreis2211
47ed48625c
Fix typo
...
Closes gh-14013
2018-08-08 09:34:46 +02:00
Stephane Nicoll
e68dc2d3c4
Prune 3rd party starters that are not compatible with Spring Boot 2
...
Those can be re-added at any time there is Spring Boot 2 support
Closes gh-13510
2018-08-07 17:31:03 +02:00
Stephane Nicoll
f731f6aa39
Restore customization of HTTP trace request headers
...
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.
Closes gh-13924
2018-08-06 18:35:12 +02:00
Stephane Nicoll
737b4a275b
Polish
2018-08-03 18:24:59 +02:00
Stephane Nicoll
0f095abded
Polish
2018-08-03 13:47:23 +02:00
Stephane Nicoll
20ea16fe9f
Merge branch '1.5.x' into 2.0.x
2018-08-03 09:37:01 +02:00
Johnny Lim
7b6b91aae7
Return null immediately when sla is null in convertSla()
...
Closes gh-13991
2018-08-03 09:23:22 +02:00
Madhura Bhave
16aff4cd2c
Refactor PropertySourcesDeducer
...
Prior to the changes that fixed #12451 ,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.
Fixes gh-13738
2018-08-02 15:00:01 -07:00
Madhura Bhave
7e2494ebdd
Set environment active profiles according to processing order
...
Fixes gh-13965
2018-08-02 11:01:22 -07:00
cmakinen
07d96689c6
Add dependency management for micrometer-registry-cloudwatch
...
Closes gh-13982
2018-08-02 16:19:15 +02:00
Johnny Lim
94468e5865
Polish
...
See gh-13963
2018-08-01 11:04:59 +02:00
Stephane Nicoll
4e45f36bd1
Clean basePath if necessary
...
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already
Close gh-13964
2018-08-01 10:58:40 +02:00
dreis2211
66b1742f96
Optimize some StringBuilder.append() calls
...
Closes gh-13961
2018-08-01 08:41:03 +02:00
Stephane Nicoll
d31f68380a
Deprecate PooledConnectionFactory properties
...
This commit deprecated the properties of `PooledConnectionFactory` that
are no longer supported by an alternative that is a JMS 2 compliant.
This commit also adds a note to warn users that this pool implementation
is not JMS 2 compliant.
Closes gh-13956
2018-07-31 16:17:43 +02:00
Muhammad Hewedy
2f69785c6a
Add classpath prefix to the flyway location
...
Closes gh-13933
2018-07-31 14:28:59 +02:00
Johnny Lim
d4fba783fb
Remove ex.printStackTrace() in tests
...
Closes gh-13952
2018-07-31 08:16:40 +02:00
Andy Wilkinson
06b4007ce4
Avoid installing unwanted ConsoleHandler when cleaning up
...
Closes gh-13470
2018-07-30 13:00:34 +01:00
Madhura Bhave
01abb196ef
Fix typo
2018-07-29 22:56:49 -07:00
Stephane Nicoll
1435d83c18
Upgrade to Spring Session Apple-SR4
...
Closes gh-13888
2018-07-29 18:58:55 +02:00
Phillip Webb
0ec22c8bf9
Polish copyright date on changed files
2018-07-29 09:29:29 +01:00
Phillip Webb
aeb885192e
Polish ternary expressions
2018-07-29 09:24:46 +01:00
Stephane Nicoll
b24bb688b8
Upgrade to Spring Integration 5.0.7.RELEASE
...
Closes gh-13886
2018-07-28 15:48:39 +02:00
Phillip Webb
63b609827e
Fix checkstyle method order issues
...
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
ec1100a896
Upgrade to spring-javaformat 0.0.6
...
Closes gh-13932
2018-07-28 01:11:48 +01:00
Phillip Webb
cddd794a07
Polish
2018-07-28 00:05:25 +01:00
Madhura Bhave
e753b530fa
EndpointRequest should match links with trailing slash
...
Fixes gh-13921
2018-07-27 12:23:27 -07:00
Stephane Nicoll
f7b90a73a0
Upgrade to Spring Kafka 2.1.8.RELEASE
...
Closes gh-13887
2018-07-27 19:53:47 +02:00
Stephane Nicoll
2a0d1918f1
Merge branch '1.5.x' into 2.0.x
2018-07-27 11:36:10 +02:00
Stephane Nicoll
659535d1ec
Upgrade to Spring Data Kay SR9
...
Closes gh-13890
2018-07-27 10:02:18 +02:00
Johnny Lim
8a9224b78c
Polish NoSuchBeanDefinitionFailureAnalyzer
...
Closes gh-13923
2018-07-27 01:55:38 +02:00
Stephane Nicoll
54a6ee7a06
Upgrade to Spring HATEOAS 0.25.0.RELEASE
...
Closes gh-13742
2018-07-27 01:46:08 +02:00
Stephane Nicoll
8603fdddb1
Upgrade to Spring Amqp 2.0.5.RELEASE
...
Closes gh-3884
2018-07-27 01:38:20 +02:00
Stephane Nicoll
d98b23bdd9
Upgrade to Spring Framework 5.0.8
...
Closes gh-13704
2018-07-27 01:30:47 +02:00
dreis2211
bfbf57b0eb
Fix typo
...
Closes gh-13919
2018-07-27 01:03:01 +02:00
Stephane Nicoll
0f15b72fab
Upgrade to Spring Security 5.0.7.RELEASE
...
Closes gh-13898
2018-07-27 01:01:08 +02:00
Stephane Nicoll
85cffd1ab5
Upgrade to Spring Web Services 3.0.3.RELEASE
...
Closes gh-13912
2018-07-27 00:46:19 +02:00
Stephane Nicoll
37f1146c31
Fix formatting
2018-07-27 00:45:31 +02:00
Madhura Bhave
c775ff8f60
Fix import
2018-07-26 12:33:52 -07:00
Madhura Bhave
6bd438a737
Document `@ConditionalOnProperty` limitation with collections
...
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave
57515dfa78
Fix typo
2018-07-26 11:38:23 -07:00
Phillip Webb
9a9111af21
Support path discovery for main dispatcher servlet
...
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.
Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.
This commit also reverts most of fddc9e9c7e
since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.
Closes gh-13834
2018-07-26 11:35:12 +01:00
Phillip Webb
d37e717500
Polish
2018-07-26 11:35:12 +01:00
Stephane Nicoll
12f8ef1b6e
Upgrade to Spring Web Services 3.0.2.RELEASE
...
Closes gh-13912
2018-07-26 11:24:47 +02:00
Stephane Nicoll
37f5e69173
Start building against Spring Security 5.0.7 snapshots
...
See gh-13898
2018-07-25 15:48:09 +02:00
Stephane Nicoll
99f33d5070
Start building against Spring Data Kay snapshots
...
See gh-13890
2018-07-25 15:34:52 +02:00
Andy Wilkinson
1ab98ca33f
Start building against Spring HATEOAS 0.25.0 snapshots
...
See gh-13742
2018-07-25 15:21:20 +02:00
Stephane Nicoll
21160da9f5
Use SNAPSHOTs for upcoming releases
2018-07-25 14:32:02 +02:00
Stephane Nicoll
e6cf082dbc
Fix typo
2018-07-25 11:44:55 +02:00
Stephane Nicoll
a25b6bd473
Restore support for TransactionAwareCacheDecorator
...
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.
Closes gh-13861
2018-07-25 09:17:49 +02:00
Madhura Bhave
1831f3be16
Fix NPE when Collection contains unbound children
...
Fixes gh-13636
2018-07-24 17:42:51 -07:00
Madhura Bhave
6032b454b0
Polish
2018-07-24 14:11:01 -07:00
Stephane Nicoll
829ac3fbef
Prevent headers to be mutated
...
This commit rework 1189ccc
to prevent a mutate call on the original
headers map.
Closes gh-13871
2018-07-24 13:34:49 +02:00
Stephane Nicoll
7d2e25f6f8
Merge branch '1.5.x' into 2.0.x
2018-07-24 10:37:31 +02:00
Stephane Nicoll
1a0afc6bbe
Polish "Use Collection.removeIf() where possible"
...
Closes gh-13871
2018-07-24 09:38:51 +02:00
dreis2211
1189ccc936
Use Collection.removeIf() where possible
...
See gh-13871
2018-07-24 09:38:34 +02:00
Stephane Nicoll
7176c54f5e
Polish "Add metric description and base unit to metrics endpoint"
...
Closes gh-13813
2018-07-24 09:32:22 +02:00
Johannes Edmeier
ab1f8cf77b
Add metric description and base unit to metrics endpoint
...
See gh-13813
2018-07-24 09:32:22 +02:00
Stephane Nicoll
ecb8da2536
Polish "Upgrade to Micrometer 1.0.6"
...
Closes gh-13819
2018-07-24 09:25:54 +02:00
Jon Schneider
f478911c54
Upgrade to Micrometer 1.0.6
...
See gh-13819
2018-07-24 09:12:06 +02:00
Stephane Nicoll
dcb68d4c64
Deprecate unused property
...
Closes gh-13836
2018-07-23 09:31:02 +02:00
Andy Wilkinson
daad992c96
Merge branch '1.5.x' into 2.0.x
2018-07-20 17:03:59 +01:00
Andy Wilkinson
136be5916c
Upgrade to Postgresql 42.2.4
...
Closes gh-13845
2018-07-20 16:30:17 +01:00
Andy Wilkinson
8f2a8576a6
Upgrade to Mariadb 2.2.6
...
Closes gh-13844
2018-07-20 16:30:16 +01:00
Andy Wilkinson
e5a4cfabc3
Upgrade to Hibernate Validator 6.0.11.Final
...
Closes gh-13843
2018-07-20 16:30:15 +01:00
Andy Wilkinson
1c6e75ff10
Upgrade to Kafka 1.0.2
...
Closes gh-13842
2018-07-20 16:30:15 +01:00
Andy Wilkinson
4003c3c6e5
Upgrade to Jna 4.5.2
...
Closes gh-13841
2018-07-20 16:30:14 +01:00
Andy Wilkinson
3fd6f00155
Upgrade to Netty 4.1.27.Final
...
Closes gh-13840
2018-07-20 16:30:13 +01:00
Andy Wilkinson
478181eb2c
Merge branch '1.5.x' into 2.0.x
2018-07-20 16:26:30 +01:00
Stephane Nicoll
fc0a687ee0
Migrate test to ApplicationContextRunner
2018-07-20 15:51:14 +02:00
Madhura Bhave
660d284f45
Document when and how to use brackets when binding to maps
...
Closes gh-13506
2018-07-19 16:31:59 -07:00
Madhura Bhave
56235187d0
Fix typo
2018-07-19 15:47:14 -07:00
Andy Wilkinson
10b91602e9
Increase connect and read timeouts when testing against Cassandra
2018-07-19 20:43:39 +01:00
Andy Wilkinson
de7899fba4
Improve reliability by give Cassandra more time and attempts to start
2018-07-19 19:57:54 +01:00
Andy Wilkinson
bfc4cad692
Upgrade to Spring REST Docs 2.0.2.RELEASE
...
Closes gh-13505
2018-07-19 18:32:38 +01:00
Stephane Nicoll
cdbe6fa122
Document properties migrator usage
...
Closes gh-13600
2018-07-19 17:57:42 +02:00
Stephane Nicoll
a1ef3f070a
Improve documentation for using a mock environment with @SpringBootTest
...
Closes gh-13827
2018-07-19 16:40:24 +02:00
Stephane Nicoll
592754d806
Polish "Make sure exception tag values are not empty in web metrics"
...
Closes gh-13187
2018-07-19 14:53:29 +02:00
Jon Schneider
ee37dc1c31
Make sure exception tag values are not empty in web metrics
...
See gh-13187
2018-07-19 14:40:58 +02:00
Madhura Bhave
66156cc24f
Polish
2018-07-18 10:29:43 -07:00
Andy Wilkinson
681717d07a
Merge branch '1.5.x' into 2.0.x
2018-07-18 14:17:15 +01:00
Andy Wilkinson
b9ad0d9992
Test the Gradle plugin against Gradle 4.8.1 instead of 4.8
...
Closes gh-13809
2018-07-18 13:34:27 +01:00
Andy Wilkinson
8deea933b9
Test the Gradle plugin against Gradle 4.9
...
Closes gh-13808
2018-07-18 13:33:39 +01:00
Andy Wilkinson
53400b1d81
Merge branch '1.5.x' into 2.0.x
2018-07-18 11:15:40 +01:00
Madhura Bhave
e907ae605d
Fix tests
...
See gh-13783
2018-07-17 17:08:53 -07:00
Madhura Bhave
9bd723ddad
Fix exception message
...
Fixes gh-13783
2018-07-17 17:05:29 -07:00
Johnny Lim
86ccb26c58
Polish EndpointRequest.RequestMatcherFactory.antPath()
...
Closes gh-13775
2018-07-17 16:53:33 -07:00
Madhura Bhave
c36804908c
Merge branch '1.5.x' into 2.0.x
2018-07-17 16:43:02 -07:00
Andy Wilkinson
a57d0f0853
Reinstate order of WebMvcMetricsFilter
...
Closes gh-13781
2018-07-17 19:14:17 +01:00
Stephane Nicoll
944ed767ac
Add dependency management for elasticsearch integration tests distro
...
Closes gh-13547
2018-07-17 17:03:45 +02:00
dreis2211
e9a8d4c949
Remove unused AbstractCouchbaseAutoConfigurationTests
...
Closes gh-13797
2018-07-17 15:48:00 +02:00
Stephane Nicoll
6e749ef276
Improve NoSuchBeanDefinitionFailureAnalyzer to handle null beans
...
Previously, if a user defines a `@Bean` with a method that returns
`null`, injection by type will ignore that definition but the report
doesn't mention that candidate.
This commit improves the failure analyzer to look for user-defined beans
as well, detecting beans that are `null` matching the requested type
and including them in the report.
Closes gh-13531
2018-07-17 15:45:49 +02:00
Stephane Nicoll
e679690a74
Clarify the WebTestClient requires WebFlux on the classpath
...
Closes gh-13469
2018-07-17 14:06:41 +02:00
Stephane Nicoll
d6c7eff8f7
Add check for empty values for lookup
...
Closes gh-13419
2018-07-17 12:01:26 +02:00
Stephane Nicoll
8095ee4a5b
Polish contribution
...
See gh-13790
2018-07-17 10:12:34 +02:00
Johnny Lim
f363fe7dd1
Polish
...
See gh-13790
2018-07-17 10:03:41 +02:00
Stephane Nicoll
ec2ebf52de
Merge branch '1.5.x' into 2.0.x
2018-07-17 08:22:15 +02:00
Brian Clozel
58e886fddf
Remove @Lazy injection for HttpMessageConverters
...
This commit turns a lazy injection point for `HttpMessageConverters`
into an `ObjectProvider`-backed injection.
This allows to lazily rely on that bean without creating for it; in some
environments, such proxy creation can lead to issues like SPR-16990.
See gh-13785
2018-07-16 23:12:47 +02:00
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
Brian Clozel
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
Andy Wilkinson
47615154de
Upgrade to Mongodb 3.6.4
...
Closes gh-13397
2018-06-06 10:15:33 +01:00
Andy Wilkinson
fd56e79f7a
Upgrade to Mariadb 2.2.5
...
Closes gh-13396
2018-06-06 10:15:33 +01:00
Andy Wilkinson
6d0d66cb28
Upgrade to Narayana 5.8.2.Final
...
Closes gh-13395
2018-06-06 10:15:33 +01:00
Andy Wilkinson
a4a6f482c6
Upgrade to Hsqldb 2.4.1
...
Closes gh-13394
2018-06-06 10:15:33 +01:00
Andy Wilkinson
ecd8760514
Upgrade to Hibernate Validator 6.0.10.Final
...
Closes gh-13393
2018-06-06 10:15:33 +01:00
Andy Wilkinson
50f3f50ebb
Upgrade to Activemq 5.15.4
...
Closes gh-13392
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2b4d51e763
Upgrade to Rxjava2 2.1.14
...
Closes gh-13391
2018-06-06 10:15:33 +01:00
Andy Wilkinson
d79f2401be
Upgrade to Netty 4.1.25.Final
...
Closes gh-13390
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2d4f1bb043
Upgrade to Unboundid Ldapsdk 4.0.6
...
Closes gh-13389
2018-06-06 10:15:33 +01:00
Andy Wilkinson
27b5fdd1e1
Merge branch '1.5.x' into 2.0.x
2018-06-06 10:15:24 +01:00
Stephane Nicoll
f6c99361a4
Merge branch '1.5.x' into 2.0.x
2018-06-06 11:00:02 +02:00
dreis2211
ba8a32fa4e
Replace commons-codec Base64 usage
...
See gh-13378
2018-06-06 09:19:17 +02:00
Madhura Bhave
d0a2a8e929
Document ConfigurableServletWebServerFactory variants
...
Closes gh-13083
2018-06-05 13:48:43 -07:00
Stephane Nicoll
bf56ec496d
Polish
2018-06-05 13:29:56 +02:00
Stephane Nicoll
fff06822dc
Polish
2018-06-05 13:15:38 +02:00
Stephane Nicoll
d84e2b90d7
Fix wrong usage of ManagementContextConfiguration
...
Closes gh-13366
2018-06-05 13:15:21 +02:00
Stephane Nicoll
b4f8361989
Make JMX metrics domain configurable
...
Closes gh-13356
2018-06-05 10:12:26 +02:00
Phillip Webb
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
Phillip Webb
2274ac5214
Move spring-javaformat plugins to root POM
...
Relocate spring-javaformat plugins to the root of the project.
Closes gh-13306
2018-06-04 17:25:19 -07:00
Phillip Webb
e1d21e52d5
Allow multi-value spring.profiles properties
...
Update `ConfigFileApplicationListener` to correctly load properties
that have `spring.profiles` values containing a list.
Prior to this commit the loaded would attempt to add the same document
twice resulting in a "property source cannot be added relative to
itself" error.
Closes gh-13362
2018-06-04 15:39:16 -07:00
Phillip Webb
67b548dafb
Protect against infinite property include loop
...
Update `ConfigFileApplicationListener` to ensure that a
`spring.profiles.include` property that refers to an already processed
profile doesn't cause an infinite loop.
Closes gh-13361
2018-06-04 14:59:29 -07:00
Madhura Bhave
378c4c9535
Stop included profiles overriding active profiles
...
Update `ConfigFileApplicationListener` so that `spring.profiles.include`
properties do not override higher priority active profiles.
This commit also changes when profiles get added to the environment.
Profiles are now added to the environment at the time of profile
processing so that they get logged in the order that they are processed.
Closes gh-13151
2018-06-04 14:46:44 -07:00
Madhura Bhave
60a4d67b13
Handle special characters in TraceableHttpServletRequest
...
Fixes gh-13273
2018-06-04 12:50:11 -07:00
Andy Wilkinson
1a0dfa06ab
Add log4j-jul to Log4j 2 starter
...
Closes gh-12659
2018-06-04 19:38:25 +01:00
Phillip Webb
abe92eba2e
Protect Inet test against "helpful" DNS resolvers
...
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.
Closes gh-11897
2018-06-04 10:50:36 -07:00
Andy Wilkinson
70c0d6a005
Test the Gradle plugin against Gradle 4.8
...
Closes gh-13359
2018-06-04 17:53:34 +01:00
Andy Wilkinson
00449bef6a
Use app…DefaultJvmArgs as convention for start script's defaultJvmOpts
...
Closes gh-12631
2018-06-04 17:53:34 +01:00
Andy Wilkinson
624946a779
Upgrade to Maven Invoker Plugin 3.1.0
...
Closes gh-12687
2018-06-04 17:05:22 +01:00
Andy Wilkinson
d54072e0a8
More accurately document buildInfo's effect on up-to-date checking
...
Closes gh-13152
2018-06-04 16:39:59 +01:00
Dmytro Nosan
20003489be
Auto-configure jOOQ with TransactionListenerProvider
...
Closes gh-13331
2018-06-04 17:35:40 +02:00
Andy Wilkinson
0df37b917b
Ignore unresolvable placeholders during property binding
...
Closes gh-13122
2018-06-04 16:27:30 +01:00
Andy Wilkinson
9c8d2c8016
Improve analysis of bind failures caused by a conversion failure
...
Closes gh-13357
2018-06-04 16:26:43 +01:00
Andy Wilkinson
ea51cfabca
Avoid uri tag explosion when use of path variable is undetected
...
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.
Closes gh-12447
2018-06-04 15:43:48 +01:00
Stephane Nicoll
bc59434bcc
Start building against Spring Framework 5.0.7 snapshots
...
See gh-13353
2018-06-04 15:21:46 +02:00
Stephane Nicoll
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
dreis2211
8bb7b8af51
Remove usage of deprecated Matchers class
...
Closes gh-13345
2018-06-04 10:31:25 +02:00
dreis2211
29605bacd2
Polish stream creation in some PropertySources
...
Closes gh-13343
2018-06-03 16:56:51 +02:00
Madhura Bhave
95174a0773
Don't fail if aggregate merge can't get existing value
...
Fixes gh-13303
2018-06-01 14:52:55 -07:00
Madhura Bhave
8ce13c765b
Support binding to immutable maps
...
Closes gh-13323
2018-06-01 14:52:55 -07:00
Andy Wilkinson
68cd27c47b
Do not require DataSourcePoolMetrics to auto-configure Hikari meters
...
Closes gh-13330
2018-06-01 17:55:43 +01:00
Andy Wilkinson
27267a7090
Ensure that condition evaluator uses runner’s class loader
...
Closes gh-13319
2018-06-01 17:26:32 +01:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Madhura Bhave
0afd947350
BindFailureAnalyzer should show original failure message
...
Fixes gh-13122
2018-05-31 16:51:42 -07:00
Stephane Nicoll
fa21333e4d
Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
...
Closes gh-13318
2018-05-31 21:04:02 +02:00
Stephane Nicoll
20e349c332
Polish
2018-05-31 17:35:56 +02:00
Stephane Nicoll
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
Andy Wilkinson
0d7d95d8a9
Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
...
Closes gh-13314
2018-05-31 13:41:43 +01:00
James McShane
d74c768cdd
Remove outdated reference to @EnableReactor
...
Closes gh-13308
2018-05-31 10:39:44 +02:00
Phillip Webb
3751968ecd
Add missing ExpectedException rule
...
Add ExpectedException rule which was missed from the 1.5.x merge.
2018-05-30 22:52:25 -07:00
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Phillip Webb
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:29:03 -07:00
Phillip Webb
5ae061f491
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:27:19 -07:00
Phillip Webb
2c6465abdc
Merge branch '1.5.x' into 2.0.x
2018-05-30 14:08:15 -07:00
Phillip Webb
401fcbeaa4
Merge branch '1.5.x' into 2.0.x
2018-05-30 13:29:10 -07:00
Phillip Webb
587df6a07a
Port call setHttpOnly property on Tomcat context
...
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4
to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.
See gh-12580
2018-05-30 12:23:40 -07:00
Phillip Webb
e38d5f910b
Merge branch '1.5.x' into 2.0.x
2018-05-30 12:18:38 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
Stephane Nicoll
b47a72731f
Merge branch '1.5.x' into 2.0.x
2018-05-30 15:27:58 +02:00
Andy Wilkinson
35c48bb9bd
Polish
2018-05-30 10:28:52 +01:00
Madhura Bhave
ad1283195a
Fix test in "Truststore password if SSLstoreprovider present"
...
See gh-13088
2018-05-29 15:06:39 -07:00
Ian Chan
e75d45ca45
Use empty trust-store password if SSL store provider present
...
For Tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the trust-store with an
empty password. Previously, if a password was supplied using the
ssl.trust-store-password property, that would be the password used to
load the trust-store and the connector would warn with "Password
verification failed" message.
Fixes gh-12688
2018-05-29 15:02:30 -07:00