Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2017-02-27 20:43:18 -08:00
123 changed files with 424 additions and 350 deletions

View File

@@ -2048,7 +2048,7 @@ your application defines, if any.
NOTE: By default, batch applications require a `DataSource` to store job details. If you
want to deviate from that, you'll need to implement `BatchConfigurer`, see
{spring-batch-javadoc}/core/configuration/annotation/EnableBatchProcessing.html[The
Javadoc of @EnableBatchProcessing] for more details.
Javadoc of `@EnableBatchProcessing`] for more details.

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.