You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2013/08/10 01:06:37 UTC
svn commit: r1512526 -
/hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml
Author: cnauroth
Date: Fri Aug 9 23:06:36 2013
New Revision: 1512526
URL: http://svn.apache.org/r1512526
Log:
HADOOP-9857. Merging change r1512523 from branch-2 to branch-2.1-beta.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml?rev=1512526&r1=1512525&r2=1512526&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-project/pom.xml Fri Aug 9 23:06:36 2013
@@ -57,6 +57,7 @@
<!-- Used for building path to native library loaded by tests. Projects -->
<!-- at different nesting levels in the source tree may need to override. -->
<hadoop.common.build.dir>${basedir}/../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
+ <java.security.egd>file:///dev/urandom</java.security.egd>
</properties>
<dependencyManagement>
@@ -868,7 +869,7 @@
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<java.security.krb5.conf>${basedir}/src/test/resources/krb5.conf</java.security.krb5.conf>
- <java.security.egd>file:///dev/urandom</java.security.egd>
+ <java.security.egd>${java.security.egd}</java.security.egd>
<require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop>
</systemPropertyVariables>
<includes>
@@ -922,6 +923,13 @@
<family>Windows</family>
</os>
</activation>
+ <properties>
+ <!-- We must use this exact string for egd on Windows, because the -->
+ <!-- JVM will check for an exact string match on this. If found, it -->
+ <!-- will use a native entropy provider. This will not really -->
+ <!-- attempt to open a file at this path. -->
+ <java.security.egd>file:/dev/urandom</java.security.egd>
+ </properties>
<build>
<plugins>
<plugin>