Updated Branches: refs/heads/master 1a7c94204 -> a3d468dae
Summary: No more copy-dependencies for awsapi This was also required for package building using ant/waf and should be completely replaced with the war build in maven. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a3d468da Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a3d468da Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a3d468da Branch: refs/heads/master Commit: a3d468dae7b39cfabbd5011d31c3929fc2b68f0a Parents: 1a7c942 Author: Hugo Trippaers <[email protected]> Authored: Wed Nov 7 15:59:09 2012 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Wed Nov 7 15:59:09 2012 +0100 ---------------------------------------------------------------------- awsapi/pom.xml | 54 +++----------------------------------------------- 1 files changed, 4 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a3d468da/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 2a492d9..bc62bd6 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -262,6 +262,10 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> + <!-- Tests still depend on hibernate, + so thats not going to work + <testSourceDirectory>test</testSourceDirectory> + --> <resources> <resource> <directory>src</directory> @@ -275,55 +279,6 @@ </resources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>install</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>../deps/awsapi-lib/rampart-lib</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <includeArtifactIds>rampart-core,rampart-policy,rampart-trust,slf4j-jdk14,slf4j-api,wss4j,joda-time,xmltooling,openws,velocity,opensaml,xmlsec,bcprov-jdk16</includeArtifactIds> - </configuration> - </execution> - <execution> - <id>copy-axis2-war</id> - <phase>install</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>../deps/awsapi-lib/</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <includeArtifactIds>axis2-webapp</includeArtifactIds> - </configuration> - </execution> - <execution> - <id>copy-mars</id> - <phase>install</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>../deps/awsapi-lib/modules</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <includeArtifactIds>rampart,rahas</includeArtifactIds> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> <version>6.1.26</version> @@ -341,7 +296,6 @@ </plugin> </plugins> <!-- - <testSourceDirectory>test</testSourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>
