You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/08/11 22:43:39 UTC
svn commit: r803287 - /geronimo/server/trunk/pom.xml
Author: djencks
Date: Tue Aug 11 20:43:38 2009
New Revision: 803287
URL: http://svn.apache.org/viewvc?rev=803287&view=rev
Log:
GERONIMO-4763 try to build on ibm jdks and not fail on osx
Modified:
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=803287&r1=803286&r2=803287&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Aug 11 20:43:38 2009
@@ -2141,17 +2141,6 @@
<dest>target/classes</dest>
<src>src/main/i18n-resources</src>
</configuration>
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>com.sun</groupId>-->
- <!--<artifactId>tools</artifactId>-->
- <!--the real JDK version could be 1.5 or 1.6-->
- <!--<version>1.5.0</version>-->
- <!--<scope>system</scope>-->
- <!--<optional>true</optional>-->
- <!--<systemPath>${java.home}/../lib/tools.jar</systemPath>-->
- <!--</dependency>-->
- <!--</dependencies>-->
<executions>
<execution>
<id>native2ascii-utf8</id>
@@ -2385,6 +2374,37 @@
<module>assemblies</module>
</modules>
</profile>
+
+ <profile>
+ <id>ibmjdk</id>
+ <!-- see GERONIMO-4763. Apparently the tools.jar needs to be specifically referenced on ibm jdks -->
+ <activation>
+ <file>
+ <exists>${java.home}/../lib/tools.jar</exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>native2ascii-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <!--the real JDK version could be 1.5 or 1.6-->
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <optional>true</optional>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>