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:24:11 UTC
svn commit: r1390195 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/scripts/smokeTestRelease.py lucene/ lucene/build.xml
Author: uschindler
Date: Tue Sep 25 22:24:10 2012
New Revision: 1390195
URL: http://svn.apache.org/viewvc?rev=1390195&view=rev
Log:
Merged revision(s) 1390194 from lucene/dev/trunk:
LUCENE-4430: Lucene Demo module should not ship with servlet-api.jar file
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1390195&r1=1390194&r2=1390195&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Tue Sep 25 22:24:10 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/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1390195&r1=1390194&r2=1390195&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Tue Sep 25 22:24:10 2012
@@ -37,7 +37,7 @@
**/lib/*.jar,
licenses/**,
*/docs/,**/README*"
- excludes="build/**,site/**,tools/**"
+ excludes="build/**,site/**,tools/**,**/lib/*servlet-api*.jar"
/>