Author: jeff.yuchang Date: 2010-01-22 12:41:54 -0500 (Fri, 22 Jan 2010) New Revision: 473 Modified: branches/ODE/ODE-2.0-maven/axis2-war/pom.xml branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml branches/ODE/ODE-2.0-maven/pom.xml Log: * update the versions and check the war's lib. Modified: branches/ODE/ODE-2.0-maven/axis2-war/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/axis2-war/pom.xml 2010-01-22 15:38:40 UTC (rev 472) +++ branches/ODE/ODE-2.0-maven/axis2-war/pom.xml 2010-01-22 17:41:54 UTC (rev 473) @@ -180,6 +180,10 @@ <artifactId>geronimo-kernel</artifactId> </dependency> <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart</artifactId> <type>mar</type> @@ -204,6 +208,11 @@ <version>${mex.version}</version> </dependency> <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>mex</artifactId> + <version>${mex.version}</version> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${testng.version}</version> Modified: branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml =================================================================== --- branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml 2010-01-22 15:38:40 UTC (rev 472) +++ branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml 2010-01-22 17:41:54 UTC (rev 473) @@ -106,14 +106,14 @@ <include>org.apache.ws.commons.axiom:axiom-dom</include> <include>backport-util-concurrent:backport-util-concurrent</include> <include>commons-codec:commons-codec</include> - <include>commons-collections:commons-collections</include> - <include>commons-dbcp:commons-dbcp</include> + <include>commons-collections:commons-collections</include> <include>commons-lang:commons-lang</include> <include>commons-pool:commons-pool</include> <include>commons-io:commons-io</include> <include>commons-httpclient:commons-httpclient</include> <include>commons-logging:commons-logging</include> - <include>commons-fileupload:commons-fileupload</include> + <include>commons-fileupload:commons-fileupload</include> + <include>commons-primitives:commons-primitives</include> <include>org.apache.derby:derby</include> <include>org.apache.derby:derbytools</include> <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include> @@ -121,7 +121,8 @@ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include> - <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include> + <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include> + <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include> <include>geronimo-spec:geronimo-spec-jms</include> <include>org.apache.geronimo.modules:geronimo-kernel</include> <include>org.apache.geronimo.components:geronimo-transaction</include> @@ -163,8 +164,9 @@ <include>com.sun.xml.bind:jaxb-xjc</include> <include>xml-resolver:xml-resolver</include> <include>xml-apis:xml-apis</include> - <include>javax.mail:mail</include> - </includes> + <include>javax.mail:mail</include> + <include>axion:axion</include> + </includes> </dependencySet> <dependencySet> Modified: branches/ODE/ODE-2.0-maven/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-22 15:38:40 UTC (rev 472) +++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-22 17:41:54 UTC (rev 473) @@ -73,6 +73,8 @@ <geronimo.annotation.version>1.1</geronimo.annotation.version> <geronimo.javamail.version>1.2</geronimo.javamail.version> <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version> + <geronimo.specs.jta.version>1.1</geronimo.specs.jta.version> + <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version> <jetty.version>6.1.12rc1</jetty.version> <jencks.version>1.3</jencks.version> <jasper.version>4.2.20RC0</jasper.version> @@ -97,6 +99,7 @@ <jmock.version>1.2.0</jmock.version> <xml.parser.version>2.6.2</xml.parser.version> <activemq.version>4.1.1</activemq.version> + <xml-apis.version>1.3.04</xml-apis.version> </properties> @@ -517,7 +520,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>${geronimo.specs.version}</version> + <version>${geronimo.specs.jta.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -527,7 +530,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-ejb_2.1_spec</artifactId> - <version>${geronimo.specs.version}</version> + <version>${geronimo.specs.ejb.version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.components</groupId> @@ -666,6 +669,11 @@ <artifactId>dom4j</artifactId> <version>${dom4j.version}</version> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>${xml-apis.version}</version> + </dependency> <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId>