incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svanteschub...@apache.org
Subject svn commit: r1310064 - /incubator/odf/trunk/taglets/pom.xml
Date Thu, 05 Apr 2012 20:47:18 GMT
Author: svanteschubert
Date: Thu Apr  5 20:47:18 2012
New Revision: 1310064

URL: http://svn.apache.org/viewvc?rev=1310064&view=rev
Log:
#ODFTOOLKIT-299# Fix for JDK 7: In Maven's pom.xml changing vendor for tools.jar from Sun
to Oracle [Developer:Dennis.Hamilton;Reviewer:svanteschubert]

Modified:
    incubator/odf/trunk/taglets/pom.xml

Modified: incubator/odf/trunk/taglets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/taglets/pom.xml?rev=1310064&r1=1310063&r2=1310064&view=diff
==============================================================================
--- incubator/odf/trunk/taglets/pom.xml (original)
+++ incubator/odf/trunk/taglets/pom.xml Thu Apr  5 20:47:18 2012
@@ -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>



Mime
View raw message