diff --git a/README.md b/README.md index 5efd6e7f0..d40ed7b1a 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,12 @@ If you want to perform a full build with all integration tests, then run: $ ./mvnw verify +To generate the reference documentation, run: + + $ ./mvnw site + +The reference documentation can be found in `spring-batch-docs/target`. + ## Spring Tool Suite (STS) In STS (or any Eclipse distro or other IDE with Maven support), import the module directories as existing projects. They should compile and the tests should run with no additional steps. diff --git a/pom.xml b/pom.xml index 9e4441f64..25117cd32 100644 --- a/pom.xml +++ b/pom.xml @@ -130,6 +130,9 @@ 2.1.0 3.3.0 3.1.2 + 3.9.1 + 3.1.1 + 3.2.0 @@ -245,6 +248,11 @@ + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + org.apache.maven.plugins maven-deploy-plugin @@ -414,4 +422,18 @@ + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven-project-info-reports-plugin.version} + + true + + + + + diff --git a/spring-batch-docs/pom.xml b/spring-batch-docs/pom.xml index 6c34d2266..7f74e5e48 100644 --- a/spring-batch-docs/pom.xml +++ b/spring-batch-docs/pom.xml @@ -20,7 +20,21 @@ + + + src/dist + + *.txt + + true + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + org.apache.maven.plugins maven-dependency-plugin @@ -28,7 +42,7 @@ unpack-resources - generate-resources + pre-site unpack-dependencies @@ -60,7 +74,7 @@ generate-html - verify + site process-asciidoc @@ -87,7 +101,7 @@ generate-pdf - verify + site process-asciidoc @@ -123,8 +137,8 @@ - generate-docs - verify + create-distribution + site single diff --git a/spring-batch-docs/src/assembly/dist.xml b/spring-batch-docs/src/assembly/dist.xml index e338a695e..265cd7595 100644 --- a/spring-batch-docs/src/assembly/dist.xml +++ b/spring-batch-docs/src/assembly/dist.xml @@ -84,13 +84,13 @@ docs/reference/pdf - src/dist/license.txt + target/classes/license.txt - src/dist/notice.txt + target/classes/notice.txt - src/dist/readme.txt + target/classes/readme.txt \ No newline at end of file diff --git a/spring-batch-docs/src/dist/license.txt b/spring-batch-docs/src/dist/license.txt index e84d62a49..b1806ed08 100644 --- a/spring-batch-docs/src/dist/license.txt +++ b/spring-batch-docs/src/dist/license.txt @@ -212,7 +212,7 @@ code for these subcomponents is subject to the terms and conditions of the following licenses. ->>> ASM 4.0 (org.ow2.asm:asm:4.0, org.ow2.asm:asm-commons:4.0): +>>> ASM 7.1 (org.ow2.asm:asm:7.1, org.ow2.asm:asm-commons:7.1): Copyright (c) 2000-2011 INRIA, France Telecom All rights reserved. @@ -247,33 +247,43 @@ THE POSSIBILITY OF SUCH DAMAGE. Copyright (c) 1999-2009, OW2 Consortium ->>> CGLIB 3.0 (cglib:cglib:3.0): +>>> CGLIB 3.3 (cglib:cglib:3.3): Per the LICENSE file in the CGLIB JAR distribution downloaded from -https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download, -CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which +https://github.com/cglib/cglib/releases/download/RELEASE_3_3_0/cglib-3.3.0.jar, +CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which is included above. -======================================================================= +>>> Objenesis 3.1 (org.objenesis:objenesis:3.1): -To the extent any open source subcomponents are licensed under the EPL and/or +Per the LICENSE file in the Objenesis ZIP distribution downloaded from +http://objenesis.org/download.html, Objenesis 3.1 is licensed under the +Apache License, version 2.0, the text of which is included above. + +Per the NOTICE file in the Objenesis ZIP distribution downloaded from +http://objenesis.org/download.html and corresponding to section 4d of the +Apache License, Version 2.0, in this case for Objenesis: + +Objenesis +Copyright 2006-2019 Joe Walnes, Henri Tremblay, Leonardo Mesquita + + +=============================================================================== + +To the extent any open source components are licensed under the EPL and/or other similar licenses that require the source code and/or modifications to source code to be made available (as would be noted above), you may obtain a copy of the source code corresponding to the binaries for such open source components and modifications thereto, if any, (the "Source Files"), by -downloading the Source Files from https://www.springsource.org/download, or by -sending a request, with your name and address to: +downloading the Source Files from https://spring.io/projects, Pivotal's website +at https://network.pivotal.io/open-source, or by sending a request, with your +name and address to: Pivotal Software, Inc., 875 Howard Street, 5th floor, San +Francisco, CA 94103, Attention: General Counsel. All such requests should +clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel. Pivotal +can mail a copy of the Source Files to you on a CD or equivalent physical +medium. - Pivotal, Inc., 875 Howard St, - San Francisco, CA 94103 - United States of America - -or email info@gopivotal.com. All such requests should clearly specify: - - OPEN SOURCE FILES REQUEST - Attention General Counsel - -Pivotal shall mail a copy of the Source Files to you on a CD or equivalent -physical medium. This offer to obtain a copy of the Source Files is valid for -three years from the date you acquired this Software product. +This offer to obtain a copy of the Source Files is valid for three years from +the date you acquired this Software product. Alternatively, the Source Files +may accompany the Software. \ No newline at end of file diff --git a/spring-batch-docs/src/dist/notice.txt b/spring-batch-docs/src/dist/notice.txt index 80430f4a3..a92e22836 100644 --- a/spring-batch-docs/src/dist/notice.txt +++ b/spring-batch-docs/src/dist/notice.txt @@ -1,5 +1,5 @@ -Spring Batch ${version} -Copyright (c) 2002-${copyright} Pivotal, Inc. +Spring Batch ${project.version} +Copyright (c) Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with diff --git a/spring-batch-docs/src/dist/readme.txt b/spring-batch-docs/src/dist/readme.txt index 0d6c69418..6d8650c41 100644 --- a/spring-batch-docs/src/dist/readme.txt +++ b/spring-batch-docs/src/dist/readme.txt @@ -1,4 +1,4 @@ -Spring Batch version ${version} +Spring Batch version ${project.version} ===================================================================================== To find out what has changed since earlier releases, see the 'Releases' section at