Stephane Nicoll
2e491dfa9c
Merge branch '1.5.x'
2017-04-27 14:30:58 +02:00
Stephane Nicoll
3dc9b125d7
Merge branch '1.4.x' into 1.5.x
2017-04-27 14:30:40 +02:00
Stephane Nicoll
703a6dc056
Prevents BasicErrorControllerIntegrationTest to start another server
...
`BasicErrorControllerIntegrationTest` is handling the context in each test
and yet it starts a useless test via `@SpringBootTest`. This commit
removes the useless runner and associated annotations.
2017-04-27 14:26:50 +02:00
Stephane Nicoll
df388aaaf9
Polish doc
2017-04-27 14:19:16 +02:00
Stephane Nicoll
227bcf44da
Create jetty access log file in the temp directory
2017-04-27 14:19:08 +02:00
Stephane Nicoll
66298d85c4
Fix build
2017-04-27 14:12:32 +02:00
Stephane Nicoll
7b0645ff22
Merge pull request #8971 from vpavic:gh-7872
...
* pr/8971:
Polish "Do not expose `exception` error attribute by default"
Do not expose `exception` error attribute by default
2017-04-27 11:20:33 +02:00
Stephane Nicoll
e9abe3fcca
Polish "Do not expose exception error attribute by default"
...
Closes gh-8971
2017-04-27 11:15:44 +02:00
Vedran Pavic
afe0c6f432
Do not expose exception error attribute by default
...
See gh-8971
2017-04-27 10:57:04 +02:00
Stephane Nicoll
605ea487c0
Merge pull request #9002 from vpavic:gh-8560
...
* pr/9002:
Make Audit events MVC endpoint `after` parameter required
2017-04-27 10:55:40 +02:00
Vedran Pavic
720e801a76
Make Audit events MVC endpoint after parameter required
...
Closes gh-9002
2017-04-27 10:54:45 +02:00
Stephane Nicoll
b426bba169
Merge pull request #8819 from olamy:feature/jetty_accesslog
...
* pr/8819:
Add support for configuring Jetty's request log via the environment
Add support for configuring Jetty's request log via the environment
2017-04-27 10:47:04 +02:00
Stephane Nicoll
f5db75792e
Add support for configuring Jetty's request log via the environment
...
Closes gh-8819
2017-04-27 10:46:38 +02:00
olivier lamy
ce892a06e4
Add support for configuring Jetty's request log via the environment
...
See gh-8819
2017-04-26 19:35:43 +02:00
Stephane Nicoll
45f76965f6
Rename cassandra bean names
...
Closes gh-8982
2017-04-26 15:47:20 +02:00
Stephane Nicoll
3477b02cb4
Merge pull request #8568 from eddumelendez:gh-8052
...
* pr/8568:
Polish "Add reactive support for Spring Data Cassandra"
Add reactive support for Spring Data Cassandra
2017-04-26 15:38:51 +02:00
Stephane Nicoll
47037d5227
Polish "Add reactive support for Spring Data Cassandra"
...
Closes gh-8568
2017-04-26 15:31:01 +02:00
Eddú Meléndez
abd35f041b
Add reactive support for Spring Data Cassandra
...
See gh-8568
2017-04-26 15:31:01 +02:00
Andy Wilkinson
9c65888a54
Upgrade to Jackson 2.9.0.pr3
...
Closes gh-8990
2017-04-26 13:52:36 +01:00
Brian Clozel
117310924e
Reduce number of managed Netty dependencies
...
Now that reactor-netty has a strict set of transitive dependencies, this
commit refactors the managed dependencies to only list the required
ones. `netty-all` is still managed to avoid conflicts when pulled by
other libraries.
Fixes gh-8553
2017-04-26 10:25:59 +02:00
Madhura Bhave
bc1ee76b55
Change default for new_generator_mappings to true
...
Closes gh-7612
2017-04-25 12:09:36 -07:00
Phillip Webb
1ad318d8a6
Refine Mustache support
...
Refine Mustache support to provide a cleaner separation between the
reactive and servlet implementations. The views have now moved to the
`spring-boot` project and the auto-configuration has been split into
two distinct `@Imports` to save needing full package declarations.
See gh-8941
2017-04-25 10:07:22 -07:00
Phillip Webb
06558675bb
Polish
2017-04-25 09:45:14 -07:00
Andy Wilkinson
b43f902556
Upgrade to Spring Restdocs 1.2.0.RELEASE
...
Closes gh-8996
2017-04-25 11:39:29 +01:00
Andy Wilkinson
f8549b7276
Upgrade to Jsonassert 1.5.0
...
Closes gh-8995
2017-04-25 11:39:29 +01:00
Andy Wilkinson
877290c251
Upgrade to Postgresql 42.0.0
...
Closes gh-8994
2017-04-25 11:39:28 +01:00
Andy Wilkinson
3224bb99a9
Upgrade to Mockito 2.7.22
...
Closes gh-8993
2017-04-25 11:39:28 +01:00
Andy Wilkinson
e2d9b152a9
Upgrade to Thymeleaf Layout Dialect 2.2.1
...
Closes gh-8992
2017-04-25 11:39:28 +01:00
Andy Wilkinson
7a027b0187
Upgrade to Rxjava2 2.0.9
...
Closes gh-8991
2017-04-25 11:39:28 +01:00
Brian Clozel
ec25e51f1f
Refactor Mustache views support in Spring MVC
...
This commit simplifies the Mustache support for Spring MVC and removes
the included (view-based) i18n support in favor of more idiomatic
constructs like Mustache lambdas.
Fixes gh-8941
2017-04-25 11:27:18 +02:00
Brian Clozel
7e77e648bf
Add Mustache support for Spring WebFlux apps
...
This commit moves the existing Spring MVC Mustache support to its own
`servlet` package and adds a new one under `reactive` for the WebFlux
web applications.
New `MustacheView` and `MustacheViewResolver` types resolve and render
Mustache views for WebFlux applications.
Since this templating engine is now supported by two flavors of Spring
web apps, the `spring-boot-starter-mustache` does not depend anymore on
the `spring-boot-starter-web` one: it's up to the developer to add the
relevant starter `web` or `webflux` to their application.
Fixes gh-8648
2017-04-25 11:27:18 +02:00
Madhura Bhave
c2e5fd031a
Replace usage of WebMvcConfigurerAdapter
...
Closes gh-8964
2017-04-24 15:31:39 -07:00
Phillip Webb
ec57c3d92a
Exclude commons-logging from Spring Security
...
Excluded the commons-logging dependency pulled in by Spring Security
until they can provide a fix.
See gh-8985
2017-04-24 15:26:35 -07:00
Phillip Webb
28d6881118
Formatting
2017-04-24 14:33:50 -07:00
Stephane Nicoll
55233eba9c
Merge pull request #8881 from vpavic:integration-jdbc
...
* pr/8881:
Polish "Add database initializer for Spring Integration"
Add database initializer for Spring Integration
2017-04-24 15:17:54 +02:00
Stephane Nicoll
3e60ec6cb4
Polish "Add database initializer for Spring Integration"
...
Closes gh-8881
2017-04-24 15:16:07 +02:00
Vedran Pavic
48bc29c77a
Add database initializer for Spring Integration
...
See gh-8881
2017-04-24 14:46:40 +02:00
Stephane Nicoll
50b3b3025a
Fix broken build
2017-04-24 12:19:30 +02:00
Stephane Nicoll
648c14ca8c
Merge pull request #8843 from herau:neo4j-auto-index-configuration
...
* pr/8843:
Polish "Support of Neo4j auto-index configuration"
Support of Neo4j auto-index configuration
2017-04-24 11:18:27 +02:00
Stephane Nicoll
144868a3ce
Polish "Support of Neo4j auto-index configuration"
...
Closes gh-8843
2017-04-24 11:18:05 +02:00
Aurélien Leboulanger
779733c379
Support of Neo4j auto-index configuration
...
See gh-8843
2017-04-24 11:01:38 +02:00
Stephane Nicoll
1dc256eb23
Merge branch '1.5.x'
2017-04-24 10:59:30 +02:00
Stephane Nicoll
293ba6d522
Merge pull request #8758 from candrews:patch-4
...
* pr/8758:
Add Log4jdbc Starter reference
2017-04-24 10:59:06 +02:00
Craig Andrews
a1452f674f
Add Log4jdbc Starter reference
...
Clsoes gh-8758
2017-04-24 10:58:46 +02:00
Andy Wilkinson
a6d24a3bfc
Allow bootWar to package webapp resources in dirs that overlap loader
...
Previously, the presence of a src/main/webapp/org directory would
cause the execution of BootWar to fail due to an attempt to write
a duplicate org/ entry to the zip output stream.
This commit updates BootZipCopyAction so that FileTreeElements that
match a directory entry created while writing the loader classes are
skipped.
Closes gh-8972
2017-04-21 21:02:15 +01:00
Andy Wilkinson
15b9707fbe
Start building against Spring Cloud Connectors 2.0 snapshots
...
See gh-8968
2017-04-21 13:16:30 +01:00
Stephane Nicoll
0b09149a6b
Merge branch '1.5.x'
2017-04-21 11:27:02 +02:00
Stephane Nicoll
9327b58304
Fixup version numbers following release
2017-04-21 11:26:45 +02:00
Andy Wilkinson
7255cec7bb
Align Lettuce dependency management with latest Data Redis snapshots
...
Closes gh-8287
2017-04-21 09:41:00 +01:00
Andy Wilkinson
d50878bac1
Upgrade to Hibernate 5.2.10.Final
2017-04-21 09:40:17 +01:00