Browse files

#ODFTOOLKIT-299# Fix for JDK 7: In Maven's pom.xml changing vendor fo…

…r tools.jar from Sun to Oracle [Developer:Dennis.Hamilton;Reviewer:svanteschubert]

git-svn-id: https://svn.apache.org/repos/asf/incubator/odf/trunk@1310064 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 6c5ec0c commit 2f1ce389f97e180a100404fa7ba8d1decb3c3db5 @svanteschubert svanteschubert committed Apr 5, 2012
Showing with 36 additions and 18 deletions.
  1. +36 −18 taglets/pom.xml
View
54 taglets/pom.xml
@@ -198,24 +198,42 @@
<url>http://svn.apache.org/viewvc/incubator/odf/trunk/taglets</url>
</scm>
<profiles>
- <profile>
- <id>tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
+ <profile>
+ <id>tools.jar</id><!-- For JDK 7 and later - with Oracle Brand -->
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Oracle Corporation</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.7.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tools-sun.jar</id><!-- For JDK 6 and OpenJDK - with Sun Brand -->
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>release-sign-artifacts</id>
<activation>

0 comments on commit 2f1ce38

Please sign in to comment.