| Index: solr/common-build.xml |
| =================================================================== |
| --- solr/common-build.xml (revision 1309452) |
| +++ solr/common-build.xml (working copy) |
| @@ -59,14 +59,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 |
| Index: solr/example/start.jar.sha1 |
| =================================================================== |
| --- solr/example/start.jar.sha1 (revision 0) |
| +++ solr/example/start.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +edfcab3e9f984fbfeef4f6193ec56f98b4796c68 |
| Index: solr/example/lib/jetty-servlet-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-servlet-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-servlet-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +d855e7a18f0381b6128ccf4563355e969f826433 |
| Index: solr/example/lib/jetty-deploy-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-deploy-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-deploy-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +79b1ef70ba4bb4c05d35516f795ff306a96bb25a |
| Index: solr/example/lib/jetty-jmx-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-jmx-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-jmx-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +049299fdc468aec112070369513f363447c12e76 |
| Index: solr/example/lib/jetty-xml-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-xml-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-xml-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +ade750a7b75b6ce58c6e50347b2c1e6dafc1eb4b |
| Index: solr/example/lib/servlet-api-3.0.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/servlet-api-3.0.jar.sha1 (revision 0) |
| +++ solr/example/lib/servlet-api-3.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +0aaaa85845fb5c59da00193f06b8e5278d8bf3f8 |
| Index: solr/example/lib/jetty-server-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-server-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-server-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +5d56afa0f80e90aa40c5af42b4f7b82992794f1f |
| Index: solr/example/lib/jetty-security-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-security-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-security-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +3a559bfb2788e71b4469631497c58c93ba273259 |
| Index: solr/example/lib/jetty-io-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-io-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-io-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +2da8e10c38250f713764a31bc4b7dbc58983de0e |
| Index: solr/example/lib/jetty-continuation-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-continuation-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-continuation-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +545d335d2f6d5e195939528f6a37f23abad4f58f |
| Index: solr/example/lib/jetty-util-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-util-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-util-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +d14aef3cae042cd9716fb109d1205bfd84248956 |
| Index: solr/example/lib/jetty-webapp-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-webapp-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-webapp-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +436ed4d774f26ac348e4a84938af19130b8f9773 |
| Index: solr/example/lib/jetty-http-8.1.2.v20120308.jar.sha1 |
| =================================================================== |
| --- solr/example/lib/jetty-http-8.1.2.v20120308.jar.sha1 (revision 0) |
| +++ solr/example/lib/jetty-http-8.1.2.v20120308.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +650858c9c7344da2455b60069224ee148a80bdc5 |
| Index: solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 |
| =================================================================== |
| --- solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 (revision 0) |
| +++ solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +7e9978fdb754bce5fcd5161133e7734ecb683036 |
| Index: solr/build.xml |
| =================================================================== |
| --- solr/build.xml (revision 1309452) |
| +++ solr/build.xml (working copy) |
| @@ -415,7 +415,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="**" /> |
| @@ -426,7 +426,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> |
| Index: solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +208be551a80d8dd9ce971f44f9dedd18bf2b9256 |
| Index: solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +314910df77771b33c481a175fbde56fd9295d58a |
| Index: solr/contrib/clustering/lib/hppc-0.3.3.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/hppc-0.3.3.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/hppc-0.3.3.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +ff4f2b0a5b6659fce67644ce620b9ac3f183ddd9 |
| Index: solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +4e0a4619f999f28cd599d8524a1bb0095ddaa2fb |
| Index: solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +11bc06af8fb695664f042bede95143a1859160c5 |
| Index: solr/contrib/clustering/lib/carrot2-core-3.5.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/carrot2-core-3.5.0.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/carrot2-core-3.5.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +33a9a1191909f70ad3d1b81433015c594b8ccac8 |
| Index: solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1 |
| =================================================================== |
| --- solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1 (revision 0) |
| +++ solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +b03c002a2e4e7116fd897fc3ad354d791ecf91f0 |
| Index: solr/contrib/extraction/lib/fontbox-1.6.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/fontbox-1.6.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/fontbox-1.6.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +c59ede61204faa09c407a6b1c64a6e21d6f57548 |
| Index: solr/contrib/extraction/lib/asm-3.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/asm-3.1.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/asm-3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +c157def142714c544bdea2e6144645702adf7097 |
| Index: solr/contrib/extraction/lib/pdfbox-1.6.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/pdfbox-1.6.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/pdfbox-1.6.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +4fdc454f4925cca53a7140bfc7a61c74f80b2dd8 |
| Index: solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +7510bbf8caab4d0ef21019d55d61d085caa28c86 |
| Index: solr/contrib/extraction/lib/commons-compress-1.3.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/commons-compress-1.3.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/commons-compress-1.3.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +613a08bc72e2e9a43c9f87b9ff8352b47e18e3ae |
| Index: solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +82ba64e839f28aa231f9f3a5f44ec5cb094f510c |
| Index: solr/contrib/extraction/lib/jempbox-1.6.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/jempbox-1.6.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/jempbox-1.6.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +b4c612d88a2a86e540edbf1125b1f095513cd65e |
| Index: solr/contrib/extraction/lib/rome-0.9.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/rome-0.9.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/rome-0.9.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +dee2705dd01e79a5a96a17225f5a1ae30470bb18 |
| Index: solr/contrib/extraction/lib/xercesImpl-2.8.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/xercesImpl-2.8.1.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/xercesImpl-2.8.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +25101e37ec0c907db6f0612cbf106ee519c1aef1 |
| Index: solr/contrib/extraction/lib/tagsoup-1.2.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/tagsoup-1.2.1.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/tagsoup-1.2.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +5584627487e984c03456266d3f8802eb85a9ce97 |
| Index: solr/contrib/extraction/lib/icu4j-4.8.1.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/icu4j-4.8.1.1.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/icu4j-4.8.1.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +654b7021e7bb6c5b7b35c88d23cac1022c7b3d6b |
| Index: solr/contrib/extraction/lib/boilerpipe-1.1.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/boilerpipe-1.1.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/boilerpipe-1.1.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +f62cb75ed52455a9e68d1d05b84c500673340eb2 |
| Index: solr/contrib/extraction/lib/jdom-1.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/jdom-1.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/jdom-1.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +a2ac1cd690ab4c80defe7f9bce14d35934c35cec |
| Index: solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +3aed7e642dd8d39dc14ed1dec3ff79e084637148 |
| Index: solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +66d5f90e1d75cf124db27c95ff686d6c8ef7ef04 |
| Index: solr/contrib/extraction/lib/netcdf-4.2-min.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/netcdf-4.2-min.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/netcdf-4.2-min.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +0f3c3f3db4c54483aa1fbc4497e300879ce24da1 |
| Index: solr/contrib/extraction/lib/xml-apis-1.0.b2.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/xml-apis-1.0.b2.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/xml-apis-1.0.b2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +3136ca936f64c9d68529f048c2618bd356bf85c9 |
| Index: solr/contrib/extraction/lib/poi-3.8-beta4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/poi-3.8-beta4.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/poi-3.8-beta4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +cf57ad427c460f98f07817c07251c0d30098cbb8 |
| Index: solr/contrib/extraction/lib/tika-core-1.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/tika-core-1.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/tika-core-1.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +d328115f8bdee0ec5ac45e76154e310b5b0f48a4 |
| Index: solr/contrib/extraction/lib/dom4j-1.6.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/dom4j-1.6.1.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/dom4j-1.6.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +5d3ccc056b6f056dbf0dddfdf43894b9065a8f94 |
| Index: solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +f0cbe6fd6f8d21843e6646c2d6490a58f60078a9 |
| Index: solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +7741883cb07b4634e8b5fd3337113b6ea770a9bb |
| Index: solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +a06e8c6d9fa4063df541427686e9f070377b7b8e |
| Index: solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +f1c0f6c2ebfbe2b11dd04559ad438728e4636d53 |
| Index: solr/contrib/extraction/lib/tika-parsers-1.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/tika-parsers-1.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/tika-parsers-1.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +f4c14199c71d85207375f43f681d2f94cec38545 |
| Index: solr/contrib/extraction/lib/xmlbeans-2.3.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/extraction/lib/xmlbeans-2.3.0.jar.sha1 (revision 0) |
| +++ solr/contrib/extraction/lib/xmlbeans-2.3.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +8704dcf5c9f10265a08f5020b0fab70eb64ac3c4 |
| Index: solr/contrib/dataimporthandler/lib/activation-1.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/dataimporthandler/lib/activation-1.1.jar.sha1 (revision 0) |
| +++ solr/contrib/dataimporthandler/lib/activation-1.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +e6cb541461c2834bdea3eb920f1884d1eb508b50 |
| Index: solr/contrib/dataimporthandler/lib/mail-1.4.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/dataimporthandler/lib/mail-1.4.1.jar.sha1 (revision 0) |
| +++ solr/contrib/dataimporthandler/lib/mail-1.4.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +8b7bc69010655425dabf091b51d1e90b4de36715 |
| Index: solr/contrib/dataimporthandler-extras/build.xml |
| =================================================================== |
| --- solr/contrib/dataimporthandler-extras/build.xml (revision 1309452) |
| +++ solr/contrib/dataimporthandler-extras/build.xml (working copy) |
| @@ -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> |
| |
| Index: solr/contrib/analysis-extras/lib/icu4j-4.8.1.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/analysis-extras/lib/icu4j-4.8.1.1.jar.sha1 (revision 0) |
| +++ solr/contrib/analysis-extras/lib/icu4j-4.8.1.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +654b7021e7bb6c5b7b35c88d23cac1022c7b3d6b |
| Index: solr/contrib/analysis-extras/build.xml |
| =================================================================== |
| --- solr/contrib/analysis-extras/build.xml (revision 1309452) |
| +++ solr/contrib/analysis-extras/build.xml (working copy) |
| @@ -26,7 +26,7 @@ |
| <import file="../contrib-build.xml"/> |
| |
| <path id="classpath"> |
| - <fileset dir="lib" excludes="*.txt"/> |
| + <fileset dir="lib" excludes="${common.classpath.excludes}"/> |
| <pathelement path="${analyzers-icu.jar}"/> |
| <pathelement path="${analyzers-smartcn.jar}"/> |
| <pathelement path="${analyzers-stempel.jar}"/> |
| Index: solr/contrib/uima/lib/commons-digester-2.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/uima/lib/commons-digester-2.0.jar.sha1 (revision 0) |
| +++ solr/contrib/uima/lib/commons-digester-2.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +3dbd8a76683cd563583a2c78c356ad8b8acf38bf |
| Index: solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1 (revision 0) |
| +++ solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +d7b0fd616c4289376c1f59e2a68edfb4cfd6730d |
| Index: solr/contrib/uima/lib/uimaj-core-2.3.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/uima/lib/uimaj-core-2.3.1.jar.sha1 (revision 0) |
| +++ solr/contrib/uima/lib/uimaj-core-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +99bf8d75b71410e4d5f2051ae79942721b3a2f60 |
| Index: solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1 (revision 0) |
| +++ solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +e9ce9874276b0a7dc57f55d87d4e550d970533f6 |
| Index: solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar.sha1 (revision 0) |
| +++ solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +cb0e8a49d53ea7ce7a2b71a915aa728b90ae39df |
| Index: solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1 (revision 0) |
| +++ solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +cd02db9e8d54decb14cbe303d001d13735237290 |
| Index: solr/contrib/langid/lib/langdetect-1.1-20120112.jar.sha1 |
| =================================================================== |
| --- solr/contrib/langid/lib/langdetect-1.1-20120112.jar.sha1 (revision 0) |
| +++ solr/contrib/langid/lib/langdetect-1.1-20120112.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +99091df19fff62f815d56d23b412610baf38fe97 |
| Index: solr/contrib/langid/lib/jsonic-1.2.7.jar.sha1 |
| =================================================================== |
| --- solr/contrib/langid/lib/jsonic-1.2.7.jar.sha1 (revision 0) |
| +++ solr/contrib/langid/lib/jsonic-1.2.7.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +9efb491fa27424c5e4773db449e8a2c551a75de5 |
| Index: solr/contrib/langid/build.xml |
| =================================================================== |
| --- solr/contrib/langid/build.xml (revision 1309452) |
| +++ solr/contrib/langid/build.xml (working copy) |
| @@ -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> |
| |
| Index: solr/contrib/velocity/lib/velocity-tools-2.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/velocity/lib/velocity-tools-2.0.jar.sha1 (revision 0) |
| +++ solr/contrib/velocity/lib/velocity-tools-2.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +69936384de86857018b023a8c56ae0635c56b6a0 |
| Index: solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar.sha1 |
| =================================================================== |
| --- solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar.sha1 (revision 0) |
| +++ solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +5675fd96b29656504b86029551973d60fb41339b |
| Index: solr/contrib/velocity/lib/velocity-1.6.4.jar.sha1 |
| =================================================================== |
| --- solr/contrib/velocity/lib/velocity-1.6.4.jar.sha1 (revision 0) |
| +++ solr/contrib/velocity/lib/velocity-1.6.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +fcc58693dd8fc83d714fba149789be37cc19b66d |
| Index: solr/contrib/velocity/lib/commons-collections-3.2.1.jar.sha1 |
| =================================================================== |
| --- solr/contrib/velocity/lib/commons-collections-3.2.1.jar.sha1 (revision 0) |
| +++ solr/contrib/velocity/lib/commons-collections-3.2.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +761ea405b9b37ced573d2df0d1e3a4e0f9edc668 |
| Index: solr/lib/httpclient-4.1.3.jar.sha1 |
| =================================================================== |
| --- solr/lib/httpclient-4.1.3.jar.sha1 (revision 0) |
| +++ solr/lib/httpclient-4.1.3.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +16cf5a6b78951f50713d29bfae3230a611dc01f0 |
| Index: solr/lib/commons-codec-1.6.jar.sha1 |
| =================================================================== |
| --- solr/lib/commons-codec-1.6.jar.sha1 (revision 0) |
| +++ solr/lib/commons-codec-1.6.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +b7f0fc8f61ecadeb3695f0b9464755eee44374d4 |
| Index: solr/lib/httpmime-4.1.3.jar.sha1 |
| =================================================================== |
| --- solr/lib/httpmime-4.1.3.jar.sha1 (revision 0) |
| +++ solr/lib/httpmime-4.1.3.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +d97e400d31bbeb36c1c60d2c3a9bbf2cdccf85a8 |
| Index: solr/lib/slf4j-api-1.6.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/slf4j-api-1.6.1.jar.sha1 (revision 0) |
| +++ solr/lib/slf4j-api-1.6.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +6f3b8a24bf970f17289b234284c94f43eb42f0e4 |
| Index: solr/lib/slf4j-jdk14-1.6.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/slf4j-jdk14-1.6.1.jar.sha1 (revision 0) |
| +++ solr/lib/slf4j-jdk14-1.6.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +251899d8c17e29ed4c53d98c88e54241a14d9591 |
| Index: solr/lib/guava-r05.jar.sha1 |
| =================================================================== |
| --- solr/lib/guava-r05.jar.sha1 (revision 0) |
| +++ solr/lib/guava-r05.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +097fd3078118f05895ba5c3a95f3c335e2a2f34d |
| Index: solr/lib/log4j-over-slf4j-1.6.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/log4j-over-slf4j-1.6.1.jar.sha1 (revision 0) |
| +++ solr/lib/log4j-over-slf4j-1.6.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +2083595b098f183da3c0cabf2819eb083a510a9e |
| Index: solr/lib/easymock-2.2.jar.sha1 |
| =================================================================== |
| --- solr/lib/easymock-2.2.jar.sha1 (revision 0) |
| +++ solr/lib/easymock-2.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +0b9536281a0d32253f97445999dcaf0572e57bbb |
| Index: solr/lib/commons-io-2.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/commons-io-2.1.jar.sha1 (revision 0) |
| +++ solr/lib/commons-io-2.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +fd51f906669f49a4ffd06650666c3b8147a6106e |
| Index: solr/lib/wstx-asl-3.2.7.jar.sha1 |
| =================================================================== |
| --- solr/lib/wstx-asl-3.2.7.jar.sha1 (revision 0) |
| +++ solr/lib/wstx-asl-3.2.7.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +252c7faae9ce98cb9c9d29f02db88f7373e7f407 |
| Index: solr/lib/spatial4j-0.2.jar.sha1 |
| =================================================================== |
| --- solr/lib/spatial4j-0.2.jar.sha1 (revision 0) |
| +++ solr/lib/spatial4j-0.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +8c0fa2cdb51f30a4f846cd60507b190e983f175a |
| Index: solr/lib/httpcore-4.1.4.jar.sha1 |
| =================================================================== |
| --- solr/lib/httpcore-4.1.4.jar.sha1 (revision 0) |
| +++ solr/lib/httpcore-4.1.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +31cc0a151d458c4b99476805ede9c8accafb734c |
| Index: solr/lib/commons-fileupload-1.2.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/commons-fileupload-1.2.1.jar.sha1 (revision 0) |
| +++ solr/lib/commons-fileupload-1.2.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +384faa82e193d4e4b0546059ca09572654bc3970 |
| Index: solr/lib/commons-lang-2.6.jar.sha1 |
| =================================================================== |
| --- solr/lib/commons-lang-2.6.jar.sha1 (revision 0) |
| +++ solr/lib/commons-lang-2.6.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +0ce1edb914c94ebc388f086c6827e8bdeec71ac2 |
| Index: solr/lib/javax.servlet-api-3.0.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/javax.servlet-api-3.0.1.jar.sha1 (revision 0) |
| +++ solr/lib/javax.servlet-api-3.0.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +6bf0ebb7efd993e222fc1112377b5e92a13b38dd |
| Index: solr/lib/jcl-over-slf4j-1.6.1.jar.sha1 |
| =================================================================== |
| --- solr/lib/jcl-over-slf4j-1.6.1.jar.sha1 (revision 0) |
| +++ solr/lib/jcl-over-slf4j-1.6.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +99c61095a14dfc9e47a086068033c286bf236475 |
| Index: solr/lib/zookeeper-3.3.4.jar.sha1 |
| =================================================================== |
| --- solr/lib/zookeeper-3.3.4.jar.sha1 (revision 0) |
| +++ solr/lib/zookeeper-3.3.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +6471e17c92181da9e143559c4c4779925a5e6eb0 |
| Index: solr/webapp/build.xml |
| =================================================================== |
| --- solr/webapp/build.xml (revision 1309452) |
| +++ solr/webapp/build.xml (working copy) |
| @@ -51,15 +51,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> |
| Index: modules/analysis/icu/lib/icu4j-4.8.1.1.jar.sha1 |
| =================================================================== |
| --- modules/analysis/icu/lib/icu4j-4.8.1.1.jar.sha1 (revision 0) |
| +++ modules/analysis/icu/lib/icu4j-4.8.1.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +654b7021e7bb6c5b7b35c88d23cac1022c7b3d6b |
| Index: modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar.sha1 |
| =================================================================== |
| --- modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar.sha1 (revision 0) |
| +++ modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +eba98b7cd049e07d55a64b180345954b62e42ec5 |
| Index: modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar.sha1 |
| =================================================================== |
| --- modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar.sha1 (revision 0) |
| +++ modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +1513ee81494d7856f607ff8fffc74b4c6cbe0d48 |
| Index: modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar.sha1 |
| =================================================================== |
| --- modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar.sha1 (revision 0) |
| +++ modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +ee23a00580efe973aafa6f2c225e52951832901b |
| Index: modules/analysis/phonetic/lib/commons-codec-1.6.jar.sha1 |
| =================================================================== |
| --- modules/analysis/phonetic/lib/commons-codec-1.6.jar.sha1 (revision 0) |
| +++ modules/analysis/phonetic/lib/commons-codec-1.6.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +b7f0fc8f61ecadeb3695f0b9464755eee44374d4 |
| Index: modules/analysis/uima/lib/uimaj-core-2.3.1.jar.sha1 |
| =================================================================== |
| --- modules/analysis/uima/lib/uimaj-core-2.3.1.jar.sha1 (revision 0) |
| +++ modules/analysis/uima/lib/uimaj-core-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +99bf8d75b71410e4d5f2051ae79942721b3a2f60 |
| Index: modules/analysis/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1 |
| =================================================================== |
| --- modules/analysis/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1 (revision 0) |
| +++ modules/analysis/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +d7b0fd616c4289376c1f59e2a68edfb4cfd6730d |
| Index: modules/analysis/uima/lib/Tagger-2.3.1.jar.sha1 |
| =================================================================== |
| --- modules/analysis/uima/lib/Tagger-2.3.1.jar.sha1 (revision 0) |
| +++ modules/analysis/uima/lib/Tagger-2.3.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +cd02db9e8d54decb14cbe303d001d13735237290 |
| Index: modules/benchmark/lib/xercesImpl-2.9.1.jar.sha1 |
| =================================================================== |
| --- modules/benchmark/lib/xercesImpl-2.9.1.jar.sha1 (revision 0) |
| +++ modules/benchmark/lib/xercesImpl-2.9.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6 |
| Index: modules/benchmark/lib/commons-compress-1.2.jar.sha1 |
| =================================================================== |
| --- modules/benchmark/lib/commons-compress-1.2.jar.sha1 (revision 0) |
| +++ modules/benchmark/lib/commons-compress-1.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +45b5ec6a16d73d98fe370cfc2e8253bddc6a297e |
| Index: modules/spatial/lib/spatial4j-0.2.jar.sha1 |
| =================================================================== |
| --- modules/spatial/lib/spatial4j-0.2.jar.sha1 (revision 0) |
| +++ modules/spatial/lib/spatial4j-0.2.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +8c0fa2cdb51f30a4f846cd60507b190e983f175a |
| Index: lucene/common-build.xml |
| =================================================================== |
| --- lucene/common-build.xml (revision 1309452) |
| +++ lucene/common-build.xml (working copy) |
| @@ -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" /> |
| Index: lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java |
| =================================================================== |
| --- lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java (revision 1309452) |
| +++ lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java (working copy) |
| @@ -18,6 +18,11 @@ |
| */ |
| |
| 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.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.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 @@ |
| } |
| |
| File jarFile = ((FileResource) r).getFile(); |
| - if (!checkJarFile(jarFile)) { |
| + if (! checkJarFile(jarFile) ) { |
| errors++; |
| } |
| checked++; |
| @@ -138,6 +152,50 @@ |
| 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 @@ |
| |
| 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); |
| + } |
| + } |
| + |
| } |
| Index: lucene/contrib/demo/lib/servlet-api-2.4.jar.sha1 |
| =================================================================== |
| --- lucene/contrib/demo/lib/servlet-api-2.4.jar.sha1 (revision 0) |
| +++ lucene/contrib/demo/lib/servlet-api-2.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +3fc542fe8bb8164e8d3e840fe7403bc0518053c0 |
| Index: lucene/contrib/sandbox/lib/jakarta-regexp-1.4.jar.sha1 |
| =================================================================== |
| --- lucene/contrib/sandbox/lib/jakarta-regexp-1.4.jar.sha1 (revision 0) |
| +++ lucene/contrib/sandbox/lib/jakarta-regexp-1.4.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +0ea514a179ac1dd7e81c7e6594468b9b9910d298 |
| Index: lucene/test-framework/lib/junit-4.10.jar.sha1 |
| =================================================================== |
| --- lucene/test-framework/lib/junit-4.10.jar.sha1 (revision 0) |
| +++ lucene/test-framework/lib/junit-4.10.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +e4f1766ce7404a08f45d859fb9c226fc9e41a861 |
| Index: lucene/test-framework/lib/ant-junit-1.7.1.jar.sha1 |
| =================================================================== |
| --- lucene/test-framework/lib/ant-junit-1.7.1.jar.sha1 (revision 0) |
| +++ lucene/test-framework/lib/ant-junit-1.7.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +942d04e42bc6a9fc61a7744625d89726af8ec006 |
| Index: lucene/test-framework/lib/ant-1.7.1.jar.sha1 |
| =================================================================== |
| --- lucene/test-framework/lib/ant-1.7.1.jar.sha1 (revision 0) |
| +++ lucene/test-framework/lib/ant-1.7.1.jar.sha1 (revision 0) |
| @@ -0,0 +1 @@ |
| +1d33711018e7649a8427fff62a87f94f4e7d310f |
