From 246e952dde1502703eb459df3fe6c1b81e9e1d6b Mon Sep 17 00:00:00 2001 From: nebhale Date: Mon, 3 Dec 2007 15:55:28 +0000 Subject: [PATCH] [BATCH-235] Created a parent POM to remove cycle in assembly creation --- core/pom.xml | 2 +- docs/pom.xml | 2 +- execution/pom.xml | 2 +- infrastructure/pom.xml | 2 +- integration/pom.xml | 2 +- parent/pom.xml | 472 +++++++++++++++++++++++++++++ pom.xml | 354 +--------------------- samples/pom.xml | 2 +- src/assembly/no-dependencies.xml | 2 + src/assembly/with-dependencies.xml | 4 + 10 files changed, 495 insertions(+), 349 deletions(-) create mode 100644 parent/pom.xml diff --git a/core/pom.xml b/core/pom.xml index 1b4eaf11e..0fbca9ece 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -11,7 +11,7 @@ org.springframework.batch - spring-batch + spring-batch-parent 1.0.0-m3-SNAPSHOT .. diff --git a/docs/pom.xml b/docs/pom.xml index 54b905f39..520e0d266 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.batch - spring-batch + spring-batch-parent 1.0.0-m3-SNAPSHOT .. diff --git a/execution/pom.xml b/execution/pom.xml index 77ea4b52f..73e51232f 100644 --- a/execution/pom.xml +++ b/execution/pom.xml @@ -11,7 +11,7 @@ org.springframework.batch - spring-batch + spring-batch-parent 1.0.0-m3-SNAPSHOT .. diff --git a/infrastructure/pom.xml b/infrastructure/pom.xml index 2bdf7fa03..e5834832c 100644 --- a/infrastructure/pom.xml +++ b/infrastructure/pom.xml @@ -13,7 +13,7 @@ org.springframework.batch - spring-batch + spring-batch-parent 1.0.0-m3-SNAPSHOT .. diff --git a/integration/pom.xml b/integration/pom.xml index 491e97e54..fbaad125e 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -13,7 +13,7 @@ org.springframework.batch 1.0.0-m3-SNAPSHOT - spring-batch + spring-batch-parent .. diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 000000000..e541ba9c0 --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,472 @@ + + + 4.0.0 + org.springframework.batch + spring-batch-parent + Spring Batch - Parent + + + + + 1.0.0-m3-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 + + + + + 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 + + + + + + + org.springframework.aws + spring-aws-maven + 1.2 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + 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/pom.xml b/pom.xml index 17c55356d..5d77dbf42 100644 --- a/pom.xml +++ b/pom.xml @@ -48,12 +48,8 @@ - - true - 2.5 - - + parent infrastructure core execution @@ -132,303 +128,26 @@ maven-assembly-plugin - - - src/assembly/no-dependencies.xml - src/assembly/with-dependencies.xml - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - org.apache.maven.plugins - maven-source-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 @@ -459,57 +178,6 @@ - - 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 diff --git a/samples/pom.xml b/samples/pom.xml index 79c4117f9..a1d2f060c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -9,7 +9,7 @@ org.springframework.batch - spring-batch + spring-batch-parent 1.0.0-m3-SNAPSHOT .. diff --git a/src/assembly/no-dependencies.xml b/src/assembly/no-dependencies.xml index ca9a43e24..12d45e83f 100644 --- a/src/assembly/no-dependencies.xml +++ b/src/assembly/no-dependencies.xml @@ -10,6 +10,7 @@ + org.springframework.batch:spring-batch-parent org.springframework.batch:spring-batch-core org.springframework.batch:spring-batch-execution org.springframework.batch:spring-batch-infrastructure @@ -22,6 +23,7 @@ + org.springframework.batch:spring-batch-parent org.springframework.batch:spring-batch-core org.springframework.batch:spring-batch-execution org.springframework.batch:spring-batch-infrastructure diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml index ea6a34795..302b854c0 100644 --- a/src/assembly/with-dependencies.xml +++ b/src/assembly/with-dependencies.xml @@ -10,6 +10,7 @@ + org.springframework.batch:spring-batch-parent org.springframework.batch:spring-batch-core org.springframework.batch:spring-batch-execution org.springframework.batch:spring-batch-infrastructure @@ -22,6 +23,7 @@ + org.springframework.batch:spring-batch-parent org.springframework.batch:spring-batch-core org.springframework.batch:spring-batch-execution org.springframework.batch:spring-batch-infrastructure @@ -38,6 +40,7 @@ sources/lib/${groupId}/${artifactId}-${version}.${extension} runtime + org.springframework.batch:spring-batch-parent org.springframework.batch:spring-batch-core org.springframework.batch:spring-batch-execution org.springframework.batch:spring-batch-infrastructure @@ -74,6 +77,7 @@ samples/lib/${groupId}/${artifactId}-${version}.${extension} runtime + org.springframework.batch:spring-batch-parent org.springframework.batch:spring-batch-core org.springframework.batch:spring-batch-execution org.springframework.batch:spring-batch-infrastructure