diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-20 18:59:14 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-20 18:59:14 +0000 |
| commit | 4d037280e221aa913f8ba80f46bc3849c6afbe8d (patch) | |
| tree | f987ea88baa987f15324cfbb0dc65c705bee5c80 /sca-java-2.x/trunk | |
| parent | 0f33d0f0036ddcd3f86b8004ec84bdbd904fe48e (diff) | |
Reverting accidentally committed changes from revisions 901322 and 901323 as I haven't tested them in other platforms
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@901330 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
| -rw-r--r-- | sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml | 8 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/pom.xml | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml index 54b0e8a453..497364c13e 100644 --- a/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml +++ b/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/pom.xml @@ -55,6 +55,14 @@ <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> diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml index 6e52cf5b77..355a4265c5 100644 --- a/sca-java-2.x/trunk/pom.xml +++ b/sca-java-2.x/trunk/pom.xml @@ -819,6 +819,15 @@ <artifactId>ant-trax</artifactId> <version>1.7.1</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> + <optional>true</optional> + </dependency> </dependencies> </plugin> |