From 0b463c0838fff09955a3d04a5d40ad5cbf44c8ac Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Tue, 24 Mar 2009 05:56:56 +0000 Subject: [PATCH] SPR-5385, SPR-5301 - partial work committed. --- build-spring-framework/pom.xml | 168 ++++++++++ org.springframework.aop/pom.xml | 154 +++++++--- org.springframework.beans/pom.xml | 124 ++++---- org.springframework.context.support/pom.xml | 276 +++++++++-------- org.springframework.context/pom.xml | 288 ++++++++++++------ org.springframework.core/pom.xml | 136 ++++++--- org.springframework.expression/pom.xml | 84 +++-- .../pom.xml | 48 ++- org.springframework.instrument/pom.xml | 40 ++- org.springframework.transaction/pom.xml | 187 ++++++++---- 10 files changed, 1030 insertions(+), 475 deletions(-) create mode 100644 build-spring-framework/pom.xml diff --git a/build-spring-framework/pom.xml b/build-spring-framework/pom.xml new file mode 100644 index 00000000000..fa4d473e364 --- /dev/null +++ b/build-spring-framework/pom.xml @@ -0,0 +1,168 @@ + + + 4.0.0 + org.springframework + org.springframework.parent + Spring Framework + 3.0.0.M3 + pom + + + + java.net + Java.net Repository for Maven + http://download.java.net/maven/1/ + legacy + + + + maven.seasar.org + The Seasar Foundation Maven2 Repository + http://maven.seasar.org/maven2 + + + + + + + javax.xml.ws + jaxws-api + 2.1-1 + + + javax.jws + jsr181 + + + + + + + + + + strict + + false + + + + fast + + true + true + + + + staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + + + release + + + + maven-javadoc-plugin + + + javadoc + package + + jar + + + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + + + ../org.springframework.aop + ../org.springframework.aspects + ../org.springframework.beans + ../org.springframework.context + ../org.springframework.context.support + ../org.springframework.core + ../org.springframework.expression + ../org.springframework.instrument + ../org.springframework.instrument.classloading + ../org.springframework.integration-tests + ../org.springframework.jdbc + ../org.springframework.jms + ../org.springframework.orm + ../org.springframework.oxm + ../org.springframework.test + ../org.springframework.transaction + ../org.springframework.web + ../org.springframework.web.portlet + ../org.springframework.web.servlet + + + http://static.springframework.org/docs + + SpringSource + http://www.springsource.com + + + + 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 + + + agilejava + http://agilejava.com/maven + + false + + + + diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml index 51506dc3ca5..a91637da7ef 100644 --- a/org.springframework.aop/pom.xml +++ b/org.springframework.aop/pom.xml @@ -1,46 +1,108 @@ - - - 4.0.0 - org.springframework - org.springframework.aop - jar - Spring Core Abstractions and Utilities - 3.0.0.M1 - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - commons-logging - commons-logging - 1.1.1 - - - org.aopalliance - com.springsource.org.aopalliance - 1.0.0 - - - org.apache.commons - com.springsource.org.apache.commons.pool - 1.4.0 - true - - - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-aop + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + com.jamonapi + jamon + 2.4 + true + + + cglib + cglib-nodep + 2.1_3 + true + + + aopalliance + aopalliance + 1.0 + compile + + + commons-logging + commons-logging + 1.1.1 + compile + + + commons-pool + commons-pool + 1.4 + true + + + org.aspectj + aspectjweaver + 1.6.2 + true + + + org.springframework + spring-beans + 3.0.0.M3 + compile + + + org.springframework + spring-core + 3.0.0.M3 + compile + + + log4j + log4j + 1.2.14 + test + + + org.easymock + easymock + 2.3 + test + + + junit + junit + 4.5 + test + + + asm + asm + 2.2.3 + test + + + asm + asm-commons + 2.2.3 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml index a300495e9de..5a15fa618b8 100644 --- a/org.springframework.beans/pom.xml +++ b/org.springframework.beans/pom.xml @@ -1,52 +1,72 @@ - - - 4.0.0 - org.springframework - org.springframework.beans - jar - Spring Core Abstractions and Utilities - 3.0.0.M1 - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - commons-logging - commons-logging - 1.1.1 - - - org.springframework - org.springframework.core - ${pom.version} - - - javax.el - com.springsource.javax.el - 2.1.0 - true - - - net.sourceforge.cglib - com.springsource.net.sf.cglib - 2.1.3 - true - - - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-beans + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + javax.el + el-api + 1.0 + provided + + + cglib + cglib-nodep + 2.1_3 + true + + + commons-logging + commons-logging + 1.1.1 + compile + + + org.springframework + spring-core + 3.0.0.M3 + compile + + + log4j + log4j + 1.2.14 + test + + + junit + junit + 4.5 + test + + + org.easymock + easymock + 2.3 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml index d9c332b8c33..e106ed92a67 100644 --- a/org.springframework.context.support/pom.xml +++ b/org.springframework.context.support/pom.xml @@ -1,141 +1,137 @@ - - - - org.springframework - org.springframework.parent - 3.0-M1-SNAPSHOT - - 4.0.0 - org.springframework.context.support - jar - Spring Framework: Context Support - - - org.springframework - org.springframework.core - - - org.springframework - org.springframework.context - - - org.springframework - org.springframework.jdbc - true - - - org.springframework - org.springframework.transaction - true - - - javax.mail - com.springsource.javax.mail - true - - - org.apache.velocity - com.springsource.org.apache.velocity - true - - - org.freemarker - com.springsource.freemarker - true - - - net.sourceforge.jasperreports - com.springsource.net.sf.jasperreports - true - - - com.bea.commonj - com.springsource.commonj - true - - - com.opensymphony.quartz - com.springsource.org.quartz - true - - - net.sourceforge.ehcache - com.springsource.net.sf.ehcache - true - - - + + + 4.0.0 + org.springframework + spring-context-support + jar + 3.0.0.M3 + + + com.bea.commonj + commonj + 1.1 + true + + + org.freemarker + freemarker + 2.3.12 + true + + + javax.activation + javax.activation + 1.1 + provided + + + javax.mail + javax.mail + 1.4 + true + + + net.sourceforge.ehcache + net.sf.ehcache + 1.3 + true + + + net.sourceforge.jasperreports + net.sf.jasperreports + 2.0.5 + true + + + commons-collections + commons-collections + 3.2 + true + + + commons-logging + commons-logging + 1.1.1 + compile + + + org.apache.velocity + org.apache.velocity + 1.5 + true + + + com.opensymphony.quartz + org.quartz + 1.6.2 + true + + + org.springframework + spring-beans + latest.integration + compile + + + org.springframework + spring-context + latest.integration + compile + + + org.springframework + spring-core + latest.integration + compile + + + org.springframework + spring-jdbc + latest.integration + true + + + org.springframework + spring-tx + latest.integration + true + + + log4j + log4j + 1.2.14 + test + + + junit + junit + 4.5 + test + + + org.apache.poi + org.apache.poi + 3.0.2.FINAL + test + + + org.easymock + easymock + 2.3 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + \ No newline at end of file diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml index d54096a10cb..4b3ca0e6b77 100644 --- a/org.springframework.context/pom.xml +++ b/org.springframework.context/pom.xml @@ -1,90 +1,198 @@ - - - - org.springframework - org.springframework.parent - 3.0-M1-SNAPSHOT - - 4.0.0 - org.springframework.context - jar - Spring Framework: Context - - - org.springframework - org.springframework.core - - - org.springframework - org.springframework.beans - - - org.springframework - org.springframework.aop - - - org.springframework - org.springframework.agent - - - javax.ejb - com.springsource.javax.ejb - true - - - javax.jms - com.springsource.javax.jms - true - - - javax.persistence - com.springsource.javax.persistence - true - - - net.sourceforge.cglib - com.springsource.net.sf.cglib - true - - - org.aspectj - com.springsource.org.aspectj.weaver - true - - - org.aopalliance - com.springsource.org.aopalliance - true - - - org.jruby - com.springsource.org.jruby - true - - - org.codehaus.groovy - com.springsource.org.codehaus.groovy - true - - - org.beanshell - com.springsource.bsh - true - - - edu.emory.mathcs.backport - com.springsource.edu.emory.mathcs.backport - true - - - com.oracle.oc4j - com.springsource.oracle.classloader - true - - - com.sun.enterprise - com.springsource.com.sun.enterprise.loader - true - - - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-context + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + backport-util-concurrent + backport-util-concurrent + 3.0 + true + + + javax.annotation + jsr250-api + 1.0 + true + + + javax.ejb + ejb-api + 3.0 + true + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 + true + + + javax.persistence + persistence-api + 1.0 + true + + + javax.xml.ws + jaxws-api + 2.1-1 + true + + + cglib + cglib-nodep + 2.1_3 + true + + + org.antlr + antlr + 2.7.6 + test + + + aopalliance + aopalliance + 1.0 + compile + + + commons-logging + commons-logging + 1.1.1 + compile + + + org.aspectj + aspectjweaver + 1.6.2 + true + + + org.beanshell + bsh + 2.0b4 + true + + + org.codehaus.groovy + groovy + 1.5.1 + true + + + org.jruby + jruby + 1.1 + true + + + org.springframework + spring-aop + 3.0.0.M3 + compile + + + org.springframework + spring-beans + 3.0.0.M3 + compile + + + org.springframework + spring-core + 3.0.0.M3 + compile + + + org.springframework + spring-expression + 3.0.0.M3 + compile + + + org.springframework + spring-instrument + 3.0.0.M3 + true + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + test + + + javax.xml.rpc + javax.xml.rpc + 1.1 + test + + + commons-pool + commons-pool + 1.4 + test + + + commons-dbcp + commons-dbcp + 1.2.2 + test + + + log4j + log4j + 1.2.14 + test + + + junit + junit + 4.5 + test + + + org.easymock + easymock + 2.3 + test + + + asm + asm + 2.2.3 + test + + + asm + asm-commons + 2.2.3 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml index 9fdf36c5c88..6d52be0f6e2 100644 --- a/org.springframework.core/pom.xml +++ b/org.springframework.core/pom.xml @@ -1,40 +1,96 @@ - - - - org.springframework - org.springframework.parent - 3.0-M1-SNAPSHOT - - 4.0.0 - org.springframework.core - jar - Spring Framework: Core - - - org.apache.log4j - com.springsource.org.apache.log4j - compile - true - - - org.apache.commons - com.springsource.org.apache.commons.collections - true - - - org.aspectj - com.springsource.org.aspectj.weaver - true - - - org.objectweb.asm - com.springsource.org.objectweb.asm - true - - - org.objectweb.asm - com.springsource.org.objectweb.asm.commons - true - - - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-core + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + commons-collections + commons-collections + 3.2 + true + + + commons-logging + commons-logging + 1.1.1 + compile + + + log4j + log4j + 1.2.14 + true + + + org.aspectj + aspectjweaver + 1.6.2 + true + + + asm + asm + 2.2.3 + true + + + asm + asm-commons + 2.2.3 + true + + + javax.servlet + servlet-api + 2.5 + test + + + junit + junit + 4.5 + test + + + org.easymock + easymock + 2.3 + test + + + xmlunit + xmlunit + 1.2 + test + + + org.codehaus.woodstox + wstx-asl + 3.2.7 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml index bf5e1aeb613..5a896421f46 100644 --- a/org.springframework.expression/pom.xml +++ b/org.springframework.expression/pom.xml @@ -1,24 +1,60 @@ - - - - org.springframework - org.springframework.parent - 3.0-M1-SNAPSHOT - - 4.0.0 - org.springframework.expression - jar - Spring Framework: Expression Language - - - org.springframework - org.springframework.core - ${pom.version} - - - org.antlr - com.springsource.org.antlr - 3.0.1 - - - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-expression + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + commons-logging + commons-logging + 1.1.1 + compile + + + org.springframework + spring-core + 3.0.0.M3 + compile + + + org.antlr + antlr + 3.0.1 + compile + + + log4j + log4j + 1.2.14 + test + + + junit + junit + 4.5 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.instrument.classloading/pom.xml b/org.springframework.instrument.classloading/pom.xml index 838a192ade2..a89885e61b0 100644 --- a/org.springframework.instrument.classloading/pom.xml +++ b/org.springframework.instrument.classloading/pom.xml @@ -1,12 +1,36 @@ - - - 4.0.0 - - org.springframework - org.springframework.parent - 3.0-M1-SNAPSHOT - - org.springframework.agent - jar - Spring Framework: Agent - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-instrument-classloading + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + org.apache.tomcat + catalina + 6.0.16 + provided + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml index 838a192ade2..e0f60e6b9f0 100644 --- a/org.springframework.instrument/pom.xml +++ b/org.springframework.instrument/pom.xml @@ -1,12 +1,28 @@ - - - 4.0.0 - - org.springframework - org.springframework.parent - 3.0-M1-SNAPSHOT - - org.springframework.agent - jar - Spring Framework: Agent - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-instrument + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml index b4cee14adcb..0cdcdd4a63d 100644 --- a/org.springframework.transaction/pom.xml +++ b/org.springframework.transaction/pom.xml @@ -1,59 +1,128 @@ - - - 4.0.0 - org.springframework - org.springframework.core - jar - Spring Core Abstractions and Utilities - 3.0.0.M1 - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.apache.commons - com.springsource.org.apache.commons.logging - 1.1.1 - - - org.apache.log4j - com.springsource.org.apache.log4j - 1.2.15 - true - - - org.apache.commons - com.springsource.org.apache.commons.collections - 3.2.0 - true - - - org.aspectj - com.springsource.org.aspectj.weaver - 1.6.2.RELEASE - true - - - org.objectweb.asm - com.springsource.org.objectweb.asm.commons - 2.2.3 - true - - - \ No newline at end of file + + + 4.0.0 + org.springframework + spring-tx + jar + 3.0.0.M3 + + org.springframework + org.springframework.parent + ../build-spring-framework + 3.0.0.M3 + + + + + com.ibm.websphere + uow_api + 6 + jar + provided + true + + + javax.ejb + ejb-api + 3.0 + true + + + javax.resource + connector-api + 1.5 + true + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + provided + + + aopalliance + aopalliance + 1.0 + compile + + + commons-logging + commons-logging + 1.1.1 + compile + + + org.springframework + spring-aop + 3.0.0.M3 + compile + + + org.springframework + spring-beans + 3.0.0.M3 + compile + + + org.springframework + spring-context + 3.0.0.M3 + compile + + + org.springframework + spring-core + 3.0.0.M3 + compile + + + junit + junit + 4.5 + test + + + org.aspectj + aspectjweaver + 1.6.2 + test + + + org.easymock + easymock + 2.3 + test + + + org.easymock + easymockclassextension + 2.3 + test + + + javax.persistence + persistence-api + 1.0 + test + + + cglib + cglib-nodep + 2.1_3 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + +