Author: lresende
Date: Fri Dec 7 16:14:49 2012
New Revision: 1418376
URL: http://svn.apache.org/viewvc?rev=1418376&view=rev
Log:
Bringup build in mac os java7 environment
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml?rev=1418376&r1=1418375&r2=1418376&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml Fri Dec 7 16:14:49 2012
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=1418376&r1=1418375&r2=1418376&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Fri Dec 7 16:14:49 2012
@@ -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.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.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.apac
<systemPath>${tools.jar}</systemPath>
<optional>true</optional>
</dependency>
+ -->
</dependencies>
</plugin>
|