lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1422437 - in /lucene/dev/trunk: dev-tools/idea/.idea/libraries/ dev-tools/maven/ lucene/ lucene/licenses/ lucene/test-framework/ lucene/tools/junit4/ solr/licenses/ solr/test-framework/
Date Sun, 16 Dec 2012 00:50:36 GMT
Author: uschindler
Date: Sun Dec 16 00:50:32 2012
New Revision: 1422437

URL: http://svn.apache.org/viewvc?rev=1422437&view=rev
Log:
LUCENE-4632: Restrict test-framework's write permissions more: Only allow write to per-JVM
CWD and the clover.db.dir; update randomizedtesting to 2.0.6

Added:
    lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.6.jar.sha1   (with props)
    lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1   (with props)
    lucene/dev/trunk/solr/licenses/junit4-ant-2.0.6.jar.sha1   (with props)
    lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1   (with props)
Removed:
    lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.5.jar.sha1
    lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
    lucene/dev/trunk/solr/licenses/junit4-ant-2.0.5.jar.sha1
    lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
Modified:
    lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml
    lucene/dev/trunk/dev-tools/maven/pom.xml.template
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/lucene/test-framework/ivy.xml
    lucene/dev/trunk/lucene/tools/junit4/tests.policy
    lucene/dev/trunk/solr/test-framework/ivy.xml

Modified: lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1422437&r1=1422436&r2=1422437&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml Sun Dec 16 00:50:32 2012
@@ -2,7 +2,7 @@
   <library name="JUnit">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.5.jar!/"
/>
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.6.jar!/"
/>
     </CLASSES>
     <JAVADOC />
     <SOURCES />

Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1422437&r1=1422436&r2=1422437&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Sun Dec 16 00:50:32 2012
@@ -445,7 +445,7 @@
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1422437&r1=1422436&r2=1422437&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sun Dec 16 00:50:32 2012
@@ -817,9 +817,11 @@
             -->
         </junit4:pickfromlist>
         
+        <mkdir dir="@{tempDir}/temp" />
+        
         <junit4:junit4
             dir="@{tempDir}"
-            tempdir="@{tempDir}"
+            tempdir="@{tempDir}/temp"
             maxmemory="${tests.heapsize}" 
             
             parallelism="@{threadNum}"
@@ -893,7 +895,7 @@
             <sysproperty key="java.io.tmpdir" value="." />
 
             <!-- Restrict access to certain Java features and install security manager:
-->
-            <sysproperty key="tests.sandbox.dir" file="${tests.tempDir}" />
+            <sysproperty key="junit4.tempDir" file="@{tempDir}/temp" />
             <sysproperty key="clover.db.dir" file="${clover.db.dir}" />
             <sysproperty key="java.security.manager" value="org.apache.lucene.util.TestSecurityManager"
/>
             <sysproperty key="java.security.policy" file="${common.dir}/tools/junit4/tests.policy"
/>
@@ -2041,7 +2043,7 @@ The following arguments can be provided 
 
         <junit4:pickseed property="pitest.seed" />
 
-        <property name="pitest.sysprops" value="-Dlucene.version=${dev.version},-Dtest.seed=${pitest.seed},-Djava.security.manager,-Djava.security.policy=${common.dir}/tools/junit4/tests.policy,-Djava.io.tmpdir=${tests.tempDir},-Dtests.sandbox.dir=${build.dir}"
/>
+        <property name="pitest.sysprops" value="-Dlucene.version=${dev.version},-Dtest.seed=${pitest.seed},-Djava.security.manager=org.apache.lucene.util.TestSecurityManager,-Djava.security.policy=${common.dir}/tools/junit4/tests.policy,-Djava.io.tmpdir=${tests.tempDir},-Djunit4.childvm.cwd=${tests.tempDir},-Djunit4.tempDir=${tests.tempDir}"
/>
 
         <pitest
             classPath="pitest.classpath"

Added: lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.6.jar.sha1?rev=1422437&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.6.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.6.jar.sha1 Sun Dec 16 00:50:32 2012
@@ -0,0 +1 @@
+a882c0bc45fd2dcf8ef2fb1d440f15379619e3d7

Added: lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1?rev=1422437&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.6.jar.sha1 Sun Dec 16 00:50:32
2012
@@ -0,0 +1 @@
+527f551a232c39bf78f4862feb4126ce9cdb02c9

Modified: lucene/dev/trunk/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/ivy.xml?rev=1422437&r1=1422436&r2=1422437&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/trunk/lucene/test-framework/ivy.xml Sun Dec 16 00:50:32 2012
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*"
/>
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.5"
transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner"
rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.6"
transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner"
rev="2.0.6" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>

Modified: lucene/dev/trunk/lucene/tools/junit4/tests.policy
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/junit4/tests.policy?rev=1422437&r1=1422436&r2=1422437&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/junit4/tests.policy (original)
+++ lucene/dev/trunk/lucene/tools/junit4/tests.policy Sun Dec 16 00:50:32 2012
@@ -26,7 +26,9 @@
 grant {
   // permissions for file access, write access only to sandbox:
   permission java.io.FilePermission "<<ALL FILES>>", "read,execute";
-  permission java.io.FilePermission "${tests.sandbox.dir}${/}-", "read,execute,write,delete";
+  permission java.io.FilePermission "${junit4.childvm.cwd}", "read,execute,write";
+  permission java.io.FilePermission "${junit4.childvm.cwd}${/}-", "read,execute,write,delete";
+  permission java.io.FilePermission "${junit4.tempDir}${/}*", "read,execute,write,delete";
   permission java.io.FilePermission "${clover.db.dir}${/}-", "read,execute,write,delete";
   
   // all possibilities of accepting/binding connections on localhost with ports >=1024:

Added: lucene/dev/trunk/solr/licenses/junit4-ant-2.0.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/junit4-ant-2.0.6.jar.sha1?rev=1422437&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/junit4-ant-2.0.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/junit4-ant-2.0.6.jar.sha1 Sun Dec 16 00:50:32 2012
@@ -0,0 +1 @@
+a882c0bc45fd2dcf8ef2fb1d440f15379619e3d7

Added: lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1?rev=1422437&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.6.jar.sha1 Sun Dec 16 00:50:32
2012
@@ -0,0 +1 @@
+527f551a232c39bf78f4862feb4126ce9cdb02c9

Modified: lucene/dev/trunk/solr/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/ivy.xml?rev=1422437&r1=1422436&r2=1422437&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/ivy.xml (original)
+++ lucene/dev/trunk/solr/test-framework/ivy.xml Sun Dec 16 00:50:32 2012
@@ -32,8 +32,8 @@
       <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
 
       <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*"
/>
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.5"
transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner"
rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.6"
transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner"
rev="2.0.6" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>



Mime
View raw message