[lucene-solr] branch master updated: SOLR-14064: remove some hadoop brain damage from build environment

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmuir pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new a6e7c77  SOLR-14064: remove some hadoop brain damage from build environment
a6e7c77 is described below

commit a6e7c770c27f6467d8aa717d4b07c8682d09ebc8
Author: Robert Muir <rm...@apache.org>
AuthorDate: Fri Dec 13 03:50:15 2019 -0500

    SOLR-14064: remove some hadoop brain damage from build environment
    
    Some permissions and build hacks were made on behalf of hadoop: hacks on
    top of hacks. Now that the major problems such as classpath pollution and
    hadoop test code are fixed, so we can remove hacks built on top of them.
---
 lucene/common-build.xml               | 1 -
 lucene/tools/junit4/solr-tests.policy | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index e077c6b..4d4e555 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1094,7 +1094,6 @@
 
             <!-- Restrict access to certain Java features and install security manager: -->
             <sysproperty key="common.dir" file="${common.dir}" />
-            <sysproperty key="ant.library.dir" file="${ant.library.dir}" />
             <sysproperty key="clover.db.dir" file="${clover.db.dir}" />
             <syspropertyset>
                 <propertyref prefix="java.security.manager"/>
diff --git a/lucene/tools/junit4/solr-tests.policy b/lucene/tools/junit4/solr-tests.policy
index 816c7c3..faa9ecb 100644
--- a/lucene/tools/junit4/solr-tests.policy
+++ b/lucene/tools/junit4/solr-tests.policy
@@ -34,15 +34,8 @@ grant {
   permission java.io.FilePermission "${clover.db.dir}${/}-", "read,write,delete";
   permission java.io.FilePermission "${tests.linedocsfile}", "read";
   // hadoop
-  permission java.io.FilePermission "${ant.library.dir}${/}-", "read";
-  permission java.io.FilePermission "${user.home}${/}.ant${/}lib${/}-", "read";
   permission java.io.FilePermission "${user.home}${/}hadoop-metrics2.properties", "read";
   permission java.io.FilePermission "${user.home}${/}hadoop-metrics2-namenode.properties", "read";
-  // kerberos
-  permission java.io.FilePermission "${user.home}${/}.java.login.config", "read";
-  // SolrTestCaseJ4 explicitly uses these
-  permission java.io.FilePermission "/dev/./urandom", "read";
-  permission java.io.FilePermission "/dev/random", "read";
   // DirectoryFactoryTest messes with these (wtf?)
   permission java.io.FilePermission "/tmp/inst1/conf/solrcore.properties", "read";
   permission java.io.FilePermission "/path/to/myinst/conf/solrcore.properties", "read";