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

LUCENE-7296, SOLR-9147: Fix Maven build

This commit is contained in:
Uwe Schindler 2016-05-23 00:47:20 +02:00
parent ecf2a732fc
commit b385a536f3
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +74,11 @@
<id>lucene-shared-check-forbidden-apis</id> <id>lucene-shared-check-forbidden-apis</id>
<configuration> <configuration>
<!-- disallow undocumented classes like sun.misc.Unsafe: --> <!-- disallow undocumented classes like sun.misc.Unsafe: -->
<internalRuntimeForbidden>true</internalRuntimeForbidden>
<bundledSignatures> <bundledSignatures>
<bundledSignature>jdk-unsafe</bundledSignature> <bundledSignature>jdk-unsafe</bundledSignature>
<bundledSignature>jdk-deprecated</bundledSignature> <bundledSignature>jdk-deprecated</bundledSignature>
<bundledSignature>jdk-non-portable</bundledSignature>
<bundledSignature>jdk-reflection</bundledSignature>
</bundledSignatures> </bundledSignatures>
<signaturesFiles> <signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile> <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
@ -103,10 +104,11 @@
<id>lucene-shared-test-check-forbidden-apis</id> <id>lucene-shared-test-check-forbidden-apis</id>
<configuration> <configuration>
<!-- disallow undocumented classes like sun.misc.Unsafe: --> <!-- disallow undocumented classes like sun.misc.Unsafe: -->
<internalRuntimeForbidden>true</internalRuntimeForbidden>
<bundledSignatures> <bundledSignatures>
<bundledSignature>jdk-unsafe</bundledSignature> <bundledSignature>jdk-unsafe</bundledSignature>
<bundledSignature>jdk-deprecated</bundledSignature> <bundledSignature>jdk-deprecated</bundledSignature>
<bundledSignature>jdk-non-portable</bundledSignature>
<bundledSignature>jdk-reflection</bundledSignature>
</bundledSignatures> </bundledSignatures>
<signaturesFiles> <signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile> <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>

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

@ -161,14 +161,14 @@
<plugin> <plugin>
<groupId>de.thetaphi</groupId> <groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId> <artifactId>forbiddenapis</artifactId>
<version>2.0</version> <version>2.1</version>
<configuration> <configuration>
<!-- <!--
This is the default setting, we don't support too new Java versions. This is the default setting, we don't support too new Java versions.
The checker simply passes by default and only prints a warning. The checker simply passes by default and only prints a warning.
--> -->
<failOnUnsupportedJava>false</failOnUnsupportedJava> <failOnUnsupportedJava>false</failOnUnsupportedJava>
<targetVersion>${java.legacy-compat.version}</targetVersion> <targetVersion>${java.compat.version}</targetVersion>
<suppressAnnotations> <suppressAnnotations>
<suppressAnnotation>**.SuppressForbidden</suppressAnnotation> <suppressAnnotation>**.SuppressForbidden</suppressAnnotation>
</suppressAnnotations> </suppressAnnotations>

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

@ -117,14 +117,15 @@
<execution> <execution>
<id>solr-shared-check-forbidden-apis</id> <id>solr-shared-check-forbidden-apis</id>
<configuration> <configuration>
<!-- disallow undocumented classes like sun.misc.Unsafe: -->
<internalRuntimeForbidden>true</internalRuntimeForbidden>
<!-- for simplicty with servlet-api and commons-io checks, disable this: --> <!-- for simplicty with servlet-api and commons-io checks, disable this: -->
<failOnUnresolvableSignatures>false</failOnUnresolvableSignatures> <failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
<bundledSignatures> <bundledSignatures>
<bundledSignature>jdk-unsafe</bundledSignature> <bundledSignature>jdk-unsafe</bundledSignature>
<bundledSignature>jdk-deprecated</bundledSignature> <bundledSignature>jdk-deprecated</bundledSignature>
<bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature> <bundledSignature>jdk-non-portable</bundledSignature>
<bundledSignature>jdk-reflection</bundledSignature>
<!--TODO: fix this <bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature>-->
<bundledSignature>commons-io-unsafe-2.4</bundledSignature>
</bundledSignatures> </bundledSignatures>
<signaturesFiles> <signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile> <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
@ -139,14 +140,15 @@
<execution> <execution>
<id>solr-shared-test-check-forbidden-apis</id> <id>solr-shared-test-check-forbidden-apis</id>
<configuration> <configuration>
<!-- disallow undocumented classes like sun.misc.Unsafe: -->
<internalRuntimeForbidden>true</internalRuntimeForbidden>
<!-- for simplicty with servlet-api and commons-io checks, disable this: --> <!-- for simplicty with servlet-api and commons-io checks, disable this: -->
<failOnUnresolvableSignatures>false</failOnUnresolvableSignatures> <failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
<bundledSignatures> <bundledSignatures>
<bundledSignature>jdk-unsafe</bundledSignature> <bundledSignature>jdk-unsafe</bundledSignature>
<bundledSignature>jdk-deprecated</bundledSignature> <bundledSignature>jdk-deprecated</bundledSignature>
<bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature> <bundledSignature>jdk-non-portable</bundledSignature>
<bundledSignature>jdk-reflection</bundledSignature>
<!--TODO: fix this <bundledSignature>commons-io-unsafe-@commons-io:commons-io.version@</bundledSignature>-->
<bundledSignature>commons-io-unsafe-2.4</bundledSignature>
</bundledSignatures> </bundledSignatures>
<signaturesFiles> <signaturesFiles>
<signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile> <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>