Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-4570: Maven ForbiddenAPIs configuration cleanups: 

- Clean up overly long execution IDs
- Make at least one test-check execution per module include internalRuntimeForbidden=true
- Make at least one test-check 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

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1447138 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2013-02-18 07:20:23 +00:00
parent d44ef9b67f
commit 6449c08e37
19 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-tools/maven/lucene/analysis/stempel/pom.xml.template
View File

@ -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>

4
dev-tools/maven/lucene/benchmark/pom.xml.template
View File

@ -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>

2
dev-tools/maven/lucene/codecs/src/java/pom.xml.template
View File

@ -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>

2
dev-tools/maven/lucene/codecs/src/test/pom.xml.template
View File

@ -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>

6
dev-tools/maven/lucene/core/src/java/pom.xml.template
View File

@ -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>

2
dev-tools/maven/lucene/core/src/test/pom.xml.template
View File

@ -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>

4
dev-tools/maven/lucene/demo/pom.xml.template
View File

@ -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>

4
dev-tools/maven/lucene/facet/pom.xml.template
View File

@ -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>

4
dev-tools/maven/lucene/misc/pom.xml.template
View File

@ -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>

7
dev-tools/maven/lucene/pom.xml.template
View File

@ -66,7 +66,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>
@ -84,14 +84,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>

4
dev-tools/maven/lucene/queryparser/pom.xml.template
View File

@ -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>

9
dev-tools/maven/lucene/test-framework/pom.xml.template
View File

@ -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>

6
dev-tools/maven/solr/core/src/java/pom.xml.template
View File

@ -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>

9
dev-tools/maven/solr/core/src/test/pom.xml.template
View File

@ -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>

9
dev-tools/maven/solr/pom.xml.template
View File

@ -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>

6
dev-tools/maven/solr/solrj/src/java/pom.xml.template
View File

@ -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>

7
dev-tools/maven/solr/solrj/src/test/pom.xml.template
View File

@ -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>

8
dev-tools/maven/solr/test-framework/pom.xml.template
View File

@ -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>

4
dev-tools/maven/solr/webapp/pom.xml.template
View File

@ -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>