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
Phillip Webb
f45ed0e56c
Don't validate HelpMojo formatting
...
The `HelpMojo` class is always generated and it should not be checked
for formatting.
See gh-13255
2018-05-26 08:41:21 -07:00
Stephane Nicoll
feee8b5db6
Merge pull request #13266 from aheritier:patch-2
...
* pr/13266:
Add missing semicolon in example
2018-05-26 12:44:36 +02: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
e75d8eaf40
Switch to spring-javaformat plugin
...
Use `spring-javaformat` to format and check code. Code formatting can
now be applied using the `spring-javaformat-maven-plugin` from the
command line. Existing checkstyle rules have also been replaced and
the CONTRIBUTING.adoc file has been updated.
Closes gh-13255
2018-05-25 20:59:04 -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
Phillip Webb
e69296d7d3
Fix checkstyle violations in samples
2018-05-25 18:18:00 -07:00
Phillip Webb
4853477081
Reformat code
2018-05-25 18:17:37 -07:00
Stephane Nicoll
606eb9dda3
Merge pull request #13260 from torakiki:patch-1
...
* pr/13260:
Fix documentation error
2018-05-25 16:45:45 +02: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
625f428aad
Upgrade to gson 2.8.5
...
Closes gh-13245
2018-05-24 11:40:54 +02:00
Stephane Nicoll
8997143f31
Fix checkstyle violations
2018-05-24 11:40:54 +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
f84014d7df
Add save_build_info param to maven sync job
...
Update CI pipeline so that the `sync-to-maven-central` job has access
to the artifactory build info.
Closes gh-13223
2018-05-21 17:24:43 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Phillip Webb
9f4f229b83
Polish title case in CONTRIBUTING.md
2018-05-21 17:10:52 -07:00
Phillip Webb
2fa057a06c
Document how to raise security issues
...
Update contributing documentation and the issue template with
instructions on how to report security vulnerabilities.
Closes gh-12509
2018-05-21 17:07:44 -07:00
Phillip Webb
37646517cf
Polish
2018-05-21 15:17:42 -07:00
Stephane Nicoll
c1236ed81b
Merge pull request #13208 from mihhail-lapushkin:master
...
* pr/13208:
Polish contribution
Support custom UriTemplateHandler in LocalHostUriTemplateHandler
2018-05-18 14:26:18 +02: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
Stephane Nicoll
d9029ef69e
Fix documentation of spring.kafka.producer.batch-size
...
Closes gh-13127
2018-05-17 16:08:38 +02:00
Stephane Nicoll
64f43c373f
Merge pull request #13192 from izeye:polish-20180517
...
* pr/13192:
Polish
2018-05-17 15:30:49 +02:00
Johnny Lim
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
Andy Wilkinson
c271f8ef8b
Merge branch '1.5.x' into 2.0.x
2018-05-17 11:39:08 +01:00
Andy Wilkinson
64158ebaf5
Reinstate use of ConversionService for String -> File conversion
...
Prior to 3db5c70b
, RelaxedDataBinder would use a ConversionService
to convert a String into a File via its ObjectToObjectConverter.
3db5c70b
changed the configuration of the data binder such that a
FileEditor was registered. Property editors take precedence over any
conversion service so the FileEditor was used instead. This caused a
regression as the FileEditor uses slightly unusual logic for a String
to File conversion. Specifically, when given a value of ".", it will
locate a ClassPathResource for the root of the classpath and use the
result of calling getFile() on that resource. This fails when the
root of the classpath is in a jar file and also provides a different
result when the root of the classpath is not the current directory.
This commit updates RelaxedDataBinder to suppress the registration
of an editor for File. This restores the behaviour prior to 3db5c70b
by allowing the ConversionService to be used instead.
Closes gh-12786
2018-05-17 11:38:48 +01:00
Stephane Nicoll
1d2edc1d37
Fix wrong reference to WebApplicationType
...
Closes gh-13195
2018-05-17 09:35:07 +02:00
Andy Wilkinson
ce3bd32629
Merge branch '1.5.x' into 2.0.x
2018-05-17 08:30:27 +01:00
Andy Wilkinson
700faabc56
Start building against Spring Security 4.2.7 snapshots
...
See gh-13196
2018-05-17 08:29:48 +01:00
Stephane Nicoll
7b7e802129
Merge branch '1.5.x' into 2.0.x
2018-05-16 13:16:54 +02:00
Stephane Nicoll
38051d98fd
Merge pull request #13175 from kesslerj
...
* pr/13175:
Polish "Respect lombok.AccessLevel attributes"
Respect lombok.AccessLevel attributes
2018-05-16 13:13:54 +02:00
Stephane Nicoll
563d7d70a2
Polish "Respect lombok.AccessLevel attributes"
...
Closes gh-13175
2018-05-16 13:12:16 +02:00
Jonas Keßler
3699132cf0
Respect lombok.AccessLevel attributes
...
See gh-13175
2018-05-16 09:54:50 +02:00
Stephane Nicoll
ba2e9cccf7
Merge pull request #13174 from izeye:render-error-view
...
* pr/13174:
Polish DefaultErrorWebExceptionHandler.renderErrorView()
2018-05-16 09:28:49 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Stephane Nicoll
be2234a8f0
Merge pull request #13171 from izeye:set-key-value
...
* pr/13171:
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
2018-05-15 15:09:55 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00