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 2015/04/20 18:27:46 UTC

svn commit: r1674941 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/test-framework/ lucene/test-framework/build.xml solr/ solr/test-framework/ solr/test-framework/build.xml

Author: uschindler
Date: Mon Apr 20 16:27:46 2015
New Revision: 1674941

URL: http://svn.apache.org/r1674941
Log:
Merged revision(s) 1674939 from lucene/dev/trunk:
LUCENE-6420: Add missing suppressAnnotation declaration on forbiddenapis ANT task in test-frameworks

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_5x/lucene/test-framework/build.xml
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/test-framework/   (props changed)
    lucene/dev/branches/branch_5x/solr/test-framework/build.xml

Modified: lucene/dev/branches/branch_5x/lucene/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/build.xml?rev=1674941&r1=1674940&r2=1674941&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/build.xml Mon Apr 20 16:27:46 2015
@@ -46,12 +46,11 @@
   
   <!-- redefine the forbidden apis for tests, as we check ourselves - no sysout testing -->
   <target name="-check-forbidden-tests" depends="-init-forbidden-apis,compile-core">
-    <forbidden-apis signaturesFile="${common.dir}/tools/forbiddenApis/tests.txt" classpathref="forbidden-apis.allclasses.classpath"> 
+    <forbidden-apis suppressAnnotation="**.SuppressForbidden" signaturesFile="${common.dir}/tools/forbiddenApis/tests.txt" classpathref="forbidden-apis.allclasses.classpath"> 
       <fileset dir="${build.dir}/classes/java"/>
     </forbidden-apis>
   </target>
   <target name="-check-forbidden-sysout"/>
-  <target name="-check-forbidden-rue"/>
 
   <target name="javadocs-core" depends="javadocs"/>
   <target name="javadocs" depends="init,javadocs-lucene-core,javadocs-lucene-codecs,check-javadocs-uptodate"

Modified: lucene/dev/branches/branch_5x/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/build.xml?rev=1674941&r1=1674940&r2=1674941&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/build.xml Mon Apr 20 16:27:46 2015
@@ -51,7 +51,7 @@
   
   <!-- redefine the forbidden apis for tests, as we check ourselves -->
   <target name="-check-forbidden-tests" depends="-init-forbidden-apis,compile-core">
-    <forbidden-apis signaturesFile="${common.dir}/tools/forbiddenApis/tests.txt" classpathref="forbidden-apis.allclasses.classpath"> 
+    <forbidden-apis suppressAnnotation="**.SuppressForbidden" signaturesFile="${common.dir}/tools/forbiddenApis/tests.txt" classpathref="forbidden-apis.allclasses.classpath"> 
       <fileset dir="${build.dir}/classes/java"/>
     </forbidden-apis>
   </target>