diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-20 18:02:08 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-20 18:02:08 +0000 |
commit | e8c75e10dc8a49aa11da021eda4045e6d341e018 (patch) | |
tree | 6d48d7464f8828a2b61706f538d8b42a95b9519f | |
parent | 3d887242d2f11e1657ce0a5e4ad9cabc98117d11 (diff) |
the maven-antrun-plugin was causing the itest/distribution tests to fail when run from the top level. The symptom as reported was inability to find javac as though JAVA-HOME was incorrectly set. I don't know what the actual problem is but replacing the maven-antrun-plugin with the exec-maven-plugin seems to improve matters
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882662 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
3 files changed, 69 insertions, 113 deletions
diff --git a/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/java/sca/itest/distribution/binding-ws-calculator/pom.xml index 26d18d0b4a..7dd57f7dbd 100644 --- a/java/sca/itest/distribution/binding-ws-calculator/pom.xml +++ b/java/sca/itest/distribution/binding-ws-calculator/pom.xml @@ -39,44 +39,29 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 --> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>run-sample</id> + <phase>test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>ant</executable> + <workingDirectory>./</workingDirectory> + <arguments> + <argument>-Djava.home</argument> + <argument>${java.home}</argument> + <argument>-Dtuscany.version</argument> + <argument>${version}</argument> + </arguments> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/java/sca/itest/distribution/calculator-rmi/pom.xml b/java/sca/itest/distribution/calculator-rmi/pom.xml index f002994692..049510f3af 100644 --- a/java/sca/itest/distribution/calculator-rmi/pom.xml +++ b/java/sca/itest/distribution/calculator-rmi/pom.xml @@ -39,43 +39,29 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 --> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>run-sample</id> + <phase>test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>ant</executable> + <workingDirectory>./</workingDirectory> + <arguments> + <argument>-Djava.home</argument> + <argument>${java.home}</argument> + <argument>-Dtuscany.version</argument> + <argument>${version}</argument> + </arguments> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/java/sca/itest/distribution/implementation-java-calculator/pom.xml b/java/sca/itest/distribution/implementation-java-calculator/pom.xml index 584b7ca5e9..37b811ee8a 100644 --- a/java/sca/itest/distribution/implementation-java-calculator/pom.xml +++ b/java/sca/itest/distribution/implementation-java-calculator/pom.xml @@ -39,44 +39,29 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 --> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tuscany.version" value="${version}" /> - <property name="java.home" value="${java.home}"/> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>run-sample</id> + <phase>test</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>ant</executable> + <workingDirectory>./</workingDirectory> + <arguments> + <argument>-Djava.home</argument> + <argument>${java.home}</argument> + <argument>-Dtuscany.version</argument> + <argument>${version}</argument> + </arguments> + </configuration> + </plugin> </plugins> </build> </project> |