瀏覽代碼

HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1456976 13f79535-47bb-0310-9956-ffa450edef68
Thomas Graves 12 年之前
父節點
當前提交
17a5d54847

+ 13 - 0
hadoop-client/pom.xml

@@ -293,6 +293,19 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-annotations</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
   </dependencies>
 
 </project>

+ 20 - 0
hadoop-common-project/hadoop-annotations/pom.xml

@@ -39,4 +39,24 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>os.linux</id>
+      <activation>
+        <os>
+          <family>!Mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+          <version>1.6</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -117,6 +117,8 @@ Release 0.23.7 - UNRELEASED
     HADOOP-8816. HTTP Error 413 full HEAD if using kerberos authentication
     (daryn)
 
+    HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)
+
 Release 0.23.6 - 2013-02-06
 
   INCOMPATIBLE CHANGES

+ 0 - 9
hadoop-project/pom.xml

@@ -901,15 +901,6 @@
       <properties>
         <build.platform>${os.name}-${os.arch}-${sun.arch.data.model}</build.platform>
       </properties>
-      <dependencies>
-        <dependency>
-          <groupId>jdk.tools</groupId>
-          <artifactId>jdk.tools</artifactId>
-          <version>1.6</version>
-          <scope>system</scope>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-      </dependencies>
     </profile>
     <profile>
       <id>os.mac</id>