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 2012/09/26 00:22:58 UTC

svn commit: r1390194 - in /lucene/dev/trunk: dev-tools/scripts/smokeTestRelease.py lucene/build.xml

Author: uschindler
Date: Tue Sep 25 22:22:58 2012
New Revision: 1390194

URL: http://svn.apache.org/viewvc?rev=1390194&view=rev
Log:
LUCENE-4430: Lucene Demo module should not ship with servlet-api.jar file

Modified:
    lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
    lucene/dev/trunk/lucene/build.xml

Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1390194&r1=1390193&r2=1390194&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Tue Sep 25 22:22:58 2012
@@ -168,10 +168,6 @@ def noJavaPackageClasses(desc, file):
 def checkAllLuceneJARs(root):
   print('    make sure Lucene JARs don\'t have javax.* or java.* classes...')  
   for root, dirs, files in os.walk(root):
-    if root.endswith('demo/lib'):
-      # Lucene demo intentionally ships servlet-api JAR:
-      continue
-    
     for file in files:
       if file.lower().endswith('.jar'):
         fullPath = '%s/%s' % (root, file)

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1390194&r1=1390193&r2=1390194&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Tue Sep 25 22:22:58 2012
@@ -37,7 +37,7 @@
                         **/lib/*.jar,
                         licenses/**,
                         */docs/,**/README*"
-              excludes="build/**,site/**,tools/**"
+              excludes="build/**,site/**,tools/**,**/lib/*servlet-api*.jar"
   />