You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/04 21:00:46 UTC
svn commit: r1309546 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/lib/ lucene/contrib/analyzers/phonetic/lib/
lucene/contrib/benchmark/lib/ lucene/contrib/icu/lib/
lucene/contrib/queries/lib/ lucene/test-framework/ lucene/test-frame...
Author: rmuir
Date: Wed Apr 4 19:00:42 2012
New Revision: 1309546
URL: http://svn.apache.org/viewvc?rev=1309546&view=rev
Log:
LUCENE-3945: use sha1 checksums to verify jars pulled from ivy match expectations
Added:
lucene/dev/branches/branch_3x/lucene/backwards/lib/lucene-core-3.5.0.jar.sha1
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/phonetic/lib/commons-codec-1.6.jar.sha1
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-1.2.jar.sha1
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-2.9.1.jar.sha1
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4.8.1.1.jar.sha1
lucene/dev/branches/branch_3x/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar.sha1
lucene/dev/branches/branch_3x/lucene/test-framework/lib/ant-1.7.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/lucene/test-framework/lib/ant-1.7.1.jar.sha1
lucene/dev/branches/branch_3x/lucene/test-framework/lib/ant-junit-1.7.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/lucene/test-framework/lib/ant-junit-1.7.1.jar.sha1
lucene/dev/branches/branch_3x/lucene/test-framework/lib/junit-4.10.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/lucene/test-framework/lib/junit-4.10.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/lib/icu4j-4.8.1.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4.8.1.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/hppc-0.3.4-jdk15.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/lib/activation-1.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/dataimporthandler/lib/activation-1.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/lib/mail-1.4.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/dataimporthandler/lib/mail-1.4.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/asm-3.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/asm-3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/boilerpipe-1.1.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/boilerpipe-1.1.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/commons-compress-1.3.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/commons-compress-1.3.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/dom4j-1.6.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/dom4j-1.6.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/fontbox-1.6.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/fontbox-1.6.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/icu4j-4.8.1.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4.8.1.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/jdom-1.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/jdom-1.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/jempbox-1.6.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/jempbox-1.6.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/netcdf-4.2-min.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/netcdf-4.2-min.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/pdfbox-1.6.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/pdfbox-1.6.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/poi-3.8-beta4.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/poi-3.8-beta4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/rome-0.9.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/rome-0.9.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/tagsoup-1.2.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/tagsoup-1.2.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/tika-core-1.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/tika-core-1.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/tika-parsers-1.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/tika-parsers-1.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/xercesImpl-2.8.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/xercesImpl-2.8.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/xml-apis-1.0.b2.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/xml-apis-1.0.b2.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/xmlbeans-2.3.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/extraction/lib/xmlbeans-2.3.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/langid/lib/jsonic-1.2.7.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/langid/lib/jsonic-1.2.7.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/langid/lib/langdetect-1.1-20120112.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/langid/lib/langdetect-1.1-20120112.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/commons-digester-2.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/uima/lib/commons-digester-2.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uimaj-core-2.3.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/uima/lib/uimaj-core-2.3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/velocity/lib/commons-collections-3.2.1.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/velocity/lib/commons-collections-3.2.1.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/velocity/lib/velocity-1.6.4.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-1.6.4.jar.sha1
lucene/dev/branches/branch_3x/solr/contrib/velocity/lib/velocity-tools-2.0.jar.sha1
- copied unchanged from r1309503, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-tools-2.0.jar.sha1
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/core-3.1.1.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar.sha1
lucene/dev/branches/branch_3x/solr/example/lib/servlet-api-2.5-20081211.jar.sha1
lucene/dev/branches/branch_3x/solr/example/start.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/commons-codec-1.6.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/commons-fileupload-1.2.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/commons-io-2.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/commons-lang-2.6.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/easymock-2.2.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/guava-r05.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/httpclient-4.1.3.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/httpcore-4.1.4.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/httpmime-4.1.3.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/junit-4.10.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/servlet-api-2.4.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/slf4j-api-1.6.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/slf4j-jdk14-1.6.1.jar.sha1
lucene/dev/branches/branch_3x/solr/lib/wstx-asl-3.2.7.jar.sha1
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_3x/lucene/tools/ (props changed)
lucene/dev/branches/branch_3x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/build.xml
lucene/dev/branches/branch_3x/solr/common-build.xml
lucene/dev/branches/branch_3x/solr/contrib/ (props changed)
lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/build.xml
lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml
lucene/dev/branches/branch_3x/solr/example/ (props changed)
lucene/dev/branches/branch_3x/solr/lib/ (props changed)
lucene/dev/branches/branch_3x/solr/webapp/build.xml
Added: lucene/dev/branches/branch_3x/lucene/backwards/lib/lucene-core-3.5.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/backwards/lib/lucene-core-3.5.0.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/backwards/lib/lucene-core-3.5.0.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/lucene/backwards/lib/lucene-core-3.5.0.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+90ff0731fafb05c01fee4f2247140d56e9c30a3b
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Wed Apr 4 19:00:42 2012
@@ -53,6 +53,8 @@
<property name="year" value="2000-${current.year}"/>
<property name="final.name" value="lucene-${name}-${version}"/>
+ <property name="common.classpath.excludes" value="**/*.txt,**/*.template,**/*.sha1" />
+
<property name="ivy.bootstrap.version" value="2.2.0" />
<property name="ivy.resource" value="org/apache/ivy/ant/antlib.xml" />
<available resource="${ivy.resource}" property="ivy.available" />
Added: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/phonetic/lib/commons-codec-1.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/phonetic/lib/commons-codec-1.6.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/phonetic/lib/commons-codec-1.6.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/phonetic/lib/commons-codec-1.6.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+b7f0fc8f61ecadeb3695f0b9464755eee44374d4
Added: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-1.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-1.2.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-1.2.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/commons-compress-1.2.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+45b5ec6a16d73d98fe370cfc2e8253bddc6a297e
Added: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-2.9.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-2.9.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-2.9.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xercesImpl-2.9.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
Added: lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4.8.1.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4.8.1.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4.8.1.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4.8.1.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+654b7021e7bb6c5b7b35c88d23cac1022c7b3d6b
Added: lucene/dev/branches/branch_3x/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+0ea514a179ac1dd7e81c7e6594468b9b9910d298
Modified: lucene/dev/branches/branch_3x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java (original)
+++ lucene/dev/branches/branch_3x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java Wed Apr 4 19:00:42 2012
@@ -18,6 +18,11 @@ package org.apache.lucene.validation;
*/
import java.io.File;
+import java.io.FileInputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -25,6 +30,10 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
@@ -36,10 +45,15 @@ import org.apache.tools.ant.types.resour
import org.apache.tools.ant.util.FileNameMapper;
/**
- * An ANT task that verifies if JAR file have associated <tt>LICENSE</tt>
- * and <tt>NOTICE</tt> files.
+ * An ANT task that verifies if JAR file have associated <tt>LICENSE</tt>,
+ * <tt>NOTICE</tt>, and <tt>sha1</tt> files.
*/
public class LicenseCheckTask extends Task {
+
+ public final static String CHECKSUM_TYPE = "sha1";
+ private static final int CHECKSUM_BUFFER_SIZE = 8 * 1024;
+ private static final int CHECKSUM_BYTE_MASK = 0xFF;
+
/**
* All JAR files to check.
*/
@@ -120,7 +134,7 @@ public class LicenseCheckTask extends Ta
}
File jarFile = ((FileResource) r).getFile();
- if (!checkJarFile(jarFile)) {
+ if (! checkJarFile(jarFile) ) {
errors++;
}
checked++;
@@ -138,6 +152,50 @@ public class LicenseCheckTask extends Ta
private boolean checkJarFile(File jarFile) {
log("Scanning: " + jarFile.getPath(), verboseLevel);
+ // validate the jar matches against our expected hash
+ final File checksumFile = new File(jarFile.getParent(),
+ jarFile.getName() + "." + CHECKSUM_TYPE);
+ if (! (checksumFile.exists() && checksumFile.canRead()) ) {
+ log("MISSING " +CHECKSUM_TYPE+ " checksum file for: " + jarFile.getPath(), Project.MSG_ERR);
+ this.failures = true;
+ return false;
+ } else {
+ final String expectedChecksum = readChecksumFile(checksumFile);
+ try {
+ final MessageDigest md = MessageDigest.getInstance(CHECKSUM_TYPE);
+ byte[] buf = new byte[CHECKSUM_BUFFER_SIZE];
+ try {
+ FileInputStream fis = new FileInputStream(jarFile);
+ try {
+ DigestInputStream dis = new DigestInputStream(fis, md);
+ try {
+ while (dis.read(buf, 0, CHECKSUM_BUFFER_SIZE) != -1) {
+ // NOOP
+ }
+ } finally {
+ dis.close();
+ }
+ } finally {
+ fis.close();
+ }
+ } catch (IOException ioe) {
+ throw new BuildException("IO error computing checksum of file: " + jarFile, ioe);
+ }
+ final byte[] checksumBytes = md.digest();
+ final String checksum = createChecksumString(checksumBytes);
+ if ( ! checksum.equals(expectedChecksum) ) {
+ log("CHECKSUM FAILED for " + jarFile.getPath() +
+ " (expected: \"" + expectedChecksum + "\" was: \"" + checksum + "\")",
+ Project.MSG_ERR);
+ this.failures = true;
+ return false;
+ }
+
+ } catch (NoSuchAlgorithmException ae) {
+ throw new BuildException("Digest type " + CHECKSUM_TYPE + " not supported by your JVM", ae);
+ }
+ }
+
// Get the expected license path base from the mapper and search for license files.
Map<File, LicenseType> foundLicenses = new LinkedHashMap<File, LicenseType>();
List<File> expectedLocations = new ArrayList<File>();
@@ -193,4 +251,32 @@ outer:
return true;
}
+
+ private static final String createChecksumString(byte[] digest) {
+ StringBuilder checksum = new StringBuilder();
+ for (int i = 0; i < digest.length; i++) {
+ checksum.append(String.format(Locale.ENGLISH, "%02x",
+ CHECKSUM_BYTE_MASK & digest[i]));
+ }
+ return checksum.toString();
+ }
+ private static final String readChecksumFile(File f) {
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new InputStreamReader
+ (new FileInputStream(f), "UTF-8"));
+ try {
+ String checksum = reader.readLine();
+ if (null == checksum || 0 == checksum.length()) {
+ throw new BuildException("Failed to find checksum in file: " + f);
+ }
+ return checksum;
+ } finally {
+ reader.close();
+ }
+ } catch (IOException e) {
+ throw new BuildException("IO error reading checksum file: " + f, e);
+ }
+ }
+
}
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Wed Apr 4 19:00:42 2012
@@ -426,7 +426,7 @@
excludes="lib/README.committers.txt **/data/ **/logs/*
**/classes/ **/*.sh **/ivy.xml **/build.xml
**/bin/ **/*.iml **/*.ipr **/*.iws **/pom.xml
- **/*pom.xml.template" />
+ **/*pom.xml.template **/*.sha1" />
<tarfileset dir="${dest}/contrib-lucene-libs-to-package"
prefix="${fullnamever}"
includes="**" />
@@ -437,7 +437,7 @@
<tarfileset dir="."
prefix="${fullnamever}"
includes="dist/*.jar dist/*.war dist/solrj-lib/*"
- excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar" />
+ excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar **/*.sha1" />
<tarfileset dir="${dest}/docs"
prefix="${fullnamever}/docs" />
</tar>
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Wed Apr 4 19:00:42 2012
@@ -54,14 +54,14 @@
</and>
</condition>
+ <import file="${common-solr.dir}/../lucene/contrib/contrib-build.xml"/>
+
<path id="additional.dependencies">
- <fileset dir="${common-solr.dir}/lib" excludes="*.txt,*.template"/>
- <fileset dir="${common-solr.dir}/example/lib" excludes="**/*.txt,**/*.template"/>
- <fileset dir="lib" excludes="*.txt,*.template" erroronmissingdir="false"/>
+ <fileset dir="${common-solr.dir}/lib" excludes="${common.classpath.excludes}"/>
+ <fileset dir="${common-solr.dir}/example/lib" excludes="${common.classpath.excludes}"/>
+ <fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
</path>
- <import file="${common-solr.dir}/../lucene/contrib/contrib-build.xml"/>
-
<!-- Solr Specification Version
This will be used in the Manifest file, and therefore must
Modified: lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml Wed Apr 4 19:00:42 2012
@@ -27,7 +27,7 @@
<path id="classpath">
<pathelement path="${icu.jar}"/>
- <fileset dir="lib" excludes="*.txt"/>
+ <fileset dir="lib" excludes="${common.classpath.excludes}"/>
<pathelement path="${analyzers-smartcn.jar}"/>
<pathelement path="${analyzers-stempel.jar}"/>
<path refid="solr.base.classpath"/>
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-3.5.0.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+37357e0ae9c089fd6b2c2def976d763b89242f86
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/hppc-0.3.4-jdk15.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/hppc-0.3.4-jdk15.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/hppc-0.3.4-jdk15.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/hppc-0.3.4-jdk15.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+4cadc097872acac991a1e8edd2027ac9c212a1c1
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+11bc06af8fb695664f042bede95143a1859160c5
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+4e0a4619f999f28cd599d8524a1bb0095ddaa2fb
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+b03c002a2e4e7116fd897fc3ad354d791ecf91f0
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+208be551a80d8dd9ce971f44f9dedd18bf2b9256
Added: lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+314910df77771b33c481a175fbde56fd9295d58a
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/build.xml Wed Apr 4 19:00:42 2012
@@ -55,8 +55,8 @@
<path id="classpath">
<pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/java"/>
<pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/test"/>
- <fileset dir="${common-solr.dir}/contrib/dataimporthandler/lib" excludes="*.txt"/>
- <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="*.txt"/>
+ <fileset dir="${common-solr.dir}/contrib/dataimporthandler/lib" excludes="${common.classpath.excludes}"/>
+ <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="${common.classpath.excludes}"/>
<path refid="solr.base.classpath"/>
</path>
Modified: lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml Wed Apr 4 19:00:42 2012
@@ -26,8 +26,8 @@
<import file="../contrib-build.xml"/>
<path id="classpath">
- <fileset dir="../extraction/lib" excludes="*.txt,*.template"/>
- <fileset dir="lib" excludes="*.txt,*.template"/>
+ <fileset dir="../extraction/lib" excludes="${common.classpath.excludes}"/>
+ <fileset dir="lib" excludes="${common.classpath.excludes}"/>
<path refid="solr.base.classpath"/>
</path>
Added: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+7e9978fdb754bce5fcd5161133e7734ecb683036
Added: lucene/dev/branches/branch_3x/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+baa65a6f9940f2977fa152221522c0fce84d8c92
Added: lucene/dev/branches/branch_3x/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+1cd718806c8f0baa318ea4a9c3a5e2f82e27f0e6
Added: lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/core-3.1.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/core-3.1.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/core-3.1.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/core-3.1.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+88c83ce444cf46d02494da37c9fa1eebc9ce9cea
Added: lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+bec275613a32a218670d1cf17886e8bf817a75ef
Added: lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+10c7211e02bae88c0cec03541d0ab82465c1a1d3
Added: lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+0919294196cdf7571bf86ab55c55ab3a14d5db8d
Added: lucene/dev/branches/branch_3x/solr/example/lib/servlet-api-2.5-20081211.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/lib/servlet-api-2.5-20081211.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/lib/servlet-api-2.5-20081211.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/lib/servlet-api-2.5-20081211.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+22bff70037e1e6fa7e6413149489552ee2064702
Added: lucene/dev/branches/branch_3x/solr/example/start.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/start.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/start.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/example/start.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+3f6dbcdf99ed380ff67b9bf30ab94402ade91b80
Added: lucene/dev/branches/branch_3x/solr/lib/commons-codec-1.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/commons-codec-1.6.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/commons-codec-1.6.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/commons-codec-1.6.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+b7f0fc8f61ecadeb3695f0b9464755eee44374d4
Added: lucene/dev/branches/branch_3x/solr/lib/commons-fileupload-1.2.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/commons-fileupload-1.2.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/commons-fileupload-1.2.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/commons-fileupload-1.2.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+384faa82e193d4e4b0546059ca09572654bc3970
Added: lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+964cd74171f427720480efdec40a7c7f6e58426a
Added: lucene/dev/branches/branch_3x/solr/lib/commons-io-2.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/commons-io-2.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/commons-io-2.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/commons-io-2.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+fd51f906669f49a4ffd06650666c3b8147a6106e
Added: lucene/dev/branches/branch_3x/solr/lib/commons-lang-2.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/commons-lang-2.6.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/commons-lang-2.6.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/commons-lang-2.6.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+0ce1edb914c94ebc388f086c6827e8bdeec71ac2
Added: lucene/dev/branches/branch_3x/solr/lib/easymock-2.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/easymock-2.2.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/easymock-2.2.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/easymock-2.2.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+0b9536281a0d32253f97445999dcaf0572e57bbb
Added: lucene/dev/branches/branch_3x/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+1c171093a8b43aa550c6050ac441abe713ebb4f2
Added: lucene/dev/branches/branch_3x/solr/lib/guava-r05.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/guava-r05.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/guava-r05.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/guava-r05.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+097fd3078118f05895ba5c3a95f3c335e2a2f34d
Added: lucene/dev/branches/branch_3x/solr/lib/httpclient-4.1.3.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/httpclient-4.1.3.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/httpclient-4.1.3.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/httpclient-4.1.3.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+16cf5a6b78951f50713d29bfae3230a611dc01f0
Added: lucene/dev/branches/branch_3x/solr/lib/httpcore-4.1.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/httpcore-4.1.4.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/httpcore-4.1.4.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/httpcore-4.1.4.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+31cc0a151d458c4b99476805ede9c8accafb734c
Added: lucene/dev/branches/branch_3x/solr/lib/httpmime-4.1.3.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/httpmime-4.1.3.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/httpmime-4.1.3.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/httpmime-4.1.3.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+d97e400d31bbeb36c1c60d2c3a9bbf2cdccf85a8
Added: lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+99c61095a14dfc9e47a086068033c286bf236475
Added: lucene/dev/branches/branch_3x/solr/lib/junit-4.10.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/junit-4.10.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/junit-4.10.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/junit-4.10.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+e4f1766ce7404a08f45d859fb9c226fc9e41a861
Added: lucene/dev/branches/branch_3x/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+2083595b098f183da3c0cabf2819eb083a510a9e
Added: lucene/dev/branches/branch_3x/solr/lib/servlet-api-2.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/servlet-api-2.4.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/servlet-api-2.4.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/servlet-api-2.4.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+3fc542fe8bb8164e8d3e840fe7403bc0518053c0
Added: lucene/dev/branches/branch_3x/solr/lib/slf4j-api-1.6.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/slf4j-api-1.6.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/slf4j-api-1.6.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/slf4j-api-1.6.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+6f3b8a24bf970f17289b234284c94f43eb42f0e4
Added: lucene/dev/branches/branch_3x/solr/lib/slf4j-jdk14-1.6.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/slf4j-jdk14-1.6.1.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/slf4j-jdk14-1.6.1.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/slf4j-jdk14-1.6.1.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+251899d8c17e29ed4c53d98c88e54241a14d9591
Added: lucene/dev/branches/branch_3x/solr/lib/wstx-asl-3.2.7.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/wstx-asl-3.2.7.jar.sha1?rev=1309546&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/wstx-asl-3.2.7.jar.sha1 (added)
+++ lucene/dev/branches/branch_3x/solr/lib/wstx-asl-3.2.7.jar.sha1 Wed Apr 4 19:00:42 2012
@@ -0,0 +1 @@
+252c7faae9ce98cb9c9d29f02db88f7373e7f407
Modified: lucene/dev/branches/branch_3x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/webapp/build.xml?rev=1309546&r1=1309545&r2=1309546&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/webapp/build.xml Wed Apr 4 19:00:42 2012
@@ -63,15 +63,13 @@
<war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml"
manifest="${manifest.file}">
- <lib dir="${common-solr.dir}/lib" excludes="${exclude.from.war}">
+ <lib dir="${common-solr.dir}/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
<exclude name="servlet-api*.jar" />
<exclude name="easymock-*.jar" />
<exclude name="junit-*.jar" />
- <exclude name="*.txt" />
- <exclude name="*.template" />
</lib>
- <lib dir="${lucene-libs}" excludes="${exclude.from.war}"/>
- <lib dir="${dist}" excludes="${exclude.from.war}">
+ <lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" />
+ <lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
<include name="apache-solr-solrj-${version}.jar" />
<include name="apache-solr-core-${version}.jar" />
</lib>