diff --git a/core/pom.xml b/core/pom.xml index 4f9d92445..030b40d00 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -11,9 +11,9 @@ org.springframework.batch - spring-batch-parent + spring-batch 1.0.0.m4-SNAPSHOT - ../parent + .. diff --git a/docs/pom.xml b/docs/pom.xml index c7e028eab..bedbd17c8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,9 +8,9 @@ org.springframework.batch - spring-batch-parent + spring-batch 1.0.0.m4-SNAPSHOT - ../parent + .. @@ -122,4 +122,4 @@ - \ No newline at end of file + diff --git a/execution/pom.xml b/execution/pom.xml index fa53d6ec8..3a098f6cf 100644 --- a/execution/pom.xml +++ b/execution/pom.xml @@ -11,9 +11,9 @@ org.springframework.batch - spring-batch-parent + spring-batch 1.0.0.m4-SNAPSHOT - ../parent + .. @@ -225,4 +225,4 @@ - \ No newline at end of file + diff --git a/infrastructure/pom.xml b/infrastructure/pom.xml index e29a28cf4..414ae323a 100644 --- a/infrastructure/pom.xml +++ b/infrastructure/pom.xml @@ -11,9 +11,9 @@ org.springframework.batch - spring-batch-parent + spring-batch 1.0.0.m4-SNAPSHOT - ../parent + .. @@ -191,4 +191,4 @@ - \ No newline at end of file + diff --git a/integration/pom.xml b/integration/pom.xml index 76b7ab0c5..49dfc73b1 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -11,8 +11,8 @@ org.springframework.batch 1.0.0.m4-SNAPSHOT - spring-batch-parent - ../parent + spring-batch + .. @@ -158,4 +158,4 @@ - \ No newline at end of file + diff --git a/license.txt b/parent/license.txt similarity index 98% rename from license.txt rename to parent/license.txt index 261eeb9e9..29f81d812 100644 --- a/license.txt +++ b/parent/license.txt @@ -1,201 +1,201 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/notice.txt b/parent/notice.txt similarity index 98% rename from notice.txt rename to parent/notice.txt index b45a527d0..2cd3e1122 100644 --- a/notice.txt +++ b/parent/notice.txt @@ -1,21 +1,21 @@ - ====================================================================== - == NOTICE file corresponding to section 4 d of the Apache License, == - == Version 2.0, in this case for the Spring Framework distribution. == - ====================================================================== - - This product includes software developed by - the Apache Software Foundation (http://www.apache.org). - - The end-user documentation included with a redistribution, if any, - must include the following acknowledgement: - - "This product includes software developed by the Spring Framework - Project (http://www.springframework.org)." - - Alternatively, this acknowledgement may appear in the software itself, - if and wherever such third-party acknowledgements normally appear. - - The names "Spring" and "Spring Framework" must not be used to - endorse or promote products derived from this software without - prior written permission. For written permission, please contact - rod.johnson@interface21.com or juergen.hoeller@interface21.com. + ====================================================================== + == NOTICE file corresponding to section 4 d of the Apache License, == + == Version 2.0, in this case for the Spring Framework distribution. == + ====================================================================== + + This product includes software developed by + the Apache Software Foundation (http://www.apache.org). + + The end-user documentation included with a redistribution, if any, + must include the following acknowledgement: + + "This product includes software developed by the Spring Framework + Project (http://www.springframework.org)." + + Alternatively, this acknowledgement may appear in the software itself, + if and wherever such third-party acknowledgements normally appear. + + The names "Spring" and "Spring Framework" must not be used to + endorse or promote products derived from this software without + prior written permission. For written permission, please contact + rod.johnson@interface21.com or juergen.hoeller@interface21.com. diff --git a/parent/pom.xml b/parent/pom.xml index a5a6c5b18..e013da294 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2,74 +2,26 @@ 4.0.0 org.springframework.batch - spring-batch-parent - Spring Batch - Parent + spring-batch-dist + Distribution + pom - + - 1.0.0.m4-SNAPSHOT - pom - http://www.springframework.org/spring-batch - - SpringSource - http://www.springsource.com - - - http://fisheye3.cenqua.com/browse/springframework/spring-batch/trunk - scm:svn:http://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk - scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk - - - JIRA - http://opensource.atlassian.com/projects/spring/browse/BATCH - - - - Spring Batch Forum - http://forum.springframework.org/forumdisplay.php?f=41 - http://forum.springframework.org/forumdisplay.php?f=41 - - - http://lists.interface21.com/listmanager/listinfo/spring-batch-announce - http://lists.interface21.com/listmanager/listinfo/spring-batch-announce - Spring Batch Announce - http://lists.interface21.com/archives/spring-batch-announce - - - - Bamboo - https://build.springframework.org/bamboo/browse/BATCH - - - - Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - + + org.springframework.batch + spring-batch + 1.0.0.m4-SNAPSHOT + .. + - - true - 2.5 - - - - http://www.springframework.org/download - - staging - file:///${user.dir}/target/staging - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - + + ../infrastructure + ../core + ../execution + ../samples + @@ -81,392 +33,25 @@ - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - org.apache.maven.plugins - maven-source-plugin + maven-assembly-plugin - attach-sources + zip-files + package - jar + single + false + + + src/assembly/no-dependencies.xml + src/assembly/with-dependencies.xml + + - - org.apache.maven.plugins - maven-surefire-plugin - 2.3 - - - **/*Tests.java - - - **/Abstract*.java - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - junitreport - site - - - Creating JUnit reports - - - - - - - - - - - run - - - - cleandata - pre-site - - - Removing test data - - - - - - - - - run - - - - - - ant - ant-junit - 1.6.5 - - - foundrylogic.vpp - vpp - 2.2.1 - - - - - maven-clean-plugin - - - - ${basedir} - - activemq-data - derby-home - amqstore - .clover - surefire* - - false - - - - - - - - aspectj - aspectjrt - 1.5.3 - - - aspectj - aspectjweaver - 1.5.3 - - - backport-util-concurrent - backport-util-concurrent - 3.0 - - - junit - junit - 3.8.1 - test - - - org.hibernate - hibernate - 3.2.3.ga - - - commons-logging - commons-logging - - - javax.transaction - jta - - - cglib - cglib - - - net.sf.ehcache - ehcache - - - asm - asm-attrs - - - asm - asm - - - - - cglib - cglib-nodep - 2.1_3 - - - commons-logging - commons-logging - 1.1 - - - avalon-framework - avalon-framework - - - logkit - logkit - - - javax.servlet - servlet-api - - - - - commons-lang - commons-lang - 2.1 - - - commons-io - commons-io - 1.2 - - - hsqldb - hsqldb - 1.8.0.7 - - - easymock - easymock - 1.1 - test - - - com.thoughtworks.xstream - xstream - 1.2.1 - true - - - stax - stax - 1.2.0 - true - - - commons-dbcp - commons-dbcp - 1.2.1 - - - commons-collections - commons-collections - - - - - org.apache.ibatis - ibatis-sqlmap - 2.3.0 - true - - - - org.springframework - spring-aop - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-jdbc - ${spring.framework.version} - - - org.springframework - spring-jms - ${spring.framework.version} - - - org.springframework - spring-orm - ${spring.framework.version} - - - org.springframework - spring-test - ${spring.framework.version} - - - org.springframework - spring-tx - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - - - - - spring-milestone - Spring Portfolio Milestone Repository - http://s3.amazonaws.com/maven.springframework.org/milestone - - - spring-external - Spring Portfolio Milestone Repository - http://s3.amazonaws.com/maven.springframework.org/external - - - apache-snapshot - Apache Foundation Snapshot Repository - http://people.apache.org/maven-snapshot-repository - - - - - - spring-external - Spring Portfolio Milestone Repository - http://s3.amazonaws.com/maven.springframework.org/external - - - objectstyle - http://objectstyle.org/maven2 - - - - - true - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - com.interface21.maven - maven-external-report-plugin - 1.0 - - JUnit Report - - JUnit test results for this project - - junit-reports - - - - org.codehaus.mojo - jdepend-maven-plugin - - - maven-javadoc-plugin - - - http://java.sun.com/j2ee/1.4/docs/api - http://java.sun.com/j2se/1.5.0/docs/api - http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/ - http://jakarta.apache.org/commons/dbcp/apidocs/ - http://jakarta.apache.org/commons/fileupload/apidocs/ - http://jakarta.apache.org/commons/httpclient/apidocs/ - http://jakarta.apache.org/commons/logging/api/ - http://jakarta.apache.org/commons/pool/apidocs/ - http://www.junit.org/junit/javadoc/ - http://logging.apache.org/log4j/docs/api/ - http://jakarta.apache.org/regexp/apidocs/ - http://jakarta.apache.org/velocity/api/ - http://static.springframework.org/spring/docs/2.1.x/api/ - http://static.springframework.org/spring-batch/spring-batch-infrastructure/apidocs/ - http://static.springframework.org/spring-batch/spring-batch-core/apidocs/ - http://static.springframework.org/spring-batch/spring-batch-execution/apidocs/ - - true - org.springframework.batch.sample - - - - - - - - dsyer - Dave Syer - david.syer@springsource.com - - - nebhale - Ben Hale - ben.hale@springsource.com - - - lward - Lucas Ward - lucas.l.ward@accenture.com - - - diff --git a/parent/src/assembly/docs.xml b/parent/src/assembly/docs.xml new file mode 100644 index 000000000..5935fe5ed --- /dev/null +++ b/parent/src/assembly/docs.xml @@ -0,0 +1,12 @@ + + + + + + license.txt + notice.txt + + + unix + + \ No newline at end of file diff --git a/parent/src/assembly/no-dependencies.xml b/parent/src/assembly/no-dependencies.xml new file mode 100644 index 000000000..db89d36ab --- /dev/null +++ b/parent/src/assembly/no-dependencies.xml @@ -0,0 +1,39 @@ + + no-dependencies + + zip + + + src/assembly/docs.xml + + true + + + + org.springframework.batch:spring-batch-core + org.springframework.batch:spring-batch-execution + org.springframework.batch:spring-batch-infrastructure + + + false + dist/${artifactId}-${version}.${extension} + false + + + + + org.springframework.batch:spring-batch-core + org.springframework.batch:spring-batch-execution + org.springframework.batch:spring-batch-infrastructure + + + false + dist/${artifactId}-${version}-sources.${extension} + false + + target/${artifactId}-${version}-sources.${extension} + + + + + diff --git a/parent/src/assembly/with-dependencies.xml b/parent/src/assembly/with-dependencies.xml new file mode 100644 index 000000000..c5a8cd4a6 --- /dev/null +++ b/parent/src/assembly/with-dependencies.xml @@ -0,0 +1,103 @@ + + with-dependencies + + zip + + + src/assembly/docs.xml + + true + + + + org.springframework.batch:spring-batch-core + org.springframework.batch:spring-batch-execution + org.springframework.batch:spring-batch-infrastructure + + + false + dist/${artifactId}-${version}.${extension} + false + + + + + org.springframework.batch:spring-batch-core + org.springframework.batch:spring-batch-execution + org.springframework.batch:spring-batch-infrastructure + + + false + dist/${artifactId}-${version}-sources.${extension} + false + + target/${artifactId}-${version}-sources.${extension} + + + + sources/lib/${groupId}/${artifactId}-${version}.${extension} + runtime + + org.springframework.batch:spring-batch + org.springframework.batch:spring-batch-core + org.springframework.batch:spring-batch-execution + org.springframework.batch:spring-batch-infrastructure + + + + sources/lib/${groupId}/${artifactId}-${version}.${extension} + provided + + + + + sources/${artifactId} + + + + bin/** + target/** + + + + + + + + org.springframework.batch:spring-batch-samples + + + false + samples/${artifactId}-${version}.${extension} + false + + + samples/lib/${groupId}/${artifactId}-${version}.${extension} + runtime + + org.springframework.batch:spring-batch + org.springframework.batch:spring-batch-core + org.springframework.batch:spring-batch-execution + org.springframework.batch:spring-batch-infrastructure + + + + sources/lib/${groupId}/${artifactId}-${version}.${extension} + provided + + + + + samples/${artifactId} + + + + bin/** + target/** + + + + + + + diff --git a/pom.xml b/pom.xml index 1a1c92a59..0bc76872e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,19 @@ + 1.0.0.m4-SNAPSHOT pom + + + infrastructure + core + execution + samples + integration + docs + + http://www.springframework.org/spring-batch SpringSource @@ -48,15 +59,10 @@ - - parent - infrastructure - core - execution - samples - integration - docs - + + true + 2.5 + @@ -127,27 +133,364 @@ - maven-assembly-plugin + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + + + org.apache.maven.plugins + maven-source-plugin - zip-files - package + attach-sources - single + jar - false - - - src/assembly/no-dependencies.xml - src/assembly/with-dependencies.xml - - + + org.apache.maven.plugins + maven-surefire-plugin + 2.3 + + + **/*Tests.java + + + **/Abstract*.java + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + junitreport + site + + + Creating JUnit reports + + + + + + + + + + + run + + + + cleandata + pre-site + + + Removing test data + + + + + + + + + run + + + + + + ant + ant-junit + 1.6.5 + + + foundrylogic.vpp + vpp + 2.2.1 + + + + + maven-clean-plugin + + + + ${basedir} + + activemq-data + derby-home + amqstore + .clover + surefire* + + false + + + + + + + + aspectj + aspectjrt + 1.5.3 + + + aspectj + aspectjweaver + 1.5.3 + + + backport-util-concurrent + backport-util-concurrent + 3.0 + + + junit + junit + 3.8.1 + test + + + org.hibernate + hibernate + 3.2.3.ga + + + commons-logging + commons-logging + + + javax.transaction + jta + + + cglib + cglib + + + net.sf.ehcache + ehcache + + + asm + asm-attrs + + + asm + asm + + + + + cglib + cglib-nodep + 2.1_3 + + + commons-logging + commons-logging + 1.1 + + + avalon-framework + avalon-framework + + + logkit + logkit + + + javax.servlet + servlet-api + + + + + commons-lang + commons-lang + 2.1 + + + commons-io + commons-io + 1.2 + + + hsqldb + hsqldb + 1.8.0.7 + + + easymock + easymock + 1.1 + test + + + com.thoughtworks.xstream + xstream + 1.2.1 + true + + + stax + stax + 1.2.0 + true + + + commons-dbcp + commons-dbcp + 1.2.1 + + + commons-collections + commons-collections + + + + + org.apache.ibatis + ibatis-sqlmap + 2.3.0 + true + + + + org.springframework + spring-aop + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-jdbc + ${spring.framework.version} + + + org.springframework + spring-jms + ${spring.framework.version} + + + org.springframework + spring-orm + ${spring.framework.version} + + + org.springframework + spring-test + ${spring.framework.version} + + + org.springframework + spring-tx + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + + + + true + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + com.interface21.maven + maven-external-report-plugin + 1.0 + + JUnit Report + + JUnit test results for this project + + junit-reports + + + + org.codehaus.mojo + jdepend-maven-plugin + + + maven-javadoc-plugin + + + http://java.sun.com/j2ee/1.4/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/ + http://jakarta.apache.org/commons/dbcp/apidocs/ + http://jakarta.apache.org/commons/fileupload/apidocs/ + http://jakarta.apache.org/commons/httpclient/apidocs/ + http://jakarta.apache.org/commons/logging/api/ + http://jakarta.apache.org/commons/pool/apidocs/ + http://www.junit.org/junit/javadoc/ + http://logging.apache.org/log4j/docs/api/ + http://jakarta.apache.org/regexp/apidocs/ + http://jakarta.apache.org/velocity/api/ + http://static.springframework.org/spring/docs/2.1.x/api/ + http://static.springframework.org/spring-batch/spring-batch-infrastructure/apidocs/ + http://static.springframework.org/spring-batch/spring-batch-core/apidocs/ + http://static.springframework.org/spring-batch/spring-batch-execution/apidocs/ + + true + org.springframework.batch.sample + + + + + + + + dsyer + Dave Syer + david.syer@springsource.com + + + nebhale + Ben Hale + ben.hale@springsource.com + + + lward + Lucas Ward + lucas.l.ward@accenture.com + + + spring-milestone @@ -172,28 +515,6 @@ Spring Portfolio Milestone Repository http://s3.amazonaws.com/maven.springframework.org/external - - objectstyle - http://objectstyle.org/maven2 - - - - dsyer - Dave Syer - david.syer@springsource.com - - - nebhale - Ben Hale - ben.hale@springsource.com - - - lward - Lucas Ward - lucas.l.ward@accenture.com - - - - \ No newline at end of file + diff --git a/samples/pom.xml b/samples/pom.xml index 248f014da..4dd8bb049 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,14 +4,15 @@ jar Samples - Example batch jobs using Spring Batch Core and Execution. + + org.springframework.batch - spring-batch-parent + spring-batch 1.0.0.m4-SNAPSHOT - ../parent + ..