diff --git a/build-central/pom.xml b/build-central/pom.xml index 7c7822621..668c45578 100644 --- a/build-central/pom.xml +++ b/build-central/pom.xml @@ -25,9 +25,9 @@ Spring Batch Maven Central Build - used to build Maven artifacts for the central - org.springframework.build + org.springframework.build.repository org.springframework.build.repository.maven - 1.0-SNAPSHOT + 1.0.0.CI-SNAPSHOT create-build diff --git a/central-pom.xml b/central-pom.xml index d9a014747..1751a00d9 100644 --- a/central-pom.xml +++ b/central-pom.xml @@ -1,3 +1,4 @@ + 4.0.0 org.springframework.batch @@ -9,6 +10,7 @@ 2.0.0.CI-SNAPSHOT pom + spring-batch-parent spring-batch-infrastructure spring-batch-core spring-batch-test @@ -46,24 +48,22 @@ http://www.apache.org/licenses/LICENSE-2.0.txt - - true - 2.5.6 - 1.0.0.M1 - - default - - true - - - - deployment + all + + spring-batch-samples + archetypes + spring-batch-infrastructure-tests + spring-batch-integration + build-central + + + + release spring-batch-samples archetypes - docs @@ -74,24 +74,180 @@ org.apache.maven.plugins maven-source-plugin + + maven-assembly-plugin + false + + + zip-files + false + package + + single + + + + src/assembly/no-dependencies.xml + src/assembly/with-dependencies.xml + + + + + + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.8 + + + single-page + + generate-html + + + ${basedir}/src/docbkx/resources/xsl/html.xsl + + + + + + + + + + pre-site + + + single-pdf + + generate-pdf + + + src/site/docbook/reference/ + src/docbkx/resources/images/ + + + + pre-site + + + multi-page + + generate-html + + + true + ${basedir}/src/docbkx/resources/xsl/html_chunk.xsl + + + + + + + + + + pre-site + + + + + org.docbook + docbook-xml + 4.4 + runtime + + + org.apache.xmlgraphics + fop + 0.93 + + + + index.xml + false + + css/html.css + ${basedir}/src/site/docbook/reference + ${basedir}/src/docbkx/resources/xsl/fopdf.xsl + true + + + version + ${project.version} + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + copy-parent-pom + generate-sources + + + + + + run + + + + - dist + verify - - dist.txt - + false - maven-javadoc-plugin + org.apache.maven.plugins + maven-antrun-plugin + + + extract + verify + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins - maven-source-plugin + maven-invoker-plugin @@ -111,21 +267,16 @@ staging file:///${user.dir}/target/staging + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + - - strict - - false - - - - fast - - true - true - - snapshots @@ -133,12 +284,6 @@ apache-snapshots http://people.apache.org/maven-snapshot-repository - - atlassian-m2-repository - Atlassian Maven 2.x Repository - - http://repository.atlassian.com/maven2 - @@ -182,67 +327,6 @@ - - mysql - - false - - - - - maven-surefire-plugin - - - - environment - mysql - - - - - - - - - xsl-aggregation - - - src/main/xsl/emma.xsl - - - - - - org.apache.maven.plugins - maven-antrun-plugin - false - - - xsl - site - - - Aggregating XSL reports - - - - -
<summary> -
</summary> -
-
- -
-
- - run - -
-
-
-
-
-
http://www.springframework.org/download @@ -273,81 +357,47 @@ - - org.codehaus.mojo - emma-maven-plugin - 1.0-20070912.011112-4 - - - com.springsource.bundlor - com.springsource.bundlor.maven - ${bundlor.version} - true - - ${project.basedir}/template.mf - ${project.basedir}/src/main/resources/META-INF/MANIFEST.MF - - - - bundlor-transform - package - - transform - - - - org.apache.maven.plugins maven-antrun-plugin - - - junitreport - site - - - Creating JUnit reports - - - - Creating Emma reports - - - - - - run - - - org.apache.ant ant 1.7.0 - - ant - ant-junit - 1.6.5 - - - org.apache.ant - ant-trax - 1.7.0 - org.apache.ant ant-apache-regexp 1.7.0 - - foundrylogic.vpp - vpp - 2.2.1 - + + org.apache.maven.plugins + maven-invoker-plugin + + target/it/no-dep + target/local-repo + true + ${basedir}/src/it/settings.xml + + test + + + samples/*/pom.xml + + + + + integration-test + verify + + run + + + + maven-javadoc-plugin @@ -384,6 +434,10 @@ http://static.springframework.org/spring-batch/apidocs/ http://static.springframework.org/spring-ws/site/apidocs/ +
<!-- Begin Google Analytics code --> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-2728886-3"); pageTracker._setDomainName("none"); pageTracker._setAllowLinker(true); pageTracker._trackPageview(); </script> <!-- End Google Analytics code --> +
+ <!-- Begin LoopFuse code --> <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript"> </script> <script type="text/javascript"> _lf_cid = "LF_48be82fa"; _lf_remora(); </script> <!-- End LoopFuse code --> + true *.batch.sample,*.batch.container,example,test @@ -400,327 +454,16 @@
+ + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + +
- - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Tests.java - - - **/Abstract*.java - - junit:junit - - - - maven-clean-plugin - - - - ${basedir} - - activemq-data - derby-home - amqstore - .clover - surefire* - derby.log - - false - - - - - - - - - aspectj - aspectjrt - 1.5.4 - - - aspectj - aspectjweaver - 1.5.4 - - - junit - junit - 4.4 - test - - - org.easymock - easymock - 2.3 - test - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1 - true - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - true - - - javax.annotation - jsr250-api - 1.0 - test - - - javax.xml.stream - javax.xml.stream - 1.0.1 - true - - - org.hibernate - hibernate - 3.2.6.ga - true - - - asm - asm - - - asm - asm-attrs - - - javax.transaction - jta - - - - - org.hibernate - hibernate-entitymanager - 3.3.2.GA - true - - - edu.oswego.cs.concurrent - edu.oswego.cs.dl.util.concurrent - - - - - org.hibernate - hibernate-annotations - 3.3.1.GA - true - - - cglib - cglib-nodep - 2.1_3 - true - - - commons-logging - commons-logging - 1.1.1 - - - commons-lang - commons-lang - 2.1 - true - - - commons-io - commons-io - 1.4 - true - - - commons-collections - commons-collections - 3.2 - true - - - commons-dbcp - commons-dbcp - 1.2.2 - true - - - log4j - log4j - 1.2.14 - true - - - hsqldb - hsqldb - 1.8.0.7 - test - - - org.apache.derby - org.apache.derby - 10.3.2000001.599110 - test - - - com.thoughtworks.xstream - xstream - 1.3 - - - org.codehaus.jettison - jettison - 1.0 - - - org.apache.ibatis - ibatis-sqlmap - 2.3.0 - true - - - javax.persistence - persistence-api - 1.0 - true - - - org.osgi - osgi_R4_core - 1.0 - true - - - asm - asm - 2.2.3 - runtime - true - - - asm - asm-attrs - 2.2.3 - runtime - true - - - asm - asm-commons - 2.2.3 - runtime - true - - - javax.servlet - servlet-api - 2.5 - provided - true - - - stax - stax - 1.2.0 - true - - - org.springframework - spring-aop - ${spring.framework.version} - - - org.springframework - spring-beans - ${spring.framework.version} - - - org.springframework - spring-context - ${spring.framework.version} - - - org.springframework - spring-context-support - ${spring.framework.version} - - - org.springframework - spring-core - ${spring.framework.version} - - - org.springframework - spring-expression - ${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} - test - - - org.springframework - spring-tx - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - - - org.springframework.ws - spring-oxm - 1.5.5 - true - - - org.springframework.osgi - spring-osgi-core - 1.1.2 - true - - - true @@ -729,18 +472,6 @@ maven-surefire-report-plugin 2.3 - - 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 @@ -787,7 +518,7 @@ robokaso Robert Kasanicky - robert.kasanicky@accenture.com + robokaso@gmail.com trisberg @@ -795,18 +526,13 @@ thomas.risberg@springsource.com - - - - objectstyle - ObjectStyle.org Repository + + dhgarrette + Dan Garrette - http://objectstyle.org/maven2/ - - false - - - + daniel.h.garrette@accenture.com + + com.springsource.repository.bundles.milestone @@ -817,6 +543,12 @@ false + + com.springsource.repository.bundles.snapshot + SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots + + http://repository.springsource.com/maven/bundles/snapshot + spring-external Spring External Repository @@ -834,6 +566,13 @@ never + + agilejava + http://agilejava.com/maven + + false + + spring-external-svn Spring External SVN Repository @@ -844,4 +583,4 @@ - + \ No newline at end of file diff --git a/spring-batch-core/central-pom.xml b/spring-batch-core/central-pom.xml index 0c2e0833e..1c1801d2b 100644 --- a/spring-batch-core/central-pom.xml +++ b/spring-batch-core/central-pom.xml @@ -1,16 +1,16 @@ + 4.0.0 spring-batch-core - 2.0.0.CI-SNAPSHOT jar Core Core domain for batch processing, expressing a domain of Jobs, Steps, Chunks, etc. org.springframework.batch - spring-batch + spring-batch-parent 2.0.0.CI-SNAPSHOT - .. + ../spring-batch-parent @@ -59,11 +59,11 @@ junit - aspectj + org.aspectj aspectjrt - aspectj + org.aspectj aspectjweaver @@ -214,6 +214,17 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + diff --git a/spring-batch-infrastructure/central-pom.xml b/spring-batch-infrastructure/central-pom.xml index db7f748bb..5e65d500e 100644 --- a/spring-batch-infrastructure/central-pom.xml +++ b/spring-batch-infrastructure/central-pom.xml @@ -1,16 +1,16 @@ + 4.0.0 spring-batch-infrastructure - 2.0.0.CI-SNAPSHOT jar Infrastructure The Spring Batch Infrastructure is a set of low-level components, interfaces and tools for batch processing applications and optimisations. org.springframework.batch - spring-batch + spring-batch-parent 2.0.0.CI-SNAPSHOT - .. + ../spring-batch-parent ${pom.groupId}.infrastructure @@ -40,6 +40,17 @@ maven-antrun-plugin + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + @@ -51,12 +62,12 @@ easymock - aspectj + org.aspectj aspectjrt test - aspectj + org.aspectj aspectjweaver test diff --git a/spring-batch-parent/central-pom.xml b/spring-batch-parent/central-pom.xml new file mode 100644 index 000000000..6621f6a2b --- /dev/null +++ b/spring-batch-parent/central-pom.xml @@ -0,0 +1,427 @@ + + + 4.0.0 + org.springframework.batch + spring-batch-parent + 2.0.0.CI-SNAPSHOT + Spring Batch Parent + + Spring Batch parent project. Defines dependencies and common configuration for the build process. + + pom + + true + 2.5.6 + 1.0.0.BUILD-SNAPSHOT + + + + strict + + false + + + + fast + + true + true + + + + snapshots + + + apache-snapshots + http://people.apache.org/maven-snapshot-repository + + + + + apache-snapshot + Apache Foundation Snapshot Repository + + http://people.apache.org/maven-snapshot-repository + + + + + + + maven-site-plugin + 2.0-beta-7-SNAPSHOT + + + + + + + + + + + com.springsource.bundlor + com.springsource.bundlor.maven + ${bundlor.version} + true + + ${project.basedir}/template.mf + ${project.basedir}/src/main/resources/META-INF/MANIFEST.MF + + + + bundlor-transform + package + + transform + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + org.apache.ant + ant + 1.7.0 + + + org.apache.ant + ant-trax + 1.7.0 + + + org.apache.ant + ant-apache-regexp + 1.7.0 + + + foundrylogic.vpp + vpp + 2.2.1 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Tests.java + + + **/Abstract*.java + + junit:junit + + + + + + + + org.aspectj + aspectjrt + 1.5.4 + + + org.aspectj + aspectjweaver + 1.5.4 + + + junit + junit + 4.4 + test + + + org.easymock + easymock + 2.3 + test + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 + true + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + true + + + javax.annotation + jsr250-api + 1.0 + test + + + javax.xml.stream + javax.xml.stream + 1.0.1 + true + + + org.hibernate + hibernate + 3.2.6.ga + true + + + asm + asm + + + asm + asm-attrs + + + javax.transaction + jta + + + + + org.hibernate + hibernate-entitymanager + 3.3.2.GA + true + + + edu.oswego.cs.concurrent + edu.oswego.cs.dl.util.concurrent + + + + + org.hibernate + hibernate-annotations + 3.3.1.GA + true + + + cglib + cglib-nodep + 2.1_3 + true + + + commons-logging + commons-logging + 1.1.1 + + + commons-lang + commons-lang + 2.1 + true + + + commons-io + commons-io + 1.4 + true + + + commons-collections + commons-collections + 3.2 + true + + + commons-dbcp + commons-dbcp + 1.2.2 + true + + + log4j + log4j + 1.2.14 + true + + + hsqldb + hsqldb + 1.8.0.7 + test + + + org.apache.derby + org.apache.derby + 10.3.2000001.599110 + test + + + com.thoughtworks.xstream + xstream + 1.3 + + + org.codehaus.jettison + jettison + 1.0 + + + org.apache.ibatis + ibatis-sqlmap + 2.3.0 + true + + + javax.persistence + persistence-api + 1.0 + true + + + org.osgi + osgi_R4_core + 1.0 + true + + + asm + asm + 2.2.3 + runtime + true + + + asm + asm-attrs + 2.2.3 + runtime + true + + + asm + asm-commons + 2.2.3 + runtime + true + + + javax.servlet + servlet-api + 2.5 + provided + true + + + stax + stax + 1.2 + true + + + org.springframework + spring-aop + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-expression + ${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} + test + + + org.springframework + spring-tx + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.springframework.ws + spring-oxm + 1.5.5 + true + + + org.springframework.osgi + spring-osgi-core + 1.1.2 + true + + + + + + + com.springsource.repository.bundles.milestone + SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones + + http://repository.springsource.com/maven/bundles/milestone + + false + + + + com.springsource.repository.bundles.snapshot + SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots + + http://repository.springsource.com/maven/bundles/snapshot + + + \ No newline at end of file diff --git a/spring-batch-test/central-pom.xml b/spring-batch-test/central-pom.xml index 4a3b6659b..0b4af0790 100644 --- a/spring-batch-test/central-pom.xml +++ b/spring-batch-test/central-pom.xml @@ -1,16 +1,16 @@ + 4.0.0 spring-batch-test - 2.0.0.CI-SNAPSHOT Test jar Domain for batch job testing - spring-batch org.springframework.batch + spring-batch-parent 2.0.0.CI-SNAPSHOT - .. + ../spring-batch-parent @@ -40,6 +40,7 @@ org.springframework spring-test + compile org.springframework @@ -70,4 +71,17 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + \ No newline at end of file