Updated Branches: refs/heads/4.0 8b592301a -> 75e2a1012
maven: Depend on org.apache.axis2 instead of axis We (AWS API) only import org.apache.axis2, but maven was also depending on org.apache.axis 1.4.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/75e2a101 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/75e2a101 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/75e2a101 Branch: refs/heads/4.0 Commit: 75e2a1012fccc01c639c7f41be564ac0e32088fb Parents: 8b59230 Author: Wido den Hollander <w...@widodh.nl> Authored: Wed Oct 10 01:12:02 2012 +0200 Committer: Wido den Hollander <w...@widodh.nl> Committed: Wed Oct 10 01:12:02 2012 +0200 ---------------------------------------------------------------------- deps/pom.xml | 11 +++-------- pom.xml | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/75e2a101/deps/pom.xml ---------------------------------------------------------------------- diff --git a/deps/pom.xml b/deps/pom.xml index ffc0e75..d08a23a 100644 --- a/deps/pom.xml +++ b/deps/pom.xml @@ -118,14 +118,9 @@ </dependency> <!-- For vmware-base --> <dependency> - <groupId>org.apache.axis</groupId> - <artifactId>axis</artifactId> - <version>${cs.axis.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - <version>${cs.axis.version}</version> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2</artifactId> + <version>${cs.axis2.version}</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/75e2a101/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2c1fc8e..35fe497 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,6 @@ <cs.xstream.version>1.3.1</cs.xstream.version> <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version> <cs.mail.version>1.4</cs.mail.version> - <cs.axis.version>1.4</cs.axis.version> <cs.axis2.version>1.5.1</cs.axis2.version> <cs.rampart.version>1.6.2</cs.rampart.version> <cs.axiom.version>1.2.8</cs.axiom.version>
