Andy Wilkinson
abe3d38527
Fix OoM error when starting Tomcat with max int load on startup
...
Fixes gh-17927
2019-08-21 15:17:54 +01:00
Andy Wilkinson
ab87b2a39b
Polish
2019-08-19 16:05:43 +01:00
lijuny
d33ed84f1f
Remove redundant code
...
See gh-17875
2019-08-17 06:41:10 +02:00
Filip Hrisafov
1ebbe9fc55
Map non-null LDAP properties
...
The userDn and password in LdapContextSource are not nullable. The
default values for userDn and password in LdapProperties are null. When
the values are set to null there will eventually be a
NullPointerException during
AbstractContextSource#setupAuthenticatedEnvironment since HashTable
doesn't allow null for values.
See gh-17861
2019-08-17 06:34:22 +02:00
Madhura Bhave
0187e5106d
Polish "Set up SpringLiquibase beans' dependencies by type rather than name"
...
See gh-17805
2019-08-16 16:43:50 -07:00
Andrii Hrytsiuk
b69f9e9fdf
Add missing javadoc
...
See gh-17805
2019-08-16 16:05:33 -07:00
Andrii Hrytsiuk
eaad22dd89
Set up SpringLiquibase beans' dependencies by type rather than name
...
See gh-17805
2019-08-16 16:05:33 -07:00
dreis2211
56940fca97
Test the Gradle Plugin against Gradle 5.6
...
See gh-17876
2019-08-16 08:45:33 +01:00
Madhura Bhave
8d7deb7b67
Polish "Expand documentation on remote devtools"
...
See gh-17780
2019-08-15 15:11:10 -07:00
Sergei Petunin
ab33bc7deb
Expand documentation on remote devtools
...
See gh-17780
2019-08-15 15:09:43 -07:00
Madhura Bhave
3515ec1f29
Support relaxed binding for properties before environment is prepared
...
Fixes gh-17843
2019-08-13 14:54:27 -07:00
Stephane Nicoll
fcf4680626
Polish "Document how to add metadata for collection and enum default values"
...
Closes gh-12874
2019-08-13 17:35:37 +02:00
Stephane Nicoll
7aea432e3e
Promote dependency management plugin version to the bom
...
Closes gh-17842
2019-08-13 17:21:32 +02:00
Stephane Nicoll
25aecfeb35
Upgrade to Jackson 2.9.9.20190807
...
Closes gh-17698
2019-08-13 09:21:14 +02:00
Madhura Bhave
38d36ab18d
Document how to add metadata for collection and enum default values
...
Closes gh-12874
2019-08-12 17:26:39 -07:00
Stephane Nicoll
56c2a52ea4
Polish "Fix syntax errors in docs"
...
Closes gh-17835
2019-08-12 10:54:33 +02:00
dreis2211
2e32af4737
Fix syntax errors in docs
...
See gh-17835
2019-08-12 10:34:46 +02:00
Madhura Bhave
47a9bb1c0e
Document that auto-configuration classes are not public API
...
Closes gh-16704
2019-08-08 16:26:04 -07:00
Madhura Bhave
1b62a05c40
Document Prometheus Pushgateway support
...
Closes gh-16853
2019-08-08 15:15:51 -07:00
Madhura Bhave
541d3c4853
Fix typo
2019-08-08 11:52:05 -07:00
Stephane Nicoll
1b3a6d1616
Polish "Configure a temporary directory with Undertow"
...
See gh-17778
2019-08-08 16:29:43 +02:00
Andy Chen
0388f954af
Configure a temporary directory with Undertow
...
See gh-17778
2019-08-08 16:17:34 +02:00
Stephane Nicoll
994f08d234
Polish "Fix annotation lookup on proxied EndpointExtension"
...
See gh-17807
2019-08-08 13:58:03 +02:00
Jacques-Etienne Beaudet
9083da2876
Fix annotation lookup on proxied EndpointExtension
...
See gh-17807
2019-08-08 13:48:21 +02:00
Stephane Nicoll
94184ae38b
Upgrade to Spring Security 5.1.6
...
Closes gh-17794
2019-08-06 08:15:18 +02:00
陈其苗
77931a0981
Fix typo in assertion
...
See gh-17774
2019-08-05 15:30:33 -07:00
Stephane Nicoll
766b6c394f
Upgrade to Rxjava2 2.2.11
...
Closes gh-17675
2019-08-05 20:01:56 +02:00
Stephane Nicoll
b1d298fdef
Upgrade to Johnzon Jsonb 1.1.13
...
Closes gh-17786
2019-08-05 20:00:43 +02:00
Madhura Bhave
5e52fedbac
Upgrade to Spring Session Bean-SR7
...
Closes gh-17581
2019-08-05 09:49:27 -07:00
Stephane Nicoll
134c534cc1
Upgrade to Spring Kafka 2.2.8
...
Closes gh-17645
2019-08-05 18:13:28 +02:00
Stephane Nicoll
1e74e294ae
Upgrade to Spring AMQP 2.1.8
...
Closes gh-17641
2019-08-05 18:12:49 +02:00
Stephane Nicoll
236efd2cf4
Upgrade to Spring Integration 5.1.7
...
Closes gh-17643
2019-08-05 18:12:17 +02:00
Stephane Nicoll
9938c18968
Upgrade to Spring Data Lovelace-SR10
...
Closes gh-17353
2019-08-05 13:42:48 +02:00
Stephane Nicoll
b15674d71e
Upgrade to Spring HATEOAS 0.25.2
...
Closes gh-17777
2019-08-04 08:56:05 +02:00
Madhura Bhave
faaada1416
Remove liquibase check change log location
...
Missing change logs would lead to an exception even
if the checkChangeLogLocation was set to false. Spring Boot's check
would pass but Liquibase would fail later making this property redundant.
Fixes gh-16232
2019-08-02 09:03:45 -07:00
Stephane Nicoll
eb26492eef
Polish
2019-08-02 17:31:07 +02:00
Stephane Nicoll
bacb4d1715
Polish "Refine back-off strategy of Neo4j SessionFactory"
...
See gh-17662
2019-08-02 17:15:22 +02:00
Michael Simons
274098f2e2
Refine back-off strategy of Neo4j SessionFactory
...
This commit separates the auto-configuration of the `SessionFactory` in
an isolated class so that the rest of the auto-configuration is still
applied if the user provides a custom `SessionFactory` bean.
See gh-17662
2019-08-02 17:12:01 +02:00
Stephane Nicoll
308a5e9360
Fix bean name for reactive Cassandra health indicator
...
Closes gh-17763
2019-08-02 13:56:16 +02:00
Stephane Nicoll
cdec8a9b46
Upgrade to Spring Framework 5.1.9
...
Closes gh-17351
2019-08-02 13:37:50 +02:00
Madhura Bhave
80f568bd47
Clarify RestTemplateBuilder rootUri documentation
...
Closes gh-15343
2019-08-01 15:59:24 -07:00
Madhura Bhave
5f3364326b
Configure interceptors for WelcomePageHandlerMapping
...
Fixes gh-16309
2019-08-01 12:27:53 -07:00
Stephane Nicoll
f2fd169c3a
Rename restClient to elasticsearchRestClient
...
For consistency, similar beans have been renamed as well.
Closes gh-17751
2019-08-01 14:45:33 +02:00
Stephane Nicoll
1ec8e822a1
Fix broken build
2019-08-01 14:42:01 +02:00
Stephane Nicoll
fb0fccf3c7
Polish "Create RestClient from a RestHighLevelClient if available"
...
This significantly rework the auto-configuration to reflect the order
in which things are expected. Rather than keeping a conceptual cycle
between the builder and the two inner classes that are processed first,
the configuration is now split in three parts:
* The builder that is required and common
* The configuration when the HighLevelClient is available
* The RestClient configuration when that's not the case
See gh-17488
2019-08-01 14:16:22 +02:00
Dmytro Nosan
0e87b9c163
Create RestClient from a RestHighLevelClient if available
...
See gh-17488
2019-08-01 14:16:22 +02:00
Madhura Bhave
96235ea674
Fix ordering of JSON property source relative to servlet sources
...
Fixes gh-17652
2019-07-31 12:43:08 -07:00
Stephane Nicoll
0c560795fd
Harmonize settings.gradle documentation in Gradle getting started guide
...
See gh-17736
2019-07-31 15:11:53 +02:00
Dave Syer
e7b0450a7f
Add missing repositories to snapshot configuration
...
See gh-17736
2019-07-31 15:00:07 +02:00
Stephane Nicoll
f9e809b00e
Upgrade to Undertow 2.0.23.Final
...
Closes gh-17676
2019-07-31 14:51:58 +02:00
Stephane Nicoll
dc4e67f5dd
Remove useless classpath override
2019-07-31 13:55:38 +02:00
Stephane Nicoll
34ee27d0b7
Upgrade to Lettuce 5.1.8.RELEASE
...
Closes gh-17700
2019-07-30 15:26:53 +02:00
Stephane Nicoll
fe515a301d
Upgrade to Reactor Californium-SR10
...
Closes gh-17639
2019-07-30 11:12:39 +02:00
Tomas Aschan
1b172dc4fe
Clarify documentation about specifying main class
...
See gh-17003
2019-07-29 11:36:26 -07:00
Phillip Webb
73efce6306
Upgrade to Undertow 2.0.22.Final
...
Closes gh-17676
2019-07-29 14:46:16 +01:00
Phillip Webb
d7ee504ee0
Only include our own mime mappings in Undertow
...
Update `UndertowServletWebServerFactory` so that only our own mime type
mappings are included. Prior to this commit both our mime mappings and
Undertow's default mime mappings would always be included.
Fixes gh-17687
2019-07-29 14:44:57 +01:00
Stephane Nicoll
c76133eb22
Upgrade to Xmlunit2 2.6.3
...
Closes gh-17686
2019-07-29 14:34:19 +02:00
Stephane Nicoll
42942ac076
Upgrade to Spring Cloud Connectors 2.0.6.RELEASE
...
Closes gh-17685
2019-07-29 14:34:19 +02:00
Stephane Nicoll
9af85534c1
Upgrade to Postgresql 42.2.6
...
Closes gh-17684
2019-07-29 14:34:19 +02:00
Stephane Nicoll
0620a21cc1
Upgrade to Pooled Jms 1.0.6
...
Closes gh-17683
2019-07-29 14:34:19 +02:00
Stephane Nicoll
7c499b1d01
Upgrade to Jolokia 1.6.2
...
Closes gh-17682
2019-07-29 14:34:19 +02:00
Stephane Nicoll
e11d180e2e
Upgrade to Janino 3.0.15
...
Closes gh-17681
2019-07-29 14:34:19 +02:00
Stephane Nicoll
ddf84ac685
Upgrade to Tomcat 9.0.22
...
Closes gh-17680
2019-07-29 14:34:19 +02:00
Stephane Nicoll
1f901d398b
Upgrade to Byte Buddy 1.9.16
...
Closes gh-17679
2019-07-29 14:34:19 +02:00
Stephane Nicoll
1afcf5291d
Upgrade to Mysql 8.0.17
...
Closes gh-17678
2019-07-29 14:34:19 +02:00
Stephane Nicoll
fd7ed9c8be
Upgrade to Joda Time 2.10.3
...
Closes gh-17677
2019-07-29 14:34:19 +02:00
Stephane Nicoll
77317a44d8
Upgrade to Rxjava2 2.2.10
...
Closes gh-17675
2019-07-29 14:15:12 +02:00
Stephane Nicoll
eb6a160c13
Upgrade to Netty 4.1.38.Final
...
Closes gh-17674
2019-07-29 14:15:11 +02:00
Stephane Nicoll
487aab4f0a
Upgrade to Appengine Sdk 1.9.76
...
Closes gh-17673
2019-07-29 14:15:10 +02:00
Stephane Nicoll
6356852e2f
Polish "Log health check failure with Reactive health indicators"
...
See gh-17635
2019-07-29 11:25:44 +02:00
Dmytro Nosan
fe1b9c9501
Log health check failure with Reactive health indicators
...
See gh-17635
2019-07-29 11:18:19 +02:00
Stephane Nicoll
b79de1e7e3
Fix broken build
2019-07-26 16:26:37 +02:00
Stephane Nicoll
dd5d55a2d8
Start building against Spring Kafka 2.2.8 snapshots
...
See gh-17645
2019-07-26 14:12:53 +02:00
Stephane Nicoll
4b6b5fc160
Start building against Spring Integration 5.1.7 snapshots
...
See gh-17643
2019-07-26 14:11:33 +02:00
Stephane Nicoll
aa5630b0e0
Start building against Spring AMQP 2.1.8 snapshots
...
See gh-17641
2019-07-26 14:09:42 +02:00
Stephane Nicoll
ac4dcfbf9a
Improve detection of NoSuchMethodError cause
...
Closes gh-17649
2019-07-26 12:01:35 +02:00
Stephane Nicoll
9e8649ccca
Start building against Reactor Californium snapshots
...
See gh-17639
2019-07-25 17:37:40 +02:00
Dmytro Nosan
efce9388e7
Trim OAuth2 provider property whitespace
...
Update `OAuth2ClientPropertiesRegistrationAdapter` to trim whitespace
of the "provider" property.
See gh-17497
2019-07-24 14:32:41 +01:00
Phillip Webb
fb1dd8fe93
Merge branch '2.0.x' into 2.1.x
2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e
Merge '1.5.x' into 2.0.x
2019-07-24 11:39:58 +01:00
Stephane Nicoll
057ca8f6a8
Polish "Clarify description of "logging.file.max-history""
...
See gh-17567
2019-07-24 11:36:15 +02:00
lihongmingming
00a5528d7f
Clarify description of "logging.file.max-history"
...
See gh-17567
2019-07-24 11:36:15 +02:00
Stephane Nicoll
30fe10613d
Improve how to configure configuration keys of a custom starter
...
Closes gh-17573
2019-07-22 15:28:17 +02:00
Stephane Nicoll
300f07b2a8
Polish
2019-07-22 15:20:37 +02:00
Stephane Nicoll
3c7ac4fe7f
Polish
2019-07-22 13:17:51 +02:00
Stephane Nicoll
1661da8774
Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
...
See gh-17531
2019-07-22 13:09:31 +02:00
Dmytro Nosan
77b52b993b
Configure ActiveMQConnectionFactory properly without spring-jms
...
See gh-17531
2019-07-22 13:08:42 +02:00
dreis2211
c2b6939ae1
Cover more known Java versions in JavaVersion
...
See gh-17590
2019-07-22 10:24:54 +02:00
Andy Wilkinson
74f0e42c98
Make it clearer when there will be no auto-configured MessageSource
...
Closes gh-17485
2019-07-19 15:44:00 +01:00
Stephane Nicoll
8eb6886388
Fix code formating
2019-07-19 11:29:12 +02:00
Stephane Nicoll
e6a5895c05
Start build against Spring Session Bean snapshots
...
See gh-17581
2019-07-19 11:13:43 +02:00
Stephane Nicoll
32e00d5dd2
Start building against Spring Data Lovelace snapshots
...
See gh-17353
2019-07-19 11:11:42 +02:00
Stephane Nicoll
1d4e9cb6a4
Start building against Spring Framework 5.1 snapshots
...
See gh-17351
2019-07-19 11:10:58 +02:00
Stephane Nicoll
b8d92cb0ae
Fix @DataJdbcTest to be transactional as advertized
...
Closes gh-17513
2019-07-19 10:33:59 +02:00
Stephane Nicoll
5903e9a57a
Polish
2019-07-19 10:33:52 +02:00
dreis2211
43833c7bf0
Remove unused java-statsd-client dependencies
...
See gh-17508
2019-07-18 17:54:48 +01:00
Andy Wilkinson
591250f75e
Polish "Hide loader classes from Tomcat's ServletContext resource paths"
...
See gh-17538
2019-07-18 17:05:31 +01:00
adavid9
a81325bbbc
Hide loader classes from Tomcat's ServletContext resource paths
...
See gh-17538
2019-07-18 17:05:27 +01:00
Andy Wilkinson
b725c60177
Deprecate DeploymentInfo customization with reactive Undertow
...
Fixes gh-17555
2019-07-18 06:54:38 +01:00
Phillip Webb
30b5ba87ae
Merge branch '2.0.x' into 2.1.x
2019-07-17 21:48:01 +01:00
Phillip Webb
fd67f7ba3f
Merge branch '1.5.x' into 2.0.x
2019-07-17 21:47:04 +01:00
Stephane Nicoll
b6ca1eadeb
Fix prefix for datasource metrics
...
Closes gh-17553
2019-07-17 14:28:12 +02:00
Andy Wilkinson
9dabc0e14d
Cleared deferred lines after each test
...
Previously, DeferredLinesWriter would collect MockMvc output from
every test that has executed. If a test eventually failed, the
output from every test up to including the one that had failed would
be output, rather than just the output for the test that has just
failed.
This commit clears the deferred lines after each test, thereby
ensuring that when a failure occurs only the lines from the failing
test are output.
Fixes gh-17551
2019-07-17 12:29:41 +01:00
Stephane Nicoll
a64317b114
Fix broken link to Spring Integration metrics section
...
Closes gh-17543
2019-07-17 10:26:40 +02:00
Andy Wilkinson
e84477cfe2
Only perform Quartz DataSource init when using JDBC store
...
Fixes gh-17545
2019-07-17 09:04:17 +01:00
dreis2211
e9203a280c
Test the Gradle Plugin against Gradle 5.5.1
...
See gh-17496
2019-07-14 13:13:17 +02:00
Madhura Bhave
aebb60d8b8
Fix tests
...
Setting the log file name to a random value in smoke tests
doesn't work because the logger context has already been initialized.
2019-07-10 18:14:58 -07:00
Madhura Bhave
773dda3d55
Log file location should be evaluated just once
...
Using a random value for the logfile name caused
the logfile endpoint to return a 404 as the name
was resolved from the environment on every request.
This commit registers a bean for LogFile which is then
used by the logfile endpoint.
Fixes gh-17434
2019-07-10 14:46:09 -07:00
Dmytro Nosan
93d0427fb5
Polish AbstractDependsOnBeanFactoryPostProcessor
...
See gh-17480
2019-07-10 13:36:57 +01:00
Andy Wilkinson
f753c31988
Polish "Set up MongoClient beans' dependencies by type rather than name"
...
See gh-16627
2019-07-10 13:13:19 +01:00
ielatif
39f1039425
Set up MongoClient beans' dependencies by type rather than name
...
See gh-16627
2019-07-10 13:10:41 +01:00
Andy Wilkinson
80650f485d
Polish "Allow depended on beans to be identified by type"
...
See gh-17020
2019-07-10 12:25:57 +01:00
Dmytro Nosan
9923ffe9bd
Allow depended on beans to be identified by type
...
Prior to this commit, `AbstractDependsOnBeanFactoryPostProcessor`
could only identify depended on beans by name.
See gh-17020
2019-07-10 12:25:57 +01:00
Stephane Nicoll
852f4a280c
Fix supported java version range in documentation
...
Closes gh-17476
2019-07-10 12:48:50 +02:00
Andy Wilkinson
6748b20863
Prevent JUL loggers from being GCed once their level has been set
...
Fixes gh-17217
2019-07-09 19:51:55 +01:00
Stephane Nicoll
3fb15a502b
Remove outdated reference to Guava in the reference guide
...
Closes gh-17446
2019-07-09 18:00:57 +02:00
Andy Wilkinson
acd9b61c8e
Make Batch JPA auto-configuration back off without a DataSource
...
Fixes gh-17465
2019-07-09 15:46:45 +01:00
Andy Wilkinson
c5241f0e82
Remove accidental usage of com.hazelcast.util.Base64
...
Closes gh-17461
2019-07-09 15:03:31 +01:00
Andy Wilkinson
02bea78229
Retain as much Batch auto-config as possible without Spring JDBC
...
Closes gh-17451
2019-07-08 15:35:16 +01:00
Andy Wilkinson
a023f308ed
Make JDBC-based batch configurer back off without a DataSource
...
Closes gh-17449
2019-07-08 14:43:26 +01:00
Andy Wilkinson
7f85aba546
Auto-configure Data Mongo if user provides MongoDbFactory but no client
...
Previously, if a user defined a MongoDbFactory bean but did not define
a client bean, MongoDataAutoConfiguration would back off leaving the
context without a MongoTemplate, etc.
This commit reworks the auto-configuration so that only the
auto-configuration of a MongoDbFactory is dependent on the existence
of a Mongo client bean. Auto-configuration of the other components
that depend on a MongoDbFactory will now continue in the absence of a
Mongo client bean.
Closes gh-17416
2019-07-04 12:36:03 +01:00
Andy Wilkinson
7553b60e68
Test the Gradle Plugin against Gradle 5.5
...
Closes gh-17428
2019-07-04 10:05:57 +01:00
Phillip Webb
2f88dd735e
Polish
2019-07-03 15:52:51 -07:00
Phillip Webb
cd5f40aec2
Validate onFailure returned binding results
...
Update `ValidationBindHandler` so that any non-null result returned by
the parent `onFailure` method triggers re-validation.
Fixes gh-17421
2019-07-03 15:52:51 -07:00
Phillip Webb
d641a1e23a
Polish BindHandler javaodc
2019-07-03 15:52:51 -07:00
Andy Wilkinson
82fd4ce9b9
Fix empty context path warning when using Jetty with WebFlux
...
Previously, the context path was set to an empty string. The led to
Jetty logging a warning about an empty context path and then using
/ instead.
This commit avoids the warning while leaving the context path's end
result unchanged by setting the context path to /.
Closes gh-17399
2019-07-02 17:24:34 +01:00
Andy Wilkinson
e57579461a
Prevent endpoint's shutdown() method from being a destroy method
...
Closes gh-17407
2019-07-02 14:05:49 +01:00
Andy Wilkinson
5997886897
Add dependency management for Infinispan's Spring 5 modules
...
This commit adds dependency management for Infinispan's Spring 5
modules that are introduced in 9.4.9.Final. It also removes redundant
exclusions for the dependency management for its Spring 4 modules.
Closes gh-17346
2019-07-02 11:41:33 +01:00
Phillip Webb
206ba2ad86
Append chars not ints in getLettersAndDigits
...
Update `StringToEnumIgnoringCaseConverterFactory` so that the
`getLettersAndDigits` method correctly appends `char` elements
rather than `int` elements.
Closes gh-17327
2019-07-01 21:49:29 -07:00
Phillip Webb
88b6a3308c
Escape additional '{reference}' elements in asciidoc
...
Escape lines that look like variable references but should actually be
included verbatim.
Closes gh-17386
2019-07-01 11:39:49 -07:00
Phillip Webb
a81f37dd68
Escape '{reference}' elements in asciidoc files
...
Escape lines that look like variable references but should actually be
included verbatim.
Closes gh-17386
2019-07-01 11:02:05 -07:00
Andy Wilkinson
34e0db2c25
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17382
2019-07-01 15:57:21 +01:00
Andy Wilkinson
0c44584b44
Merge branch '1.5.x' into 2.0.x
2019-07-01 15:57:00 +01:00
Andy Wilkinson
4083c721f2
Fix URL normalization when replacing /./ with /
...
Previously, a regular expression of /./ was used to replace /./ with
/. The '.'' in the expression matches any single character so the
replacement was more broadly applicable than it should have been. For
example, /a/ would be replaced with /.
This commit uses Pattern.LITERAL to compile the regular expression
from the CURRENT_DIR (/./) contant. This allows the constant to be
used to check for occurances of /./ in the string before attempting
replacement, while also ensuring that the '.' is treated literally.
Closes gh-17341
2019-07-01 15:42:54 +01:00
Dmytro Nosan
ae184874e9
Polish WebServiceTemplateBuilder
...
See gh-17289
2019-06-29 22:19:03 +01:00
Johnny Lim
408035fb3f
Remove System.out.println() in a test
...
See gh-17358
2019-06-29 21:18:44 +01:00
Johnny Lim
8dea74a2e9
Add a missing quote in DebugLogbackConfigurator
...
See gh-17357
2019-06-29 21:14:42 +01:00
Andy Wilkinson
f4e7b80651
Merge branch '2.0.x' into 2.1.x
...
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson
761856ac70
Merge branch '1.5.x' into 2.0.x
2019-06-29 20:29:16 +01:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Phillip Webb
9aa4887376
Merge branch '2.0.x' into 2.1.x
2019-06-28 14:14:52 -07:00
Phillip Webb
ed3e1e076d
Fix AbstractFilterRegistrationBean merge error
...
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb
de35efd1ef
Merge branch '2.0.x' into 2.1.x
2019-06-28 12:21:57 -07:00
Phillip Webb
bb34846630
Merge branch '1.5.x' into 2.0.x
2019-06-28 12:19:46 -07:00
Andy Wilkinson
91786bc712
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d
Merge branch '1.5.x' into 2.0.x
2019-06-27 11:39:02 +01:00
Andy Wilkinson
3fb06ee29e
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17320
2019-06-26 17:39:13 +01:00
Andy Wilkinson
4973a2b217
Merge branch '1.5.x' into 2.0.x
2019-06-26 17:37:39 +01:00
Phillip Webb
02e705c8e4
Relax nohttp requirement for service.wsdl
...
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.
Fixes gh-17307
2019-06-25 11:17:27 -07:00