lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1502495 - 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/core/src/java/ dev-tools/maven/lucene/demo/ dev-tools/mave...
Date Fri, 12 Jul 2013 09:41:07 GMT
Author: uschindler
Date: Fri Jul 12 09:41:07 2013
New Revision: 1502495

URL: http://svn.apache.org/r1502495
Log:
Merged revision(s) 1502493 from lucene/dev/trunk:
Refactor forbidden-apis a bit to make it easier to add new signatures, no need to have so
many files slowing down the build; add Properties file rules

Added:
    lucene/dev/branches/branch_4x/lucene/tools/forbiddenApis/base.txt
      - copied unchanged from r1502493, lucene/dev/trunk/lucene/tools/forbiddenApis/base.txt
Removed:
    lucene/dev/branches/branch_4x/lucene/tools/forbiddenApis/chars.txt
    lucene/dev/branches/branch_4x/lucene/tools/forbiddenApis/executors.txt
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/core/src/java/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/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/build.xml   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/tools/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/build.xml   (contents, props changed)

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=1502495&r1=1502494&r2=1502495&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
Fri Jul 12 09:41:07 2013
@@ -95,8 +95,7 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri Jul
12 09:41:07 2013
@@ -141,8 +141,7 @@
                 <!-- <bundledSignature>jdk-system-out</bundledSignature> -->
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -86,8 +86,7 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri Jul 12
09:41:07 2013
@@ -112,8 +112,7 @@
                 <!-- <bundledSignature>jdk-system-out</bundledSignature> -->
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri Jul 12
09:41:07 2013
@@ -97,8 +97,7 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri Jul 12
09:41:07 2013
@@ -85,8 +85,7 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri Jul 12 09:41:07
2013
@@ -77,8 +77,7 @@
                 <bundledSignature>jdk-system-out</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>
@@ -96,8 +95,7 @@
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -100,8 +100,7 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -104,9 +104,8 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -391,9 +391,8 @@
                 <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -278,9 +278,8 @@
                 <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

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=1502495&r1=1502494&r2=1502495&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 Fri Jul 12 09:41:07
2013
@@ -149,8 +149,7 @@
                 <bundledSignature>jdk-deprecated</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>
@@ -170,8 +169,7 @@
               </bundledSignatures>
               <signaturesFiles>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -154,8 +154,7 @@
                 <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
                 <!-- Solr-J does NOT depend on servlet-api -->
                 <!-- <signaturesFile>${top-level}/lucene/tools/forbiddenApis/servlet-api.txt</signaturesFile>
-->
               </signaturesFiles>

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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -140,9 +140,8 @@
                 <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
                 <signaturesFile>${top-level}/lucene/tools/forbiddenApis/tests.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/executors.txt</signaturesFile>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.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=1502495&r1=1502494&r2=1502495&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 Fri
Jul 12 09:41:07 2013
@@ -128,10 +128,9 @@
                 <bundledSignature>commons-io-unsafe-${commons-io.version}</bundledSignature>
               </bundledSignatures>
               <signaturesFiles>
+                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/base.txt</signaturesFile>
                 <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>
-                <signaturesFile>${top-level}/lucene/tools/forbiddenApis/chars.txt</signaturesFile>
               </signaturesFiles>
             </configuration>
             <goals>

Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1502495&r1=1502494&r2=1502495&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Fri Jul 12 09:41:07 2013
@@ -184,8 +184,7 @@
       <bundledSignatures name="jdk-unsafe-${javac.target}"/>
       <bundledSignatures name="jdk-deprecated-${javac.target}"/>
       <signaturesFileSet dir="${common.dir}/tools/forbiddenApis">
-        <include name="executors.txt" />
-        <include name="chars.txt" />
+        <include name="base.txt" />
       </signaturesFileSet>
       <fileset dir="${basedir}/build" includes="**/*.class" />
     </forbidden-apis>

Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1502495&r1=1502494&r2=1502495&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Fri Jul 12 09:41:07 2013
@@ -265,8 +265,7 @@
       <bundledSignatures name="jdk-deprecated-${javac.target}"/>
       <bundledSignatures name="commons-io-unsafe-${commons-io.version}"/>
       <signaturesFileSet dir="${common.dir}/tools/forbiddenApis">
-        <include name="executors.txt" />
-        <include name="chars.txt" />
+        <include name="base.txt" />
         <include name="servlet-api.txt" />
       </signaturesFileSet>
       <fileset dir="${basedir}/build">



Mime
View raw message