You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/02/18 08:21:41 UTC

svn commit: r1447139 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/maven/lucene/ dev-tools/maven/lucene/analysis/stempel/ dev-tools/maven/lucene/benchmark/ dev-tools/maven/lucene/codecs/src/java/ dev-tools/maven/lucene/codecs/src/test/ d...

Author: sarowe
Date: Mon Feb 18 07:21:40 2013
New Revision: 1447139

URL: http://svn.apache.org/r1447139
Log:
LUCENE-4570: Maven ForbiddenAPIs configuration cleanups:
- Clean up overly long execution IDs
- Make at least one text execution per module include internalRuntimeForbidden=true
- Make at least one text execution per module include signatureFile executors.txt
- Include bundledSignature commons-io-unsafe in solr test-framework forbiddenapis check
- Note in the Solr shared test-check configuration to include bundledSignature commons-io-unsafe only in modules with commons-io on their classpath
(merged trunk r1447138)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/java/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/test/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/java/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/test/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/demo/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/facet/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/misc/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/queryparser/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/test-framework/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/java/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/java/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/webapp/pom.xml.template

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -82,11 +82,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -126,11 +126,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/java/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/java/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/java/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -78,7 +78,7 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>lucene-shared-test-check-forbidden-apis</id>
             <phase>none</phase>  <!-- Block inherited execution -->
           </execution>
         </executions>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/test/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/test/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/codecs/src/test/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -74,7 +74,7 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
         </executions>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/java/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/java/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -69,15 +69,15 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>lucene-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>lucene-shared-test-check-forbidden-apis</id>
             <phase>none</phase>  <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/test/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/core/src/test/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -93,7 +93,7 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
         </executions>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/demo/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/demo/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -97,11 +97,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/facet/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/facet/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -84,11 +84,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/misc/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/misc/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/misc/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -72,11 +72,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -65,7 +65,7 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>
@@ -83,14 +83,17 @@
             </goals>
           </execution>
           <execution>
-            <id>lucene-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>lucene-shared-test-check-forbidden-apis</id>
             <configuration>
+              <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+              <internalRuntimeForbidden>true</internalRuntimeForbidden>
               <bundledSignatures>
                 <bundledSignature>jdk-unsafe</bundledSignature>
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/queryparser/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/queryparser/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -87,11 +87,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/test-framework/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -87,22 +87,25 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>lucene-check-forbidden-executors-and-jdk-unsafe-deprecated-and-system-out</id>
+            <id>lucene-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>lucene-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>lucene-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>test-check-forbidden-apis</id>
             <configuration>
+              <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+              <internalRuntimeForbidden>true</internalRuntimeForbidden>
               <bundledSignatures>
                 <bundledSignature>jdk-unsafe</bundledSignature>
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/java/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -221,15 +221,15 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-servlet-api-and-jdk-unsafe-and-deprecated-and-commons-io-unsafe</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/src/test/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -118,15 +118,15 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>test-check-forbidden-servlet-api-and-jdk-unsafe-and-deprecated-and-commons-io-unsafe</id>
+            <id>test-check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>
@@ -137,6 +137,7 @@
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>
@@ -144,7 +145,7 @@
             </goals>
           </execution>
           <execution>
-            <id>test-check-forbidden-test-apis</id>
+            <id>test-check-forbidden-test-apis</id> <!-- Separate execution to specify excludes -->
             <configuration>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -116,7 +116,7 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>
@@ -133,14 +133,19 @@
             </goals>
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <configuration>
+              <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+              <internalRuntimeForbidden>true</internalRuntimeForbidden>
               <bundledSignatures>
                 <bundledSignature>jdk-unsafe</bundledSignature>
                 <bundledSignature>jdk-deprecated</bundledSignature>
+                <!-- Include commons-io-unsafe only in those modules with commons-io on their classpath -->
+                <!-- <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>       -->
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/java/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -137,15 +137,15 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-executors-and-jdk-unsafe-and-deprecated-and-commons-io-unsafe</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/solrj/src/test/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -107,11 +107,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
@@ -130,7 +130,7 @@
             </goals>
           </execution>
           <execution>
-            <id>test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated-and-commons-io-unsafe</id>
+            <id>test-check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>
@@ -141,6 +141,7 @@
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -109,25 +109,27 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>check-forbidden-test-apis-and-servlet-api-and-jdk-unsafe-and-deprecated</id>
+            <id>check-forbidden-apis</id>
             <configuration>
               <!-- disallow undocumented classes like sun.misc.Unsafe: -->
               <internalRuntimeForbidden>true</internalRuntimeForbidden>
               <bundledSignatures>
                 <bundledSignature>jdk-unsafe</bundledSignature>
                 <bundledSignature>jdk-deprecated</bundledSignature>
+                <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/webapp/pom.xml.template?rev=1447139&r1=1447138&r2=1447139&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/webapp/pom.xml.template Mon Feb 18 07:21:40 2013
@@ -119,11 +119,11 @@
         <artifactId>forbiddenapis</artifactId>
         <executions>
           <execution>
-            <id>solr-check-forbidden-executors-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
           <execution>
-            <id>solr-test-check-forbidden-test-apis-and-jdk-unsafe-and-deprecated</id>
+            <id>solr-shared-test-check-forbidden-apis</id>
             <phase>none</phase> <!-- Block inherited execution -->
           </execution>
         </executions>