Andy Wilkinson
361437f4e2
Merge branch '1.5.x' into 2.0.x
2019-03-11 15:53:34 +00:00
Andy Wilkinson
821ee0cf83
Ensure that @Bean methods are only declared on @Configuration classes
...
Closes gh-16190
2019-03-11 15:01:59 +00:00
Andy Wilkinson
2ed7cf84e1
Fix up version numbers following release
2019-01-11 16:20:19 +00:00
Spring Buildmaster
b04710d744
Next development version
2019-01-11 15:59:00 +00:00
Andy Wilkinson
0741c90489
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:31:39 +00:00
Stephane Nicoll
542b8985ad
Fixup version numbers following release
2018-11-29 11:37:51 +01:00
Spring Buildmaster
9bb64a3493
Next Development Version
2018-11-29 09:52:39 +00:00
Andy Wilkinson
fc60dcd972
Fix up version numbers following release
2018-10-16 11:10:54 +01:00
Spring Buildmaster
4d24feb443
Next development version
2018-10-16 08:44:44 +00:00
Stephane Nicoll
f225945218
Merge branch '1.5.x' into 2.0.x
2018-09-22 20:24:46 +02:00
Stephane Nicoll
3b51d79353
Remove useless jcache profile
...
Closes gh-14584
2018-09-22 20:24:25 +02:00
Stephane Nicoll
6e92c4ddaf
Polish
2018-09-22 20:23:41 +02:00
Andy Wilkinson
3ab6d12c56
Fix up version numbers following release
2018-09-11 17:11:47 +01:00
Spring Buildmaster
46df506b0a
Next development version
2018-09-11 14:24:40 +00:00
Phillip Webb
45613f8c3c
Merge branch '1.5.x' into 2.0.x
2018-09-04 15:12:22 -07:00
Phillip Webb
a50686b404
Surface additional rabbit SSL factory properties
...
Add `validate-server-certificate` and `verify-hostname` properties to
`spring.rabbitmq.ssl` to allow additional SSL configuration.
Closes gh-14259
2018-09-04 15:07:53 -07:00
Phillip Webb
9543fcf44d
Upgrade to spring-javaformat 0.0.6
2018-08-30 15:59:27 -07:00
Madhura Bhave
c7b4a992be
Fix formatting
2018-08-16 16:43:31 -07: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
e51c26efdc
Fixup version numbers following release
2018-07-30 19:40:55 +02:00
Spring Buildmaster
73bf744cb0
Next Development Version
2018-07-30 13:37:38 +00: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
Phillip Webb
9ca9a491ca
Fix checkstyle issues in samples
...
Fix checkstyle issues with samples following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 10:41:56 +01:00
Stephane Nicoll
b6f6dca7f8
Remove useless profile
2018-07-25 12:01:57 +02:00
Stephane Nicoll
5ccb19500b
Polish
2018-07-25 12:00:38 +02:00
Stephane Nicoll
64c668f766
Polish
2018-07-25 11:48:05 +02:00
Johnny Lim
068e22d60b
Polish
...
See gh-13776
2018-07-16 10:34:00 +02:00
Andy Wilkinson
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
Andy Wilkinson
b1d8cc55fc
Polish "Fix JSP availability check when not running as a packaged war"
...
Closes gh-12859
2018-06-21 17:30:12 +01:00
Stephane Nicoll
af126b1bb3
Fixup version numbers following release
2018-06-14 12:34:39 +02:00
Spring Buildmaster
36b8639853
Next Development Version
2018-06-14 10:05:31 +00:00
Johnny Lim
870d7fe16a
Use @SpringBootTest.properties in tests and samples
...
Closes gh-13453
2018-06-13 09:24:28 +02:00
Phillip Webb
e3bf518819
Merge branch '1.5.x' into 2.0.x
2018-06-05 17:13:47 -07:00
Phillip Webb
6c7289b822
Allow META-INF/resources in WAR classes folder
...
Update `TomcatResources` so that `META-INF/resources` folders in
`src/main/resources` no longer fail with a "URI is not hierarchical"
exception.
Closes gh-13265
2018-06-05 17:00:52 -07: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
401fcbeaa4
Merge branch '1.5.x' into 2.0.x
2018-05-30 13:29:10 -07:00
Phillip Webb
2bfcefa48e
Reinstate support for disabling build checking
...
Closes gh-13291
2018-05-30 13:24:06 -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
Phillip Webb
b03f890567
Upgrade to spring-javaformat 0.0.2
2018-05-30 11:14:26 -07: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
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
d5abd57a91
Remove deprecated use of spring.main.web-environment
...
Closes gh-13231
2018-05-22 13:39:02 +02:00
