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/13 17:02:07 UTC
svn commit: r803916 - in /geronimo/server/trunk: plugins/pom.xml pom.xml
Author: djencks
Date: Thu Aug 13 15:02:07 2009
New Revision: 803916
URL: http://svn.apache.org/viewvc?rev=803916&view=rev
Log:
GERONIMO-4763 Another try at running the native2ascii plugin on all platforms. Thanks to SHawn Jiang for the patch
Modified:
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=803916&r1=803915&r2=803916&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Aug 13 15:02:07 2009
@@ -151,5 +151,36 @@
</plugin>
</plugins>
</build>
-
+ <profiles>
+ <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>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=803916&r1=803915&r2=803916&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 13 15:02:07 2009
@@ -2374,37 +2374,7 @@
<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>