Commit Graph

11727 Commits

Author SHA1 Message Date
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
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Phillip Webb
9981ae6874 Rename WebFluxAnnotationAutoConfiguration
Rename WebFluxAnnotationAutoConfiguration to WebFluxAutoConfiguration
to better align with Spring MVC.
2017-04-20 16:02:49 -07:00
Phillip Webb
99a3ec8b74 Merge branch '1.5.x' 2017-04-20 16:01:58 -07:00
Phillip Webb
5f3d5fbec1 Remove public "skip path extension" constant
Remove the public constant to make it clearer that skipping path
extensions is really an internal Spring Boot concern.

See gh-8765
2017-04-20 13:31:04 -07:00
Phillip Webb
69a8c0d871 Fix MVC validator configuration warning
Replace the MVC validator post processor with an `@Import` so
that a "cannot enhance @Configuration bean definition"
warning does not occur.

Fixes gh-8951
See gh-8495
2017-04-20 11:57:18 -07:00
Andy Wilkinson
3526d4df5e Merge branch '1.5.x' 2017-04-20 17:19:04 +01:00
Andy Wilkinson
6dd6897361 Upgrade to Narayana 5.5.7.Final
Closes gh-8961
2017-04-20 17:16:39 +01:00
Andy Wilkinson
a7830a8669 Upgrade to Jaybird 2.2.13
Closes gh-8960
2017-04-20 17:16:39 +01:00
Andy Wilkinson
efdd9d9b01 Upgrade to Jetty 9.4.4.v20170414
Closes gh-8959
2017-04-20 17:16:38 +01:00
Andy Wilkinson
0ff6b705d6 Upgrade to Tomcat 8.5.14
Closes gh-8958
2017-04-20 17:16:38 +01:00
Andy Wilkinson
edf6759e2d Upgrade to Activemq 5.14.5
Closes gh-8957
2017-04-20 17:16:37 +01:00
Andy Wilkinson
6b167f1f12 Upgrade to Ehcache 2.10.4
Closes gh-8956
2017-04-20 17:16:37 +01:00
Andy Wilkinson
3442a24f8a Upgrade to Undertow 1.4.13.Final
Closes gh-8955
2017-04-20 17:16:37 +01:00
Andy Wilkinson
6de6388085 Upgrade to Hsqldb 2.4.0
Closes gh-8954
2017-04-20 15:50:11 +01:00
Andy Wilkinson
ab7dad64f2 Upgrade to Cassandra Driver 3.2.0
Closes gh-8953
2017-04-20 15:50:11 +01:00
Stephane Nicoll
4b820acd15 Merge branch '1.5.x' 2017-04-20 15:59:27 +02:00
Stephane Nicoll
992caa2eb9 Merge branch '1.4.x' into 1.5.x 2017-04-20 15:58:57 +02:00
Stephane Nicoll
7fbce192b4 Fixup version numbers following release 2017-04-20 15:58:32 +02:00
Andy Wilkinson
ae0700efc1 Try to make RunningDocumentationTests platform independent
Windows seems unable to decide if the temp dir is in System32 or
system32 which breaks the comparison. This commit attempts to appease
the gods of case sensitity by reducing the portion of the path that we
check so that system32 vs System32 doesn't come into it.

See gh-8920
2017-04-20 13:47:58 +01:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Andy Wilkinson
079b324e21 Make RunningDocumentationTests platform independent
Closes gh-8920
2017-04-20 11:52:32 +01:00