From c06019586ccd109a06593c7efa094e8824a1dd02 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 7 Dec 2012 16:14:49 +0000
Subject: Bringup build in mac os java7 environment

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1418376 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-2.x/trunk/modules/core-spi/pom.xml | 1 -
 sca-java-2.x/trunk/pom.xml                  | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'sca-java-2.x')

diff --git a/sca-java-2.x/trunk/modules/core-spi/pom.xml b/sca-java-2.x/trunk/modules/core-spi/pom.xml
index 25915ec4a6..606303aa1a 100644
--- a/sca-java-2.x/trunk/modules/core-spi/pom.xml
+++ b/sca-java-2.x/trunk/modules/core-spi/pom.xml
@@ -80,7 +80,6 @@
       <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.6</version>
          <executions>
              <execution>
                 <id>process-resources</id>
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index 4c588d6d2a..0939dbbf5d 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -145,6 +145,7 @@
                 <os>
                     <family>mac</family>
                 </os>
+                <jdk>[1.3,1.6)</jdk>
             </activation>
             <properties>
                 <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
@@ -826,7 +827,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.3</version>
+                    <version>1.7</version>
 
                     <dependencies>
                         <dependency>
@@ -835,6 +836,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac
                             <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>
@@ -843,6 +845,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac
                             <systemPath>${tools.jar}</systemPath>
                             <optional>true</optional>
                         </dependency>
+                        -->
                     </dependencies>
                 </plugin>
 
-- 
cgit v1.2.3