You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/02/25 01:08:42 UTC

svn commit: r1571496 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/common-build.xml

Author: uschindler
Date: Tue Feb 25 00:08:42 2014
New Revision: 1571496

URL: http://svn.apache.org/r1571496
Log:
Merged revision(s) 1571495 from lucene/dev/trunk:
LUCENE-5463: Correct Solr forbidden checks

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1571496&r1=1571495&r2=1571496&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Tue Feb 25 00:08:42 2014
@@ -468,7 +468,7 @@
   </target>
   
   <!-- Forbidden API Task, customizations for Solr -->
-  <target name="-check-forbidden-core" depends="-init-forbidden-apis,compile-core,compile-test">
+  <target name="-check-forbidden-all" depends="-init-forbidden-apis,compile-core,compile-test">
     <property file="${common.dir}/ivy-versions.properties"/> <!-- for commons-io version -->
     <forbidden-apis internalRuntimeForbidden="true" classpathref="forbidden-apis.allclasses.classpath">
       <bundledSignatures name="jdk-unsafe-${javac.target}"/>
@@ -477,7 +477,6 @@
       <signaturesFileSet dir="${common.dir}/tools/forbiddenApis">
         <include name="base.txt" />
         <include name="servlet-api.txt" />
-        <include name="rue.txt" />
       </signaturesFileSet>
       <fileset dir="${build.dir}/classes/java" excludes="${forbidden-base-excludes}"/>
       <fileset dir="${build.dir}/classes/test" excludes="${forbidden-tests-excludes}" erroronmissingdir="false"/>