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
Stephane Nicoll
7849d73828
Polish
...
See gh-13031
2018-05-29 17:28:16 +02:00
Stephane Nicoll
faa9910e46
Enable cache when a SecurityContext parameter is used
...
This commit restores caching for the main read operation when the
SecurityContext does not expose a principal (i.e. guest access).
Closes gh-13238
2018-05-29 15:56:22 +02:00
Andy Wilkinson
1ce22aa50a
Polish
2018-05-29 13:58:40 +01:00
Stephane Nicoll
4259817572
Fix extension discovery when endpoint instance is sub-classed
...
This commit fixes endpoint extension discovery when the related endpoint
is sub-classed. Previously, a strict by type check was applied against
the `endpoint` attribute of `EndpointExtension`.
Rather than using a `Class` check, this commit extracts the id of an
endpoint and uses it to match its extension, if any.
Closes gh-13082
2018-05-29 14:12:23 +02:00
nkjackzhang
17bcd1c359
Fix wrong reference in cast operation
...
Closes gh-13288
2018-05-29 10:37:32 +02:00
Johnny Lim
bd2053aa17
Use more Tag constants
...
Closes gh-13286
2018-05-29 09:32:26 +02:00
Johnny Lim
9de2a8786d
Fix a wrong issue reference
...
Closes gh-13284
2018-05-29 09:21:41 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
Stephane Nicoll
15ba50ab3e
Merge branch '1.5.x' into 2.0.x
2018-05-28 10:52:21 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Eddú Meléndez
065eebfb4b
Fix javadoc
...
Closes gh-13274
2018-05-28 09:26:16 +02:00
hengyunabc
b75e58b70f
Add enforce-rule to ensure maven version >= 3.5.0
...
Closes gh-13271
2018-05-27 18:03:52 +02:00
Phillip Webb
dba73d76b8
Merge branch '1.5.x' into 2.0.x
2018-05-26 08:43:27 -07:00
Arnaud Heritier
b60eadb10b
Add missing semicolon in example
...
Closes gh-13266
2018-05-26 12:44:11 +02:00
Phillip Webb
6f0ccc64a5
Fix checkstyle violations
2018-05-25 23:03:17 -07:00
Phillip Webb
9fd3b9103a
Format code
2018-05-25 23:02:45 -07:00
Phillip Webb
e544922dd7
Merge branch '1.5.x' into 2.0.x
2018-05-25 23:02:08 -07:00
Phillip Webb
9c5f207e22
Fix merge error
2018-05-25 20:57:46 -07:00
Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Andrea Vacondio
aed118c410
Fix documentation error
...
Closes gh-13260
2018-05-25 16:43:35 +02:00
Madhura Bhave
552878c431
Fix javadoc
2018-05-25 10:37:39 +02:00
Stephane Nicoll
a5b53b263e
Merge branch '1.5.x' into 2.0.x
2018-05-24 11:43:48 +02:00
Stephane Nicoll
585135a280
Polish
2018-05-22 13:40:40 +02:00
Stephane Nicoll
d5abd57a91
Remove deprecated use of spring.main.web-environment
...
Closes gh-13231
2018-05-22 13:39:02 +02:00
Stephane Nicoll
a124379dd9
Remove use of deprecated `web` methods
...
Closes gh-13231
2018-05-22 12:51:06 +02:00
Phillip Webb
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Stephane Nicoll
300f6bf4d7
Polish contribution
...
Closes gh-13208
2018-05-18 14:20:31 +02:00
Mihhail Lapushkin
d31dbac69e
Support custom UriTemplateHandler in LocalHostUriTemplateHandler
...
See gh-13208
2018-05-18 14:19:01 +02:00
Stephane Nicoll
48cf025093
Polish
2018-05-18 13:42:45 +02:00
Stephane Nicoll
6893be5479
Make sure that RabbitMQ metrics are configured early
...
The ConnectionFactory can be used early in user configuration to
configure an `Exchange`. Such connection may not hold the proper
MetricCollector and can be cached, leading to missed metrics
information.
This commit moves the configuration of RabbitMQ metrics to a
BeanPostProcessor so that the proper MetricCollector is configured
before any connection is created.
Closes gh-12855
2018-05-18 11:54:11 +02:00
Stephane Nicoll
125b5974c0
Merge branch '1.5.x' into 2.0.x
2018-05-17 16:17:55 +02:00
Johnny Lim
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
Stephane Nicoll
1d2edc1d37
Fix wrong reference to WebApplicationType
...
Closes gh-13195
2018-05-17 09:35:07 +02:00
Stephane Nicoll
7b7e802129
Merge branch '1.5.x' into 2.0.x
2018-05-16 13:16:54 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
Andy Wilkinson
be0b8eb871
Merge branch '1.5.x' into 2.0.x
2018-05-15 10:28:46 +01:00
Andy Wilkinson
8b028e30d3
Merge branch '1.5.x' into 2.0.x
2018-05-15 09:18:01 +01:00
Andy Wilkinson
73e525a280
Merge branch '1.5.x' into 2.0.x
2018-05-14 20:07:46 +01:00
Andy Wilkinson
cddc2b4483
Merge branch '1.5.x' into 2.0.x
2018-05-14 17:54:31 +01:00
Stephane Nicoll
a3a6a2b291
Polish "Add CLI manifest for Scoop"
...
Closes gh-12541
2018-05-14 18:20:57 +02:00
Andrey Saksonov
daccdbb18d
Add CLI manifest for Scoop
...
See gh-12541
2018-05-14 18:00:32 +02:00
Stephane Nicoll
2be1c8f527
Polish "Set classloader for JMX endpoints to application classloader"
...
Closes gh-12209
2018-05-14 17:41:47 +02:00
David Herberth
e44c81672f
Set classloader for JMX endpoints to application classloader
...
See gh-12209
2018-05-14 17:41:31 +02:00
Sebastien Deleuze
d747d43b23
Update Kotlin refdoc with the new tutorial
...
Closes gh-13161
2018-05-14 16:03:46 +02:00
Andy Wilkinson
285203d272
Provide dependency management for Hibernate's JPA API module
...
Closes gh-13154
2018-05-14 11:43:31 +01:00
Stephane Nicoll
caa271dcc1
Merge branch '1.5.x' into 2.0.x
2018-05-14 11:08:59 +02:00
Stephane Nicoll
8f53c2e2bb
Support for custom comment prefix
...
Some Quartz initialization scripts have comments in a different format.
This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.
Closes gh-13041
2018-05-14 09:32:42 +02:00
Johnny Lim
3dd2f5bb05
Polish
...
See gh-13148
2018-05-14 08:19:10 +02:00
Johnny Lim
aa60d60b8a
Polish JpaProperties.determineDdlAuto()
...
Closes gh-13036
2018-05-14 08:13:06 +02:00
Andy Wilkinson
3992dacdc8
Bind empty string to empty collection or array of rich types
...
Previously, when an empty String was bound to a collection or
array of rich types it would fail as there was no converter capable
of creating a Collection<RichType> or RichType[] from the String.
This commit updates IndexedElementsBinder to apply special treatment
to empty String values. Now, when such a value is being processed,
an empty Collection or array is the result.
Closes gh-12965
2018-05-11 16:41:37 +01:00
Andy Wilkinson
45f4e8795e
Merge branch '1.5.x' into 2.0.x
2018-05-11 13:32:08 +01:00
Vedran Pavic
a08fa27c39
Add .gitignore for Gradle Plugin module
...
Closes gh-13137
2018-05-11 14:28:02 +02:00
dreis2211
e6a23fa3ff
Remove unnecessary semicolons
...
Closes gh-13144
2018-05-11 14:23:47 +02:00
Andy Wilkinson
972d952716
Merge branch '1.5.x' into 2.0.x
2018-05-11 11:54:12 +01:00
Andy Wilkinson
7913d9b599
Add methods to BootJar for adding content to BOOT-INF
...
Closes gh-13000
2018-05-11 11:14:14 +01:00
Andy Wilkinson
d9d7499ae6
Merge branch '1.5.x' into 2.0.x
2018-05-11 10:31:52 +01:00
Johnny Lim
75e591e76e
Polish
...
Closes gh-13130
2018-05-11 10:00:15 +02:00
Stephane Nicoll
4683940423
Merge branch '1.5.x' into 2.0.x
2018-05-11 09:56:54 +02:00
Stephane Nicoll
4bec3b7cd9
Polish
...
See gh-13123
2018-05-11 08:55:03 +02:00
Madhura Bhave
05cf8229d9
Fix tests
2018-05-10 11:50:43 -07:00
Madhura Bhave
c937bb68a0
ServletEndpoints should take servletPath into account
...
Fixes gh-13106
2018-05-10 10:01:11 -07:00
Andy Wilkinson
fbf974478a
Merge branch '1.5.x' into 2.0.x
2018-05-10 15:46:28 +01:00
Madhura Bhave
4ec87956f9
Fix EndpointRequest include/exclude for ServletEndpoints
...
Fixes gh-13089
2018-05-09 12:01:58 -07:00
Andy Wilkinson
e14a2e33ab
Deprecate queue size property for StatsD metrics export
...
Closes gh-13108
2018-05-09 09:14:09 +01:00
Andy Wilkinson
c826310fd1
Polish
2018-05-09 08:44:15 +01:00
Jon Schneider
c6860cb431
Upgrade to Micrometer 1.0.4
...
Closes gh-13108
2018-05-09 06:38:55 +01:00
Andy Wilkinson
33861b3608
Upgrade to Spring Integration 5.0.5.RELEASE
...
Closes gh-13016
2018-05-09 06:37:22 +01:00
Andy Wilkinson
e407ed5f92
Upgrade to Spring Session Apple-SR2
...
Closes gh-13103
2018-05-08 21:21:08 +01:00
Andy Wilkinson
8ce4110966
Allow Jersey-based Actuator to be used with separate management port
...
Previously, when the Jersey-based Actuator was configure with a
separate management port, the resulting child context would fail to
start due to their being no ResourceConfigCustomizer beans available.
This commit updates the configuration so that the customizer's are
injected using an ObjectProvider and an empty list is used in the
event of their being no customizer beans. This aligns the child
context configuration class with JerseyAutoConfiguration which
already used this approach.
Closes gh-12975
2018-05-08 21:00:05 +01:00
Andy Wilkinson
e45384bdfa
Upgrade to Spring Kafka 2.1.6.RELEASE
...
Closes gh-13018
2018-05-08 20:16:41 +01:00
Andy Wilkinson
7a53623e1c
Polish "Clarify deployment of Spring Boot apps to App Engine Standard"
...
See gh-13090
2018-05-08 20:12:46 +01:00
ifigotin
676b013998
Clarify deployment of Spring Boot apps to App Engine Standard
...
Closes gh-13090
2018-05-08 20:12:33 +01:00
Andy Wilkinson
5168766ebb
Upgrade to Spring Security 5.0.5.RELEASE
...
Closes gh-13029
2018-05-08 17:07:17 +01:00
Andy Wilkinson
bca2756b46
Upgrade to Jaybird 3.0.4
...
Closes gh-13100
2018-05-08 17:06:55 +01:00
Andy Wilkinson
47c45539d9
Upgrade to Lettuce 5.0.4.RELEASE
...
Closes gh-13099
2018-05-08 17:06:40 +01:00
Stephane Nicoll
f9134c9325
Upgrade to Spring Data Kay SR7
...
Closes gh-13017
2018-05-08 17:22:01 +02:00
Stephane Nicoll
6577513464
Upgrade to Spring Framework 5.0.6.RELEASE
...
Closes gh-13021
2018-05-08 12:44:55 +02:00
Andy Wilkinson
874650cb33
Merge branch '1.5.x' into 2.0.x
2018-05-08 11:30:30 +01:00
Stephane Nicoll
9dccf5b895
Polish
...
See gh-13078
2018-05-07 14:48:56 +02:00
dreis2211
15d67d6b12
Remove MockServletWebServer.emptyEnumeration()
...
Closes gh-13084
2018-05-07 14:41:06 +02:00
dreis2211
e3862d9bdf
Fix deprecation warning in OriginTrackedYamlLoader
...
Closes gh-13085
2018-05-07 14:38:22 +02:00
Brian Clozel
925269eacc
Upgrade to Reactor Bismuth SR9
...
Closes gh-12848
2018-05-07 10:54:24 +02:00
Stephane Nicoll
c22e9a5514
Make sure that JpaProperties does not have Hibernate imports
...
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.
This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.
Closes gh-13043
2018-05-05 07:21:50 +02:00
Phillip Webb
6556bb2e89
Fix checkstyle violations
2018-05-04 20:13:57 -07:00
Phillip Webb
975e986fef
Polish
2018-05-04 20:06:27 -07:00
Phillip Webb
f9750248ef
Migrate KafkaProperties to use PropertyMapper
2018-05-04 20:06:11 -07:00
Madhura Bhave
469372c5ef
Account for servlet path "/" in EndpointRequest
...
See gh-12934
2018-05-04 18:09:15 -07:00
Madhura Bhave
f5f3af7f9c
Point to gradle plugin's doc for custom dependency versions
...
Fixes gh-12807
2018-05-04 16:54:11 -07:00
Phillip Webb
6de479fe6a
Polish
2018-05-04 16:08:05 -07:00
Phillip Webb
93046d058d
Polish
2018-05-04 16:05:12 -07:00
Madhura Bhave
6855c5556d
EndpointRequest should consider server.servlet.path
...
Fixes gh-12934
2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698
Update copyright header year for changed files
2018-05-04 15:59:26 -07:00
Phillip Webb
57bfbfb3ad
Fix checkstyle errors
2018-05-04 15:58:59 -07:00
Phillip Webb
6e09e497f2
Formatting
2018-05-04 12:06:19 -07:00
Andy Wilkinson
fefe9e4e49
Upgrade to Junit Jupiter 5.1.1
...
Closes gh-13075
2018-05-04 19:18:41 +01:00
Andy Wilkinson
c74292c222
Upgrade to Jooq 3.10.7
...
Closes gh-13074
2018-05-04 19:18:40 +01:00
Andy Wilkinson
ee587130b2
Upgrade to Narayana 5.8.1.Final
...
Closes gh-13073
2018-05-04 19:18:40 +01:00
Andy Wilkinson
36880ad25b
Upgrade to Hibernate 5.2.17.Final
...
Closes gh-13072
2018-05-04 19:18:39 +01:00
Andy Wilkinson
578dd8611c
Upgrade to Elasticsearch 5.6.9
...
Closes gh-13071
2018-05-04 19:18:39 +01:00
Andy Wilkinson
205449cca1
Upgrade to Javax Money 1.0.3
...
Closes gh-13070
2018-05-04 19:18:38 +01:00
Andy Wilkinson
9ec27d1f97
Upgrade to Rxjava2 2.1.13
...
Closes gh-13069
2018-05-04 19:18:37 +01:00
Andy Wilkinson
ff915b3450
Upgrade to Hazelcast 3.9.4
...
Closes gh-13068
2018-05-04 19:18:36 +01:00
Andy Wilkinson
5c2d4980de
Upgrade to Couchbase Client 2.5.8
...
Closes gh-13067
2018-05-04 19:18:36 +01:00
Andy Wilkinson
c16f99f782
Revert "Upgrade to Ehcache 2.10.5" in 2.0 as well
...
See gh-13056
2018-05-04 16:01:39 +01:00
Stephane Nicoll
18b1e8da60
Merge branch '1.5.x' into 2.0.x
2018-05-04 16:57:12 +02:00
Stephane Nicoll
959c569199
Merge branch '1.5.x' into 2.0.x
2018-05-04 16:15:10 +02:00
Stephane Nicoll
126f928f36
Polish "Improve Spring Session docs"
...
Closes gh-13061
2018-05-04 14:26:51 +02:00
Vedran Pavic
370160720d
Improve Spring Session docs
...
See gh-13061
2018-05-04 14:26:39 +02:00
Andy Wilkinson
2bcf29913d
Skip building the Gradle plugin on Java 9 as well as 10
...
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.
This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
2018-05-04 11:40:35 +01:00
Andy Wilkinson
a1f3e7970c
Merge branch '1.5.x' into 2.0.x
2018-05-04 10:03:54 +01:00
Phillip Webb
2d70a7ae5e
Polish caught exception names
...
Prefer `ex` over `e`.
2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7
Polish ternary expressions
...
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb
bbf94c22da
Polish
2018-05-03 22:42:49 -07:00
Phillip Webb
e125085993
Merge branch '1.5.x' into 2.0.x
2018-05-03 12:43:50 -07:00
Stephane Nicoll
700ec6b840
Polish "Complete SSL configuration for Kafka"
...
Closes gh-13031
2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59
Complete SSL configuration for Kafka
...
See gh-13031
2018-05-03 15:38:49 +02:00
Andy Wilkinson
f5fabbc1b9
Remove the use of internal API from Gradle Plugin's BootJar
...
Closes gh-13037
2018-05-03 11:34:42 +01:00
Stephane Nicoll
69ab956e8b
Stop assuming datasource creation failure originates from auto-config
...
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.
This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.
Closes gh-12947
2018-05-03 11:46:27 +02:00
Stephane Nicoll
b3ad902902
Merge branch '1.5.x' into 2.0.x
2018-05-03 11:14:42 +02:00
Johnny Lim
e7d2f22911
Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
...
Closes gh-13022
2018-05-02 16:12:37 +02:00
Johnny Lim
12cdc8b0e0
Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
...
Closes gh-13019
2018-05-02 16:11:37 +02:00
Stephane Nicoll
7cca56e15b
Upgrade to HikariCP 2.7.9
...
Closes gh-12783
2018-05-02 16:09:02 +02:00
Stephane Nicoll
d6244889f5
Add default value for "spring.flyway.locations"
...
See gh-12193
2018-05-02 16:07:38 +02:00
Stephane Nicoll
79c222da78
Allow to provide manual metadata for keys that are not unique
...
Closes gh-12193
2018-05-02 16:04:02 +02:00
Stephane Nicoll
782d8c63da
Merge branch '1.5.x' into 2.0.x
2018-05-02 15:59:56 +02:00
Andy Wilkinson
f019d5c85b
Merge branch '1.5.x' into 2.0.x
2018-05-02 12:22:04 +01:00
Andy Wilkinson
0a9d950a44
Start building against Spring Kafka 2.1.6 snapshots
...
See gh-13018
2018-05-02 11:32:26 +01:00
Andy Wilkinson
2a8eb2c113
Start building against Spring Integration 5.0.5 snapshots
...
See gh-13016
2018-05-02 11:31:29 +01:00
Andy Wilkinson
c50687758e
Start building against Spring Data Kay SR7 snapshots
...
See gh-13017
2018-05-02 11:30:53 +01:00
Andy Wilkinson
0d67ca1e81
Starting building against Spring Framework 5.0.6 snapshots
...
See gh-13021
2018-05-02 11:29:25 +01:00
Andy Wilkinson
49089546f8
Merge branch '1.5.x' into 2.0.x
2018-05-02 10:57:29 +01:00
Stephane Nicoll
fbf8f57773
Merge branch '1.5.x' into 2.0.x
2018-05-02 10:41:24 +02:00
Madhura Bhave
aad279208e
Throw exception if RandomAccessData tries to read beyond EOF
...
Fixes gh-12986
2018-05-01 16:35:43 -07:00
Madhura Bhave
d268b2102f
Fix typo
2018-05-01 11:33:47 -07:00
Stephane Nicoll
9f7be62687
Backport polish commit "22b99a90"
2018-05-01 11:33:26 -07:00
Andy Wilkinson
d5841982d9
Upgrade to Testcontainers 1.7.2
...
See gh-12821
2018-05-01 09:25:04 +01:00
Johnny Lim
d8700522d3
Rename nested *AutoConfiguration classes to *Configuration
...
Closes gh-12989
2018-04-30 16:50:18 +02:00
Johnny Lim
a723ac95a9
Polish
...
Closes gh-12999
2018-04-30 16:44:46 +02:00
Yaman Jain
50ca33ecd2
Fix typo
...
Closes gh-12996
2018-04-30 16:42:22 +02:00
Sebastien Deleuze
933f0bbca8
Upgrade to Kotlin 1.2.41
...
Includes KT-23973 critical regression fix.
2018-04-30 12:25:00 +01:00
Madhura Bhave
0385bd4131
Use spring.session.timeout for Spring Session timeout
...
Fallback to server.servlet.session.timeout for backwards compatibility.
Fixes gh-12906
2018-04-27 13:16:17 -07:00
Stephane Nicoll
36fb078935
Merge branch '1.5.x' into 2.0.x
2018-04-27 10:19:45 +02:00
Johnny Lim
b941c5f1a6
Polish
...
Closes gh-12981
2018-04-27 09:29:16 +02:00
Madhura Bhave
f2d8ca8b3a
Fix failing NettyReactiveWebServerFactoryTests
...
NettyReactiveWebServerFactoryTests.portInUseExceptionIsThrownWhenPortIsAlreadyInUse
started failing on CI following this change in reactor netty:
e6634c27f6
Instead of a `BindException`, a `NativeIoException` is thrown. Since that Exception
is for internal use only, we throw a generic `WebServerException`
instead of the `PortInUseException`.
2018-04-26 15:39:08 -07:00
Madhura Bhave
24ce3ecb43
Fix typo in docs
2018-04-26 13:43:51 -07:00
Madhura Bhave
228c85fe67
Improve List and Map binding documentation
...
Closes gh-12444
2018-04-26 12:18:49 -07:00
Stephane Nicoll
fbe88c483e
Prevent rabbitmq starter to bring webflux on the classpath
...
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.
Closes gh-12853
2018-04-26 16:44:42 +02:00
Stephane Nicoll
9cf8080a17
Polish "Document Kotlin custom metadata generation"
...
Closes gh-12960
2018-04-25 17:19:55 +02:00
sdeleuze
c24e7a5930
Document Kotlin custom metadata generation
...
See gh-12960
2018-04-25 17:19:38 +02:00
Andy Wilkinson
a358f3f0e8
Merge branch '1.5.x' into 2.0.x
2018-04-25 11:58:31 +01:00
Stephane Nicoll
11ad9bfebf
Upgrade version of gradle-git-properties in doc
...
Closes gh-12955
2018-04-25 09:43:19 +02:00
Stephane Nicoll
55ef9e6dc9
Deprecate excludeArtifactIds
...
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.
Closes gh-12885
2018-04-24 13:25:58 +02:00
Andy Wilkinson
c9f04c3977
Avoid race between container starting and getting mapped port
2018-04-24 11:03:54 +01:00
Andy Wilkinson
f6cc1cbd76
Make Testcontainer wait strategies final
2018-04-24 10:38:57 +01:00
Andy Wilkinson
f39cea0428
Try to stabilize build by giving Cassandra longer to start
2018-04-24 10:27:11 +01:00
Andy Wilkinson
6c504a5098
Fix deprecation warnings in Testcontainers wait strategies
...
See gh-12821
2018-04-24 10:27:11 +01:00
Johnny Lim
a15319ee30
Remove ManagementServerProperties.addApplicationContextHeader
...
Closes gh-12926
2018-04-24 10:16:49 +02:00
Madhura Bhave
877c4f702e
Use empty key-store-password if storeprovider present
...
For tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the keyStore with an
empty password. Previously, if a password was supplied using the
ssl.key-store-password property, that would be the password used to
load the keystore and the connector would fail with a
"Password verification failed" exception.
Fixes gh-11391
2018-04-23 12:31:47 -07:00
Andy Wilkinson
a5f3f36b58
Test the Gradle plugin against Gradle 4.7
...
Closes gh-12952
2018-04-23 17:24:50 +01:00
Andy Wilkinson
72ec2c8644
Polish “Only analyze configurations that we've registered to check”
...
Closes gh-12784
2018-04-23 16:45:21 +01:00
danhyun
1e447ebfbf
Only analyze configurations that we've registered to check
...
See gh-12784
2018-04-23 16:25:17 +01:00
Andy Wilkinson
806978b8f1
Test unresolved dependency analysis in the Gradle plugin
...
See gh-12784
2018-04-23 15:52:56 +01:00
Brian Clozel
e3e404f9f9
Fix optional ContentNegotiationStrategy for Actuator
...
Since https://jira.spring.io/browse/SPR-16624 , the contract for
`ContentNegotiationStrategy` has been refined and should never return an
empty list if it's got no preference for a media type, but it should
rather respond with a `"*/*"` instead.
This commit fixes the `OptionalPathExtensionContentNegotiationStrategy`
defined in the Spring MVC auto-configuration to have that behavior.
Fixes gh-12900
2018-04-23 13:48:42 +02:00
Stephane Nicoll
f58f23c5b8
Document that binder doesn't handle static properties
...
Closes gh-12912
2018-04-22 11:11:56 +02:00
Stephane Nicoll
469ce57016
Remove outdated note
...
As we've updated the complete ref doc to use a canonical format for
configuration keys, this not is outdated and this commit removes it.
2018-04-22 09:20:19 +02:00
Stephane Nicoll
6df1ea3544
Fix use of deprecated property in docs
...
Closes gh-12940
2018-04-22 09:19:08 +02:00
Brian Clozel
f1b3188c3c
Upgrade to Netty 4.1.24.Final
2018-04-21 09:47:02 +02:00
Madhura Bhave
5afa7d1965
Reset URLStreamHandlerFactory instance between tests
2018-04-20 12:28:53 -07:00
dreis2211
a930835b92
Replace <code> tags where possible
...
Closes gh-12922
2018-04-20 07:19:31 +02:00
Madhura Bhave
5792042d5d
Fix verify statements in tests
2018-04-19 14:59:48 -07:00
Madhura Bhave
c93f7ddff6
Make truststore & keystore optional on SslStoreProvider
...
Fixes gh-11395
2018-04-19 14:21:57 -07:00
evernat
91fa76a9a2
Add reference to javamelody starter
...
Closes gh-12877
2018-04-19 09:25:38 +02:00
Madhura Bhave
35af166750
Fix tests
...
See gh-11380
2018-04-18 10:47:37 -07:00
Madhura Bhave
cab9bff4f4
Log included profiles according to the processing order
...
This commit includes some refactoring of active profiles
processing. Previously, there was a LIFO Queue for adding active
profiles. Profiles that were added last, were processed first.
Because of this reverse ordering, profiles were prepended to the
environment to preserve the order in which they were logged.
This however didn't work for "included" profiles as they were
prepended to the environment even though they were processed after
the active profile. In this commit, profiles are processed in a FIFO manner
and processed as they're found.
Fixes gh-11380
2018-04-18 10:03:12 -07:00
Stephane Nicoll
026d8bed5f
Fix additional missing semicolon on sample code
...
Closes gh-12895
2018-04-18 09:49:15 +02:00
Jienan Duan
90ae14ec21
Add missing semicolon on sample code
...
See gh-12895
2018-04-18 09:47:54 +02:00
Stephane Nicoll
2b98b11c12
Polish "Less object instantiation in WebMvcTags"
...
Closes gh-12894
2018-04-18 09:41:40 +02:00
Jon Schneider
d676147680
Less object instantiation in WebMvcTags
...
See gh-12894
2018-04-18 09:38:23 +02:00
Stephane Nicoll
0bc7bef5e5
Properly handle InvalidEndpointRequestException
...
This commit makes sure that `InvalidEndpointRequestException` is wrapped
in a `ReflectionException` when invoked via JMX.
Closes gh-12857
2018-04-16 11:33:22 +02:00
Stephane Nicoll
2002115637
Add doc ref for hierarchical name mapping
2018-04-16 08:43:46 +02:00
Stephane Nicoll
1c0f589c01
Simplify Joinfaces community starter entry
...
See gh-12867
2018-04-16 08:16:18 +02:00
dreis2211
2bbf438c36
Fix duplicate words in comments
...
Closes gh-12866
2018-04-16 08:09:40 +02:00
Stephane Nicoll
bfe31e6688
Fix broken build
2018-04-13 16:40:15 +02:00
Stephane Nicoll
fa542bacc0
Translate user-defined exception when invoking JMX operation
...
This commit makes sure to respect the MBeanServer#invoke contract by
wrapping any user-defined exception in an MBeanException. Also, any
exception not from the JDK is translated, as it may lead to unexpected
issue on the client if that class isn't present. This is consistent
with our operation result mapping strategy.
Closes gh-10448
2018-04-13 16:26:04 +02:00
Stephane Nicoll
2204d5f750
Polish
2018-04-13 15:18:42 +02:00
Stephane Nicoll
31441a7590
Add a note to explain how to disable the web server
...
See gh-12853
2018-04-13 15:18:08 +02:00
Stephane Nicoll
7550f92ea5
Clarify DataSource metrics section for custom DataSources
...
Closes gh-12851
2018-04-13 14:50:44 +02:00
Brian Clozel
29a719dfb3
Upgrade to Undertow 1.4.24.Final
...
This commit also updates tests since UNDERTOW-1260 has been fixed in
this release.
Closes gh-12852
2018-04-13 11:48:09 +02:00
Brian Clozel
b2e7be17ab
Polish gh-11514
...
As pointed out by Rossen in gh-11514 comments, a handler might commit
the response and then send an error signal in the pipeline. In this
case, adding a callback to `beforeCommit` is useless because it won't be
triggered. In those cases, we need to collect metrics right away.
2018-04-12 22:50:16 +02:00
Madhura Bhave
9c7612e681
Fix NPE in WaitStrategy used for test containers
2018-04-12 10:30:36 -07:00
Brian Clozel
b7695fabab
Switch to Reactor Bismuth SNAPSHOTs
2018-04-12 18:01:33 +02:00
Stephane Nicoll
38bd4bd58c
Stop associating an Executor bean to Quartz
...
This commits make sure that the Quartz auto-configuration no longer
associates an `Executor` bean if present in the context as Quartz offers
properties to tune it, which would mutate and lead to unexpected
results.
Closes gh-12823
2018-04-12 15:48:20 +02:00
Stephane Nicoll
e4e56bbcc3
Migrate to ApplicationContextRunner
2018-04-12 15:48:20 +02:00
Brian Clozel
3fa8fe85af
Deprecate RouterFunctionMetrics
...
Spring Boot now deploys both annotation-based and functional endpoints
under the same `HttpHandler`; this means the currently auto-configured
`MetricsWebFilter` is instrumenting all endpoints to produce metrics.
There is no need for a WebFlux functional specific support.
This commit removes mentions of `RouterFunctionMetrics` in the docs and
deprecates that class.
Closes gh-12833
2018-04-12 12:08:44 +02:00
Brian Clozel
77be10e7bc
Fix "status" metrics tag for error responses
...
Prior to this commit, the metrics `WebFilter` would handle exceptions
flowing through the pipeline and extract tag information right away.
Since error handling turns the exception information into error HTTP
responses later in the chain, the information extracted from the
response earlier is invalid.
In this case, the "status" information could be "200" whereas error
handlers would later set that status to "500".
This commit delays the tags extraction later in the process, right
before the response is comitted. The happy path is not changed, as
handlers signal that the response is fully taken care of at that point.
Fixes gh-11514
2018-04-12 11:30:43 +02:00
DK Lee
1f91ae541f
Fix WebClient example constructor name
...
Closes gh-12842
2018-04-12 09:44:03 +02:00
Madhura Bhave
4fab679829
Upgrade testcontainers to 1.7.0
...
Closes gh-12821
2018-04-11 10:40:54 -07:00
Stephane Nicoll
f55753c1dc
Add reference to Axon Framework
2018-04-11 17:43:33 +02:00
Stephane Nicoll
5cba7400e1
Add reference to Flowable
2018-04-11 11:53:33 +02:00
Stephane Nicoll
3c169b4e0a
Fix bean name of EnvironmentEndpointWebExtension
...
Closes gh-12827
2018-04-11 11:34:44 +02:00
Ken Kwon
16ad34aa19
Fix typo
...
Closes gh-12825
2018-04-11 10:51:20 +02:00
Stephane Nicoll
e8fac7d9c4
Properly discover endpoints that are proxied
...
Previously to this commit, if a `@ControllerEndpoint`,
`@RestControllerEndpoint` or `@ServletEndpoint` annotated bean was
proxied, the endpoint wasn't properly detected.
This commit makes sure that annotation retrieval works on the user class
while preserving the get (vs. find) retrieval semantic
Closes gh-12441
2018-04-10 20:23:55 +02:00
Stephane Nicoll
86b96254a1
Migrate to ApplicationContextRunner
2018-04-10 20:23:54 +02:00
Stephane Nicoll
f83934e192
Polish contribution
...
Closes gh-12812
2018-04-10 11:46:16 +02:00
Johnny Lim
f03849d502
Polish
...
See gh-12812
2018-04-10 11:46:16 +02:00
Andy Wilkinson
4fbe0b1283
Add dependency management for Kafka
...
Closes gh-12815
2018-04-10 09:07:19 +01:00
Phillip Webb
ba85cefce3
Polish
2018-04-09 14:50:03 -07:00
Andy Wilkinson
8d5b9f37d5
Merge branch '1.5.x'
2018-04-09 17:59:53 +01:00
Andy Wilkinson
8b1a101cb6
Merge branch '1.5.x'
2018-04-09 17:39:26 +01:00
Stephane Nicoll
6692301d51
Polish "Replace Couchbase's deprecated methods"
...
Closes gh-12655
2018-04-09 16:17:46 +02:00
Yulin Qin
3236306e53
Replace Couchbase's deprecated methods
...
See gh-12655
2018-04-09 13:22:22 +02:00
Stephane Nicoll
92d9479765
Gracefully handle exclusion of DataSourceAutoConfiguration
...
This commit makes sure that an auto-configuration that requires
`DataSourceProperties` will not break if `DataSourceAutoConfiguration`
has been explicitly excluded.
Closes gh-12512
2018-04-09 10:34:23 +02:00
Madhura Bhave
2f5ab50367
Add @QuartzDataSource for quartz auto-configuration
...
Closes gh-12755
2018-04-05 16:49:04 -07:00
Andy Wilkinson
c3bf8541d7
Do not rely on findAvailableTcpPort finding an available port
...
Closes gh-12779
2018-04-05 11:35:58 +01:00
Jichun Liu
34986ed12f
Add docker-api starter to 3rd party list
...
See https://github.com/jliu666/docker-api-spring-boot
Closes gh-12605
2018-04-05 11:12:29 +02:00
Andy Wilkinson
f335ec00bf
Polish
2018-04-05 09:31:17 +01:00
Andy Wilkinson
71df9c8618
Upgrade to Spring Kafka 2.1.5.RELEASE
...
Closes gh-12775
2018-04-05 07:51:52 +01:00
Andy Wilkinson
b42325f388
Upgrade to Spring Amqp 2.0.3.RELEASE
...
Closes gh-12774
2018-04-05 07:51:51 +01:00
Andy Wilkinson
0c6a09201d
Upgrade to Couchbase Client 2.5.7
...
Closes gh-12773
2018-04-05 07:51:50 +01:00
Andy Wilkinson
87aef1c379
Merge branch '1.5.x'
2018-04-05 07:50:17 +01:00
Andy Wilkinson
a8bbf7120e
Merge branch '1.5.x'
2018-04-05 07:11:34 +01:00
Phillip Webb
0c98d0e7d3
Polish "Allow validation api without implementation"
...
Closes gh-12669
2018-04-04 21:24:25 -07:00
geo_m
a74dc74ec3
Allow validation api without implementation
...
Allow validation api in the classpath without
a validator, as long as no bean is annotated `@Validated`
See gh-12669
2018-04-04 21:24:20 -07:00
Phillip Webb
41dc70146a
Polish "Prevent warnings when running embedded Artemis"
...
Closes gh-12680
2018-04-04 21:10:35 -07:00
Benjamin Graf
19818b752c
Prevent warnings when running embedded Artemis
...
Configure AddressSettings for DLQ and ExpiryQueue for the embedded
Artemis broker to prevent warnings from being logged.
Closes gh-12680
2018-04-04 21:03:04 -07:00
Phillip Webb
68dc9fed3b
Upgrade to Spring Integration 5.0.4
...
Closes gh-12693
2018-04-04 20:47:51 -07:00
Phillip Webb
ec419fca8b
Upgrade to Spring Security 5.0.4
...
Closes gh-12694
2018-04-04 20:46:36 -07:00
Phillip Webb
0c0b60bfa4
Upgrade to Spring Data Kay SR6
...
Closes gh-12696
2018-04-04 20:43:47 -07:00
Jon Schneider
03158e2fd5
Upgrade to Micrometer 1.0.3
...
Closes gh-12767
2018-04-04 20:42:23 -07:00
Phillip Webb
685babc829
Polish "Use lambdas for map entry iteration where possible"
...
Closes gh-12626
2018-04-04 19:36:18 -07:00
igor-suhorukov
69bc19e0ca
Use lambdas for map entry iteration where possible
...
See gh-12626
2018-04-04 19:36:10 -07:00
Clement Stoquart
276037cd56
Add missing managed JUnit Jupiter dependencies
...
Add managed dependencies for `junit-jupiter-params` and
`junit-vintage-engine`.
Closes gh-12635
2018-04-04 18:12:46 -07:00
dreis2211
cc66de28d0
Populate cache in ConfigFileApplicationListener
...
Fix `ConfigFileApplicationListener` so that the loadDocumentsCache is
populated when documents are loaded.
Closes gh-12732
2018-04-04 18:09:08 -07:00
dreis2211
35b4cd01ab
Polish
2018-04-04 18:08:38 -07:00