#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
apache · Apr 5, 2012 · 2f1ce38 · 2f1ce38
1 parent 6c5ec0c
commit 2f1ce38
Showing 1 changed file with 36 additions and 18 deletions.
diff --git a/taglets/pom.xml b/taglets/pom.xml
@@ -198,24 +198,42 @@
         <url>http://svn.apache.org/viewvc/incubator/odf/trunk/taglets</url>
     </scm>
     <profiles>
-        <profile>
+		<profile>
-            <id>tools.jar</id>
+			<id>tools.jar</id><!-- For JDK 7 and later - with Oracle Brand --> 
-            <activation>
+			<activation>
-                <property>
+				<property>
-                    <name>java.vendor</name>
+					<name>java.vendor</name>
-                    <value>Sun Microsystems Inc.</value>
+					<value>Oracle Corporation</value>
-                </property>
+				</property>
-            </activation>
+			</activation>
-            <dependencies>
+			<dependencies>
-                <dependency>
+				<dependency>
-                    <groupId>com.sun</groupId>
+					<groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
+					<artifactId>tools</artifactId>
-                    <version>1.5.0</version>
+					<version>1.7.0</version>
-                    <scope>system</scope>
+					<scope>system</scope>
-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+					<systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
+				</dependency>
-            </dependencies>
+			</dependencies>
-        </profile>
+		</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>