LUCENE-4262: add ivy sync=true, so when resolve runs, only jars that …

…should be there are there git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1366509 13f79535-47bb-0310-9956-ffa450edef68
ramil4icr · Jul 27, 2012 · 6d2a288 · 6d2a288
1 parent 6e91227
commit 6d2a288
Show file tree

Hide file tree

Showing 298 changed files with 29 additions and 50 deletions.
diff --git a/lucene/build.xml b/lucene/build.xml
@@ -167,7 +167,7 @@
   <target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
 
   <target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
-    <license-check-macro dir="${basedir}" />
+    <license-check-macro dir="${basedir}" licensedir="${common.dir}/licenses" />
   </target>
 
   <target name="check-forbidden-apis" depends="compile-tools,compile-test,load-custom-tasks,-check-forbidden-jdk-apis,-check-forbidden-test-apis,-check-system-out" description="Check forbidden API calls in compiled class files"/>

diff --git a/lucene/common-build.xml b/lucene/common-build.xml
@@ -60,6 +60,7 @@
   <property name="ivy.resource" value="org/apache/ivy/ant/antlib.xml" />
   <available resource="${ivy.resource}" property="ivy.available" />
   <property name="ivy.default.configuration" value="*"/>
+  <property name="ivy.sync" value="true"/>
 
   <property name="junit.jar" value="junit-4.10.jar"/>
   <property name="junit-location.jar" value="${common.dir}/test-framework/lib/${junit.jar}"/>
@@ -294,7 +295,7 @@
     <!-- todo, make this a property or something. 
          only special cases need bundles -->
     <ivy:retrieve type="jar,bundle" log="download-only" 
-                  conf="${ivy.default.configuration}"/>
+                  conf="${ivy.default.configuration}" sync="${ivy.sync}"/>
   </target>
 
   <property name="ivy_install_path" location="${user.home}/.ant/lib" />

diff --git a/...e/analysis/uima/lib/Tagger-2.3.1.jar.sha1 → lucene/licenses/Tagger-2.3.1.jar.sha1 b/...e/analysis/uima/lib/Tagger-2.3.1.jar.sha1 → lucene/licenses/Tagger-2.3.1.jar.sha1
diff --git a/.../analysis/uima/lib/Tagger-LICENSE-ASL.txt → lucene/licenses/Tagger-LICENSE-ASL.txt b/.../analysis/uima/lib/Tagger-LICENSE-ASL.txt → lucene/licenses/Tagger-LICENSE-ASL.txt
diff --git a/lucene/analysis/uima/lib/Tagger-NOTICE.txt → lucene/licenses/Tagger-NOTICE.txt b/lucene/analysis/uima/lib/Tagger-NOTICE.txt → lucene/licenses/Tagger-NOTICE.txt
diff --git a/...ma/lib/WhitespaceTokenizer-2.3.1.jar.sha1 → ...censes/WhitespaceTokenizer-2.3.1.jar.sha1 b/...ma/lib/WhitespaceTokenizer-2.3.1.jar.sha1 → ...censes/WhitespaceTokenizer-2.3.1.jar.sha1
diff --git a/...a/lib/WhitespaceTokenizer-LICENSE-ASL.txt → ...enses/WhitespaceTokenizer-LICENSE-ASL.txt b/...a/lib/WhitespaceTokenizer-LICENSE-ASL.txt → ...enses/WhitespaceTokenizer-LICENSE-ASL.txt
diff --git a/...s/uima/lib/WhitespaceTokenizer-NOTICE.txt → ...e/licenses/WhitespaceTokenizer-NOTICE.txt b/...s/uima/lib/WhitespaceTokenizer-NOTICE.txt → ...e/licenses/WhitespaceTokenizer-NOTICE.txt
diff --git a/lucene/test-framework/lib/ant-1.8.2.jar.sha1 → lucene/licenses/ant-1.8.2.jar.sha1 b/lucene/test-framework/lib/ant-1.8.2.jar.sha1 → lucene/licenses/ant-1.8.2.jar.sha1
diff --git a/...ne/test-framework/lib/ant-LICENSE-ASL.txt → lucene/licenses/ant-LICENSE-ASL.txt b/...ne/test-framework/lib/ant-LICENSE-ASL.txt → lucene/licenses/ant-LICENSE-ASL.txt
diff --git a/lucene/test-framework/lib/ant-NOTICE.txt → lucene/licenses/ant-NOTICE.txt b/lucene/test-framework/lib/ant-NOTICE.txt → lucene/licenses/ant-NOTICE.txt
diff --git a/...st-framework/lib/ant-junit-1.8.2.jar.sha1 → lucene/licenses/ant-junit-1.8.2.jar.sha1 b/...st-framework/lib/ant-junit-1.8.2.jar.sha1 → lucene/licenses/ant-junit-1.8.2.jar.sha1
diff --git a/...t-framework/lib/ant-junit-LICENSE-ASL.txt → lucene/licenses/ant-junit-LICENSE-ASL.txt b/...t-framework/lib/ant-junit-LICENSE-ASL.txt → lucene/licenses/ant-junit-LICENSE-ASL.txt
diff --git a/...e/test-framework/lib/ant-junit-NOTICE.txt → lucene/licenses/ant-junit-NOTICE.txt b/...e/test-framework/lib/ant-junit-NOTICE.txt → lucene/licenses/ant-junit-NOTICE.txt
diff --git a/lucene/tools/lib/asm-debug-all-4.0.jar.sha1 → lucene/licenses/asm-debug-all-4.0.jar.sha1 b/lucene/tools/lib/asm-debug-all-4.0.jar.sha1 → lucene/licenses/asm-debug-all-4.0.jar.sha1
diff --git a/...ls/lib/asm-debug-all-LICENSE-BSD_LIKE.txt → ...censes/asm-debug-all-LICENSE-BSD_LIKE.txt b/...ls/lib/asm-debug-all-LICENSE-BSD_LIKE.txt → ...censes/asm-debug-all-LICENSE-BSD_LIKE.txt
diff --git a/lucene/tools/lib/asm-debug-all-NOTICE.txt → lucene/licenses/asm-debug-all-NOTICE.txt b/lucene/tools/lib/asm-debug-all-NOTICE.txt → lucene/licenses/asm-debug-all-NOTICE.txt
diff --git a/...s/phonetic/lib/commons-codec-1.6.jar.sha1 → lucene/licenses/commons-codec-1.6.jar.sha1 b/...s/phonetic/lib/commons-codec-1.6.jar.sha1 → lucene/licenses/commons-codec-1.6.jar.sha1
diff --git a/...honetic/lib/commons-codec-LICENSE-ASL.txt → ...ne/licenses/commons-codec-LICENSE-ASL.txt b/...honetic/lib/commons-codec-LICENSE-ASL.txt → ...ne/licenses/commons-codec-LICENSE-ASL.txt
diff --git a/...sis/phonetic/lib/commons-codec-NOTICE.txt → lucene/licenses/commons-codec-NOTICE.txt b/...sis/phonetic/lib/commons-codec-NOTICE.txt → lucene/licenses/commons-codec-NOTICE.txt
diff --git a/...nchmark/lib/commons-compress-1.3.jar.sha1 → ...ne/licenses/commons-compress-1.3.jar.sha1 b/...nchmark/lib/commons-compress-1.3.jar.sha1 → ...ne/licenses/commons-compress-1.3.jar.sha1
diff --git a/...mark/lib/commons-compress-LICENSE-ASL.txt → ...licenses/commons-compress-LICENSE-ASL.txt b/...mark/lib/commons-compress-LICENSE-ASL.txt → ...licenses/commons-compress-LICENSE-ASL.txt
diff --git a/...benchmark/lib/commons-compress-NOTICE.txt → lucene/licenses/commons-compress-NOTICE.txt b/...benchmark/lib/commons-compress-NOTICE.txt → lucene/licenses/commons-compress-NOTICE.txt
diff --git a/lucene/analysis/icu/lib/icu4j-49.1.jar.sha1 → lucene/licenses/icu4j-49.1.jar.sha1 b/lucene/analysis/icu/lib/icu4j-49.1.jar.sha1 → lucene/licenses/icu4j-49.1.jar.sha1
diff --git a/...alysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt → lucene/licenses/icu4j-LICENSE-BSD_LIKE.txt b/...alysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt → lucene/licenses/icu4j-LICENSE-BSD_LIKE.txt
diff --git a/lucene/analysis/icu/lib/icu4j-NOTICE.txt → lucene/licenses/icu4j-NOTICE.txt b/lucene/analysis/icu/lib/icu4j-NOTICE.txt → lucene/licenses/icu4j-NOTICE.txt
diff --git a/...e/sandbox/lib/jakarta-regexp-1.4.jar.sha1 → lucene/licenses/jakarta-regexp-1.4.jar.sha1 b/...e/sandbox/lib/jakarta-regexp-1.4.jar.sha1 → lucene/licenses/jakarta-regexp-1.4.jar.sha1
diff --git a/...andbox/lib/jakarta-regexp-LICENSE-ASL.txt → ...e/licenses/jakarta-regexp-LICENSE-ASL.txt b/...andbox/lib/jakarta-regexp-LICENSE-ASL.txt → ...e/licenses/jakarta-regexp-LICENSE-ASL.txt
diff --git a/lucene/sandbox/lib/jakarta-regexp-NOTICE.txt → lucene/licenses/jakarta-regexp-NOTICE.txt b/lucene/sandbox/lib/jakarta-regexp-NOTICE.txt → lucene/licenses/jakarta-regexp-NOTICE.txt
diff --git a/...ne/test-framework/lib/junit-4.10.jar.sha1 → lucene/licenses/junit-4.10.jar.sha1 b/...ne/test-framework/lib/junit-4.10.jar.sha1 → lucene/licenses/junit-4.10.jar.sha1
diff --git a/.../test-framework/lib/junit-LICENSE-CPL.txt → lucene/licenses/junit-LICENSE-CPL.txt b/.../test-framework/lib/junit-LICENSE-CPL.txt → lucene/licenses/junit-LICENSE-CPL.txt
diff --git a/lucene/test-framework/lib/junit-NOTICE.txt → lucene/licenses/junit-NOTICE.txt b/lucene/test-framework/lib/junit-NOTICE.txt → lucene/licenses/junit-NOTICE.txt
diff --git a/...t-framework/lib/junit4-ant-1.6.0.jar.sha1 → lucene/licenses/junit4-ant-1.6.0.jar.sha1 b/...t-framework/lib/junit4-ant-1.6.0.jar.sha1 → lucene/licenses/junit4-ant-1.6.0.jar.sha1
diff --git a/...-framework/lib/junit4-ant-LICENSE-ASL.txt → lucene/licenses/junit4-ant-LICENSE-ASL.txt b/...-framework/lib/junit4-ant-LICENSE-ASL.txt → lucene/licenses/junit4-ant-LICENSE-ASL.txt
diff --git a/.../test-framework/lib/junit4-ant-NOTICE.txt → lucene/licenses/junit4-ant-NOTICE.txt b/.../test-framework/lib/junit4-ant-NOTICE.txt → lucene/licenses/junit4-ant-NOTICE.txt
diff --git a/...fologik/lib/morfologik-fsa-1.5.3.jar.sha1 → ...ne/licenses/morfologik-fsa-1.5.3.jar.sha1 b/...fologik/lib/morfologik-fsa-1.5.3.jar.sha1 → ...ne/licenses/morfologik-fsa-1.5.3.jar.sha1
diff --git a/...ologik/lib/morfologik-fsa-LICENSE-BSD.txt → ...e/licenses/morfologik-fsa-LICENSE-BSD.txt b/...ologik/lib/morfologik-fsa-LICENSE-BSD.txt → ...e/licenses/morfologik-fsa-LICENSE-BSD.txt
diff --git a/.../morfologik/lib/morfologik-fsa-NOTICE.txt → lucene/licenses/morfologik-fsa-NOTICE.txt b/.../morfologik/lib/morfologik-fsa-NOTICE.txt → lucene/licenses/morfologik-fsa-NOTICE.txt
diff --git a/...ogik/lib/morfologik-polish-1.5.3.jar.sha1 → ...licenses/morfologik-polish-1.5.3.jar.sha1 b/...ogik/lib/morfologik-polish-1.5.3.jar.sha1 → ...licenses/morfologik-polish-1.5.3.jar.sha1
diff --git a/...gik/lib/morfologik-polish-LICENSE-BSD.txt → ...icenses/morfologik-polish-LICENSE-BSD.txt b/...gik/lib/morfologik-polish-LICENSE-BSD.txt → ...icenses/morfologik-polish-LICENSE-BSD.txt
diff --git a/...rfologik/lib/morfologik-polish-NOTICE.txt → lucene/licenses/morfologik-polish-NOTICE.txt b/...rfologik/lib/morfologik-polish-NOTICE.txt → lucene/licenses/morfologik-polish-NOTICE.txt
diff --git a/...ik/lib/morfologik-stemming-1.5.3.jar.sha1 → ...censes/morfologik-stemming-1.5.3.jar.sha1 b/...ik/lib/morfologik-stemming-1.5.3.jar.sha1 → ...censes/morfologik-stemming-1.5.3.jar.sha1
diff --git a/...k/lib/morfologik-stemming-LICENSE-BSD.txt → ...enses/morfologik-stemming-LICENSE-BSD.txt b/...k/lib/morfologik-stemming-LICENSE-BSD.txt → ...enses/morfologik-stemming-LICENSE-BSD.txt
diff --git a/...ologik/lib/morfologik-stemming-NOTICE.txt → ...e/licenses/morfologik-stemming-NOTICE.txt b/...ologik/lib/morfologik-stemming-NOTICE.txt → ...e/licenses/morfologik-stemming-NOTICE.txt
diff --git a/...ne/benchmark/lib/nekohtml-1.9.15.jar.sha1 → lucene/licenses/nekohtml-1.9.15.jar.sha1 b/...ne/benchmark/lib/nekohtml-1.9.15.jar.sha1 → lucene/licenses/nekohtml-1.9.15.jar.sha1
diff --git a/...ne/benchmark/lib/nekohtml-LICENSE-ASL.txt → lucene/licenses/nekohtml-LICENSE-ASL.txt b/...ne/benchmark/lib/nekohtml-LICENSE-ASL.txt → lucene/licenses/nekohtml-LICENSE-ASL.txt
diff --git a/lucene/benchmark/lib/nekohtml-NOTICE.txt → lucene/licenses/nekohtml-NOTICE.txt b/lucene/benchmark/lib/nekohtml-NOTICE.txt → lucene/licenses/nekohtml-NOTICE.txt
diff --git a/...b/randomizedtesting-runner-1.6.0.jar.sha1 → ...s/randomizedtesting-runner-1.6.0.jar.sha1 b/...b/randomizedtesting-runner-1.6.0.jar.sha1 → ...s/randomizedtesting-runner-1.6.0.jar.sha1
diff --git a/.../randomizedtesting-runner-LICENSE-ASL.txt → .../randomizedtesting-runner-LICENSE-ASL.txt b/.../randomizedtesting-runner-LICENSE-ASL.txt → .../randomizedtesting-runner-LICENSE-ASL.txt
diff --git a/...k/lib/randomizedtesting-runner-NOTICE.txt → ...enses/randomizedtesting-runner-NOTICE.txt b/...k/lib/randomizedtesting-runner-NOTICE.txt → ...enses/randomizedtesting-runner-NOTICE.txt
diff --git a/lucene/demo/lib/servlet-api-2.4.jar.sha1 → lucene/licenses/servlet-api-2.4.jar.sha1 b/lucene/demo/lib/servlet-api-2.4.jar.sha1 → lucene/licenses/servlet-api-2.4.jar.sha1
diff --git a/lucene/demo/lib/servlet-api-LICENSE-ASL.txt → lucene/licenses/servlet-api-LICENSE-ASL.txt b/lucene/demo/lib/servlet-api-LICENSE-ASL.txt → lucene/licenses/servlet-api-LICENSE-ASL.txt
diff --git a/lucene/demo/lib/servlet-api-NOTICE.txt → lucene/licenses/servlet-api-NOTICE.txt b/lucene/demo/lib/servlet-api-NOTICE.txt → lucene/licenses/servlet-api-NOTICE.txt
diff --git a/lucene/spatial/lib/spatial4j-0.2.jar.sha1 → lucene/licenses/spatial4j-0.2.jar.sha1 b/lucene/spatial/lib/spatial4j-0.2.jar.sha1 → lucene/licenses/spatial4j-0.2.jar.sha1
diff --git a/lucene/spatial/lib/spatial4j-LICENSE-ASL.txt → lucene/licenses/spatial4j-LICENSE-ASL.txt b/lucene/spatial/lib/spatial4j-LICENSE-ASL.txt → lucene/licenses/spatial4j-LICENSE-ASL.txt
diff --git a/lucene/spatial/lib/spatial4j-NOTICE.txt → lucene/licenses/spatial4j-NOTICE.txt b/lucene/spatial/lib/spatial4j-NOTICE.txt → lucene/licenses/spatial4j-NOTICE.txt
diff --git a/...alysis/uima/lib/uimaj-core-2.3.1.jar.sha1 → lucene/licenses/uimaj-core-2.3.1.jar.sha1 b/...alysis/uima/lib/uimaj-core-2.3.1.jar.sha1 → lucene/licenses/uimaj-core-2.3.1.jar.sha1
diff --git a/...lysis/uima/lib/uimaj-core-LICENSE-ASL.txt → lucene/licenses/uimaj-core-LICENSE-ASL.txt b/...lysis/uima/lib/uimaj-core-LICENSE-ASL.txt → lucene/licenses/uimaj-core-LICENSE-ASL.txt
diff --git a/...e/analysis/uima/lib/uimaj-core-NOTICE.txt → lucene/licenses/uimaj-core-NOTICE.txt b/...e/analysis/uima/lib/uimaj-core-NOTICE.txt → lucene/licenses/uimaj-core-NOTICE.txt
diff --git a/...e/benchmark/lib/xercesImpl-2.9.1.jar.sha1 → lucene/licenses/xercesImpl-2.9.1.jar.sha1 b/...e/benchmark/lib/xercesImpl-2.9.1.jar.sha1 → lucene/licenses/xercesImpl-2.9.1.jar.sha1
diff --git a/.../benchmark/lib/xercesImpl-LICENSE-ASL.txt → lucene/licenses/xercesImpl-LICENSE-ASL.txt b/.../benchmark/lib/xercesImpl-LICENSE-ASL.txt → lucene/licenses/xercesImpl-LICENSE-ASL.txt
diff --git a/lucene/benchmark/lib/xercesImpl-NOTICE.txt → lucene/licenses/xercesImpl-NOTICE.txt b/lucene/benchmark/lib/xercesImpl-NOTICE.txt → lucene/licenses/xercesImpl-NOTICE.txt
diff --git a/lucene/tools/custom-tasks.xml b/lucene/tools/custom-tasks.xml
@@ -18,12 +18,13 @@
 
   <macrodef name="license-check-macro">
     <attribute name="dir" />
+    <attribute name="licensedir" />
     <element name="additional-excludes" optional="true" />
     <element name="additional-filters"  optional="true" />
     <sequential>
       <!-- LICENSE and NOTICE verification macro. -->
       <echo>License check under: @{dir}</echo>
-      <licenses>
+      <licenses licenseDirectory="@{licensedir}">
         <fileset dir="@{dir}">
           <include name="**/*.jar" />
           <!-- Speed up scanning a bit. -->

diff --git a/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java b/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
@@ -58,6 +58,11 @@ public class LicenseCheckTask extends Task {
    * All JAR files to check.
    */
   private Resources jarResources = new Resources();
+
+  /**
+   * Directory containing licenses
+   */
+  private File licenseDirectory;
 
   /**
    * License file mapper.
@@ -94,6 +99,10 @@ public void addConfiguredLicenseMapper(Mapper mapper) {
   public void setVerbose(boolean verbose) {
     verboseLevel = (verbose ? Project.MSG_INFO : Project.MSG_VERBOSE);
   }
+
+  public void setLicenseDirectory(File file) {
+    licenseDirectory = file;
+  }
 
   /**
    * Execute the task.
@@ -153,7 +162,7 @@ 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(), 
+    final File checksumFile = new File(licenseDirectory, 
                                        jarFile.getName() + "." + CHECKSUM_TYPE);
     if (! (checksumFile.exists() && checksumFile.canRead()) ) {
       log("MISSING " +CHECKSUM_TYPE+ " checksum file for: " + jarFile.getPath(), Project.MSG_ERR);
@@ -200,9 +209,9 @@ private boolean checkJarFile(File jarFile) {
     Map<File, LicenseType> foundLicenses = new LinkedHashMap<File, LicenseType>();
     List<File> expectedLocations = new ArrayList<File>();
 outer:
-    for (String mappedPath : licenseMapper.mapFileName(jarFile.getPath())) {
+    for (String mappedPath : licenseMapper.mapFileName(jarFile.getName())) {
       for (LicenseType licenseType : LicenseType.values()) {
-        File licensePath = new File(mappedPath + licenseType.licenseFileSuffix());
+        File licensePath = new File(licenseDirectory, mappedPath + licenseType.licenseFileSuffix());
         if (licensePath.exists()) {
           foundLicenses.put(licensePath, licenseType);
           log(" FOUND " + licenseType.name() + " license at " + licensePath.getPath(), 
@@ -218,10 +227,10 @@ private boolean checkJarFile(File jarFile) {
     // Check for NOTICE files.
     for (Map.Entry<File, LicenseType> e : foundLicenses.entrySet()) {
       LicenseType license = e.getValue();
-      String licensePath = e.getKey().getAbsolutePath();
+      String licensePath = e.getKey().getName();
       String baseName = licensePath.substring(
           0, licensePath.length() - license.licenseFileSuffix().length());
-      File noticeFile = new File(baseName + license.noticeFileSuffix());
+      File noticeFile = new File(licenseDirectory, baseName + license.noticeFileSuffix());
 
       if (noticeFile.exists()) {
         log(" FOUND NOTICE file at " + noticeFile.getAbsolutePath(), verboseLevel);

diff --git a/solr/build.xml b/solr/build.xml
@@ -174,18 +174,18 @@
   <target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
 
   <target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
-    <license-check-macro dir="${basedir}">
+    <license-check-macro dir="${basedir}" licensedir="${common-solr.dir}/licenses">
       <additional-excludes>
         <!-- Exclude start.jar only (it'd be weird to have a license file there?) -->
         <exclude name="example/start.jar" />
         <exclude name="example/exampledocs/post.jar" />
         <exclude name="example/solr-webapp/**" />
       </additional-excludes>
       <additional-filters>
-        <replaceregex pattern="/jetty([^/]+)$" replace="/jetty" flags="gi" />
-        <replaceregex pattern="/apache-solr-commons-csv-([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
-        <replaceregex pattern="/slf4j-([^/]+)$" replace="/slf4j" flags="gi" />
-        <replaceregex pattern="/(bcmail|bcprov)-([^/]+)$" replace="/\1" flags="gi" />
+        <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
+        <replaceregex pattern="apache-solr-commons-csv-([^/]+)$" replace="apache-solr-commons-csv" flags="gi" />
+        <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
+        <replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
       </additional-filters>
     </license-check-macro>
   </target>

diff --git a/solr/contrib/extraction/lib/icu4j-49.1.jar.sha1 b/solr/contrib/extraction/lib/icu4j-49.1.jar.sha1
diff --git a/solr/contrib/extraction/lib/icu4j-LICENSE-BSD_LIKE.txt b/solr/contrib/extraction/lib/icu4j-LICENSE-BSD_LIKE.txt
diff --git a/solr/contrib/extraction/lib/icu4j-NOTICE.txt b/solr/contrib/extraction/lib/icu4j-NOTICE.txt
diff --git a/solr/core/build.xml b/solr/core/build.xml
@@ -21,6 +21,8 @@
   <!-- hackidty-hack-hack -->
 
   <property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
+  <!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
+  <property name="ivy.sync" value="false"/>
 
   <!-- html file for testing -->
   <property name="rat.excludes" value="**/htmlStripReaderTest.html"/>

diff --git a/...ma/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1 → ...censes/AlchemyAPIAnnotator-2.3.1.jar.sha1 b/...ma/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1 → ...censes/AlchemyAPIAnnotator-2.3.1.jar.sha1
diff --git a/...a/lib/AlchemyAPIAnnotator-LICENSE-ASL.txt → ...enses/AlchemyAPIAnnotator-LICENSE-ASL.txt b/...a/lib/AlchemyAPIAnnotator-LICENSE-ASL.txt → ...enses/AlchemyAPIAnnotator-LICENSE-ASL.txt
diff --git a/...b/uima/lib/AlchemyAPIAnnotator-NOTICE.txt → solr/licenses/AlchemyAPIAnnotator-NOTICE.txt b/...b/uima/lib/AlchemyAPIAnnotator-NOTICE.txt → solr/licenses/AlchemyAPIAnnotator-NOTICE.txt
diff --git a/...ma/lib/OpenCalaisAnnotator-2.3.1.jar.sha1 → ...censes/OpenCalaisAnnotator-2.3.1.jar.sha1 b/...ma/lib/OpenCalaisAnnotator-2.3.1.jar.sha1 → ...censes/OpenCalaisAnnotator-2.3.1.jar.sha1
diff --git a/...a/lib/OpenCalaisAnnotator-LICENSE-ASL.txt → ...enses/OpenCalaisAnnotator-LICENSE-ASL.txt b/...a/lib/OpenCalaisAnnotator-LICENSE-ASL.txt → ...enses/OpenCalaisAnnotator-LICENSE-ASL.txt
diff --git a/...b/uima/lib/OpenCalaisAnnotator-NOTICE.txt → solr/licenses/OpenCalaisAnnotator-NOTICE.txt b/...b/uima/lib/OpenCalaisAnnotator-NOTICE.txt → solr/licenses/OpenCalaisAnnotator-NOTICE.txt
diff --git a/solr/lib/README.committers.txt → solr/licenses/README.committers.txt b/solr/lib/README.committers.txt → solr/licenses/README.committers.txt
diff --git a/solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1 → solr/licenses/Tagger-2.3.1.jar.sha1 b/solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1 → solr/licenses/Tagger-2.3.1.jar.sha1
diff --git a/solr/contrib/uima/lib/Tagger-LICENSE-ASL.txt → solr/licenses/Tagger-LICENSE-ASL.txt b/solr/contrib/uima/lib/Tagger-LICENSE-ASL.txt → solr/licenses/Tagger-LICENSE-ASL.txt
diff --git a/solr/contrib/uima/lib/Tagger-NOTICE.txt → solr/licenses/Tagger-NOTICE.txt b/solr/contrib/uima/lib/Tagger-NOTICE.txt → solr/licenses/Tagger-NOTICE.txt
diff --git a/...ma/lib/WhitespaceTokenizer-2.3.1.jar.sha1 → ...censes/WhitespaceTokenizer-2.3.1.jar.sha1 b/...ma/lib/WhitespaceTokenizer-2.3.1.jar.sha1 → ...censes/WhitespaceTokenizer-2.3.1.jar.sha1
diff --git a/...a/lib/WhitespaceTokenizer-LICENSE-ASL.txt → ...enses/WhitespaceTokenizer-LICENSE-ASL.txt b/...a/lib/WhitespaceTokenizer-LICENSE-ASL.txt → ...enses/WhitespaceTokenizer-LICENSE-ASL.txt
diff --git a/...b/uima/lib/WhitespaceTokenizer-NOTICE.txt → solr/licenses/WhitespaceTokenizer-NOTICE.txt b/...b/uima/lib/WhitespaceTokenizer-NOTICE.txt → solr/licenses/WhitespaceTokenizer-NOTICE.txt
diff --git a/...importhandler/lib/activation-1.1.jar.sha1 → solr/licenses/activation-1.1.jar.sha1 b/...importhandler/lib/activation-1.1.jar.sha1 → solr/licenses/activation-1.1.jar.sha1
diff --git a/...rthandler/lib/activation-LICENSE-CDDL.txt → solr/licenses/activation-LICENSE-CDDL.txt b/...rthandler/lib/activation-LICENSE-CDDL.txt → solr/licenses/activation-LICENSE-CDDL.txt
diff --git a/...ction/lib/apache-mime4j-core-0.7.jar.sha1 → .../licenses/apache-mime4j-core-0.7.jar.sha1 b/...ction/lib/apache-mime4j-core-0.7.jar.sha1 → .../licenses/apache-mime4j-core-0.7.jar.sha1
diff --git a/...on/lib/apache-mime4j-core-LICENSE-ASL.txt → ...censes/apache-mime4j-core-LICENSE-ASL.txt b/...on/lib/apache-mime4j-core-LICENSE-ASL.txt → ...censes/apache-mime4j-core-LICENSE-ASL.txt
diff --git a/...raction/lib/apache-mime4j-core-NOTICE.txt → solr/licenses/apache-mime4j-core-NOTICE.txt b/...raction/lib/apache-mime4j-core-NOTICE.txt → solr/licenses/apache-mime4j-core-NOTICE.txt
diff --git a/...action/lib/apache-mime4j-dom-0.7.jar.sha1 → solr/licenses/apache-mime4j-dom-0.7.jar.sha1 b/...action/lib/apache-mime4j-dom-0.7.jar.sha1 → solr/licenses/apache-mime4j-dom-0.7.jar.sha1
diff --git a/...ion/lib/apache-mime4j-dom-LICENSE-ASL.txt → ...icenses/apache-mime4j-dom-LICENSE-ASL.txt b/...ion/lib/apache-mime4j-dom-LICENSE-ASL.txt → ...icenses/apache-mime4j-dom-LICENSE-ASL.txt
diff --git a/...traction/lib/apache-mime4j-dom-NOTICE.txt → solr/licenses/apache-mime4j-dom-NOTICE.txt b/...traction/lib/apache-mime4j-dom-NOTICE.txt → solr/licenses/apache-mime4j-dom-NOTICE.txt
diff --git a/...xtraction/lib/bcmail-LICENSE-BSD_LIKE.txt → solr/licenses/bcmail-LICENSE-BSD_LIKE.txt b/...xtraction/lib/bcmail-LICENSE-BSD_LIKE.txt → solr/licenses/bcmail-LICENSE-BSD_LIKE.txt
diff --git a/.../contrib/extraction/lib/bcmail-NOTICE.txt → solr/licenses/bcmail-NOTICE.txt b/.../contrib/extraction/lib/bcmail-NOTICE.txt → solr/licenses/bcmail-NOTICE.txt
diff --git a/...extraction/lib/bcmail-jdk15-1.45.jar.sha1 → solr/licenses/bcmail-jdk15-1.45.jar.sha1 b/...extraction/lib/bcmail-jdk15-1.45.jar.sha1 → solr/licenses/bcmail-jdk15-1.45.jar.sha1
diff --git a/...xtraction/lib/bcprov-LICENSE-BSD_LIKE.txt → solr/licenses/bcprov-LICENSE-BSD_LIKE.txt b/...xtraction/lib/bcprov-LICENSE-BSD_LIKE.txt → solr/licenses/bcprov-LICENSE-BSD_LIKE.txt
diff --git a/.../contrib/extraction/lib/bcprov-NOTICE.txt → solr/licenses/bcprov-NOTICE.txt b/.../contrib/extraction/lib/bcprov-NOTICE.txt → solr/licenses/bcprov-NOTICE.txt
diff --git a/...extraction/lib/bcprov-jdk15-1.45.jar.sha1 → solr/licenses/bcprov-jdk15-1.45.jar.sha1 b/...extraction/lib/bcprov-jdk15-1.45.jar.sha1 → solr/licenses/bcprov-jdk15-1.45.jar.sha1
diff --git a/.../extraction/lib/boilerpipe-1.1.0.jar.sha1 → solr/licenses/boilerpipe-1.1.0.jar.sha1 b/.../extraction/lib/boilerpipe-1.1.0.jar.sha1 → solr/licenses/boilerpipe-1.1.0.jar.sha1
diff --git a/...extraction/lib/boilerpipe-LICENSE-ASL.txt → solr/licenses/boilerpipe-LICENSE-ASL.txt b/...extraction/lib/boilerpipe-LICENSE-ASL.txt → solr/licenses/boilerpipe-LICENSE-ASL.txt
diff --git a/...trib/extraction/lib/boilerpipe-NOTICE.txt → solr/licenses/boilerpipe-NOTICE.txt b/...trib/extraction/lib/boilerpipe-NOTICE.txt → solr/licenses/boilerpipe-NOTICE.txt
diff --git a/...lustering/lib/carrot2-core-3.5.0.jar.sha1 → solr/licenses/carrot2-core-3.5.0.jar.sha1 b/...lustering/lib/carrot2-core-3.5.0.jar.sha1 → solr/licenses/carrot2-core-3.5.0.jar.sha1
diff --git a/...ing/lib/carrot2-core-LICENSE-BSD_LIKE.txt → ...icenses/carrot2-core-LICENSE-BSD_LIKE.txt b/...ing/lib/carrot2-core-LICENSE-BSD_LIKE.txt → ...icenses/carrot2-core-LICENSE-BSD_LIKE.txt
diff --git a/...ib/clustering/lib/carrot2-core-NOTICE.txt → solr/licenses/carrot2-core-NOTICE.txt b/...ib/clustering/lib/carrot2-core-NOTICE.txt → solr/licenses/carrot2-core-NOTICE.txt
diff --git a/...city/lib/commons-beanutils-1.7.0.jar.sha1 → ...licenses/commons-beanutils-1.7.0.jar.sha1 b/...city/lib/commons-beanutils-1.7.0.jar.sha1 → ...licenses/commons-beanutils-1.7.0.jar.sha1
diff --git a/...ity/lib/commons-beanutils-LICENSE-ASL.txt → ...icenses/commons-beanutils-LICENSE-ASL.txt b/...ity/lib/commons-beanutils-LICENSE-ASL.txt → ...icenses/commons-beanutils-LICENSE-ASL.txt
diff --git a/...velocity/lib/commons-beanutils-NOTICE.txt → solr/licenses/commons-beanutils-NOTICE.txt b/...velocity/lib/commons-beanutils-NOTICE.txt → solr/licenses/commons-beanutils-NOTICE.txt
diff --git a/solr/lib/commons-cli-1.2.jar.sha1 → solr/licenses/commons-cli-1.2.jar.sha1 b/solr/lib/commons-cli-1.2.jar.sha1 → solr/licenses/commons-cli-1.2.jar.sha1
diff --git a/solr/lib/commons-cli-LICENSE-ASL.txt → solr/licenses/commons-cli-LICENSE-ASL.txt b/solr/lib/commons-cli-LICENSE-ASL.txt → solr/licenses/commons-cli-LICENSE-ASL.txt
diff --git a/solr/lib/commons-cli-NOTICE.txt → solr/licenses/commons-cli-NOTICE.txt b/solr/lib/commons-cli-NOTICE.txt → solr/licenses/commons-cli-NOTICE.txt
diff --git a/solr/lib/commons-codec-1.6.jar.sha1 → solr/licenses/commons-codec-1.6.jar.sha1 b/solr/lib/commons-codec-1.6.jar.sha1 → solr/licenses/commons-codec-1.6.jar.sha1
diff --git a/solr/lib/commons-codec-LICENSE-ASL.txt → solr/licenses/commons-codec-LICENSE-ASL.txt b/solr/lib/commons-codec-LICENSE-ASL.txt → solr/licenses/commons-codec-LICENSE-ASL.txt
diff --git a/solr/lib/commons-codec-NOTICE.txt → solr/licenses/commons-codec-NOTICE.txt b/solr/lib/commons-codec-NOTICE.txt → solr/licenses/commons-codec-NOTICE.txt
diff --git a/...ty/lib/commons-collections-3.2.1.jar.sha1 → ...censes/commons-collections-3.2.1.jar.sha1 b/...ty/lib/commons-collections-3.2.1.jar.sha1 → ...censes/commons-collections-3.2.1.jar.sha1
diff --git a/...y/lib/commons-collections-LICENSE-ASL.txt → ...enses/commons-collections-LICENSE-ASL.txt b/...y/lib/commons-collections-LICENSE-ASL.txt → ...enses/commons-collections-LICENSE-ASL.txt
diff --git a/...locity/lib/commons-collections-NOTICE.txt → solr/licenses/commons-collections-NOTICE.txt b/...locity/lib/commons-collections-NOTICE.txt → solr/licenses/commons-collections-NOTICE.txt
diff --git a/...raction/lib/commons-compress-1.3.jar.sha1 → solr/licenses/commons-compress-1.3.jar.sha1 b/...raction/lib/commons-compress-1.3.jar.sha1 → solr/licenses/commons-compress-1.3.jar.sha1
diff --git a/...tion/lib/commons-compress-LICENSE-ASL.txt → ...licenses/commons-compress-LICENSE-ASL.txt b/...tion/lib/commons-compress-LICENSE-ASL.txt → ...licenses/commons-compress-LICENSE-ASL.txt
diff --git a/...xtraction/lib/commons-compress-NOTICE.txt → solr/licenses/commons-compress-NOTICE.txt b/...xtraction/lib/commons-compress-NOTICE.txt → solr/licenses/commons-compress-NOTICE.txt
diff --git a/...ib/uima/lib/commons-digester-2.0.jar.sha1 → solr/licenses/commons-digester-2.0.jar.sha1 b/...ib/uima/lib/commons-digester-2.0.jar.sha1 → solr/licenses/commons-digester-2.0.jar.sha1
diff --git a/...uima/lib/commons-digester-LICENSE-ASL.txt → ...licenses/commons-digester-LICENSE-ASL.txt b/...uima/lib/commons-digester-LICENSE-ASL.txt → ...licenses/commons-digester-LICENSE-ASL.txt
diff --git a/...trib/uima/lib/commons-digester-NOTICE.txt → solr/licenses/commons-digester-NOTICE.txt b/...trib/uima/lib/commons-digester-NOTICE.txt → solr/licenses/commons-digester-NOTICE.txt
diff --git a/solr/lib/commons-fileupload-1.2.1.jar.sha1 → ...icenses/commons-fileupload-1.2.1.jar.sha1 b/solr/lib/commons-fileupload-1.2.1.jar.sha1 → ...icenses/commons-fileupload-1.2.1.jar.sha1
diff --git a/solr/lib/commons-fileupload-LICENSE-ASL.txt → ...censes/commons-fileupload-LICENSE-ASL.txt b/solr/lib/commons-fileupload-LICENSE-ASL.txt → ...censes/commons-fileupload-LICENSE-ASL.txt
diff --git a/solr/lib/commons-fileupload-NOTICE.txt → solr/licenses/commons-fileupload-NOTICE.txt b/solr/lib/commons-fileupload-NOTICE.txt → solr/licenses/commons-fileupload-NOTICE.txt
diff --git a/solr/lib/commons-io-2.1.jar.sha1 → solr/licenses/commons-io-2.1.jar.sha1 b/solr/lib/commons-io-2.1.jar.sha1 → solr/licenses/commons-io-2.1.jar.sha1
diff --git a/solr/lib/commons-io-LICENSE-ASL.txt → solr/licenses/commons-io-LICENSE-ASL.txt b/solr/lib/commons-io-LICENSE-ASL.txt → solr/licenses/commons-io-LICENSE-ASL.txt
diff --git a/solr/lib/commons-io-NOTICE.txt → solr/licenses/commons-io-NOTICE.txt b/solr/lib/commons-io-NOTICE.txt → solr/licenses/commons-io-NOTICE.txt
diff --git a/solr/lib/commons-lang-2.6.jar.sha1 → solr/licenses/commons-lang-2.6.jar.sha1 b/solr/lib/commons-lang-2.6.jar.sha1 → solr/licenses/commons-lang-2.6.jar.sha1
diff --git a/solr/lib/commons-lang-LICENSE-ASL.txt → solr/licenses/commons-lang-LICENSE-ASL.txt b/solr/lib/commons-lang-LICENSE-ASL.txt → solr/licenses/commons-lang-LICENSE-ASL.txt
diff --git a/solr/lib/commons-lang-NOTICE.txt → solr/licenses/commons-lang-NOTICE.txt b/solr/lib/commons-lang-NOTICE.txt → solr/licenses/commons-lang-NOTICE.txt
diff --git a/...ntrib/extraction/lib/dom4j-1.6.1.jar.sha1 → solr/licenses/dom4j-1.6.1.jar.sha1 b/...ntrib/extraction/lib/dom4j-1.6.1.jar.sha1 → solr/licenses/dom4j-1.6.1.jar.sha1
diff --git a/...extraction/lib/dom4j-LICENSE-BSD_LIKE.txt → solr/licenses/dom4j-LICENSE-BSD_LIKE.txt b/...extraction/lib/dom4j-LICENSE-BSD_LIKE.txt → solr/licenses/dom4j-LICENSE-BSD_LIKE.txt
diff --git a/solr/contrib/extraction/lib/dom4j-NOTICE.txt → solr/licenses/dom4j-NOTICE.txt b/solr/contrib/extraction/lib/dom4j-NOTICE.txt → solr/licenses/dom4j-NOTICE.txt
diff --git a/solr/lib/easymock-2.2.jar.sha1 → solr/licenses/easymock-2.2.jar.sha1 b/solr/lib/easymock-2.2.jar.sha1 → solr/licenses/easymock-2.2.jar.sha1
diff --git a/solr/lib/easymock-LICENSE-MIT.txt → solr/licenses/easymock-LICENSE-MIT.txt b/solr/lib/easymock-LICENSE-MIT.txt → solr/licenses/easymock-LICENSE-MIT.txt
diff --git a/...rib/extraction/lib/fontbox-1.6.0.jar.sha1 → solr/licenses/fontbox-1.6.0.jar.sha1 b/...rib/extraction/lib/fontbox-1.6.0.jar.sha1 → solr/licenses/fontbox-1.6.0.jar.sha1
diff --git a/...ib/extraction/lib/fontbox-LICENSE-ASL.txt → solr/licenses/fontbox-LICENSE-ASL.txt b/...ib/extraction/lib/fontbox-LICENSE-ASL.txt → solr/licenses/fontbox-LICENSE-ASL.txt
diff --git a/...contrib/extraction/lib/fontbox-NOTICE.txt → solr/licenses/fontbox-NOTICE.txt b/...contrib/extraction/lib/fontbox-NOTICE.txt → solr/licenses/fontbox-NOTICE.txt
diff --git a/solr/lib/guava-LICENSE-ASL.txt → solr/licenses/guava-LICENSE-ASL.txt b/solr/lib/guava-LICENSE-ASL.txt → solr/licenses/guava-LICENSE-ASL.txt
diff --git a/solr/lib/guava-NOTICE.txt → solr/licenses/guava-NOTICE.txt b/solr/lib/guava-NOTICE.txt → solr/licenses/guava-NOTICE.txt
diff --git a/solr/lib/guava-r05.jar.sha1 → solr/licenses/guava-r05.jar.sha1 b/solr/lib/guava-r05.jar.sha1 → solr/licenses/guava-r05.jar.sha1
diff --git a/...ontrib/clustering/lib/hppc-0.3.3.jar.sha1 → solr/licenses/hppc-0.3.3.jar.sha1 b/...ontrib/clustering/lib/hppc-0.3.3.jar.sha1 → solr/licenses/hppc-0.3.3.jar.sha1
diff --git a/...ntrib/clustering/lib/hppc-LICENSE-ASL.txt → solr/licenses/hppc-LICENSE-ASL.txt b/...ntrib/clustering/lib/hppc-LICENSE-ASL.txt → solr/licenses/hppc-LICENSE-ASL.txt
diff --git a/solr/contrib/clustering/lib/hppc-NOTICE.txt → solr/licenses/hppc-NOTICE.txt b/solr/contrib/clustering/lib/hppc-NOTICE.txt → solr/licenses/hppc-NOTICE.txt
diff --git a/...-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 → solr/licenses/hsqldb-1.8.0.10.jar.sha1 b/...-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1 → solr/licenses/hsqldb-1.8.0.10.jar.sha1
diff --git a/...H/solr/db/lib/hsqldb-LICENSE-BSD_LIKE.txt → solr/licenses/hsqldb-LICENSE-BSD_LIKE.txt b/...H/solr/db/lib/hsqldb-LICENSE-BSD_LIKE.txt → solr/licenses/hsqldb-LICENSE-BSD_LIKE.txt
diff --git a/...example-DIH/solr/db/lib/hsqldb-NOTICE.txt → solr/licenses/hsqldb-NOTICE.txt b/...example-DIH/solr/db/lib/hsqldb-NOTICE.txt → solr/licenses/hsqldb-NOTICE.txt
diff --git a/solr/lib/httpclient-4.1.3.jar.sha1 → solr/licenses/httpclient-4.1.3.jar.sha1 b/solr/lib/httpclient-4.1.3.jar.sha1 → solr/licenses/httpclient-4.1.3.jar.sha1
diff --git a/solr/lib/httpclient-LICENSE-ASL.txt → solr/licenses/httpclient-LICENSE-ASL.txt b/solr/lib/httpclient-LICENSE-ASL.txt → solr/licenses/httpclient-LICENSE-ASL.txt
diff --git a/solr/lib/httpclient-NOTICE.txt → solr/licenses/httpclient-NOTICE.txt b/solr/lib/httpclient-NOTICE.txt → solr/licenses/httpclient-NOTICE.txt
diff --git a/solr/lib/httpcore-4.1.4.jar.sha1 → solr/licenses/httpcore-4.1.4.jar.sha1 b/solr/lib/httpcore-4.1.4.jar.sha1 → solr/licenses/httpcore-4.1.4.jar.sha1
diff --git a/solr/lib/httpcore-LICENSE-ASL.txt → solr/licenses/httpcore-LICENSE-ASL.txt b/solr/lib/httpcore-LICENSE-ASL.txt → solr/licenses/httpcore-LICENSE-ASL.txt
diff --git a/solr/lib/httpcore-NOTICE.txt → solr/licenses/httpcore-NOTICE.txt b/solr/lib/httpcore-NOTICE.txt → solr/licenses/httpcore-NOTICE.txt
diff --git a/solr/lib/httpmime-4.1.3.jar.sha1 → solr/licenses/httpmime-4.1.3.jar.sha1 b/solr/lib/httpmime-4.1.3.jar.sha1 → solr/licenses/httpmime-4.1.3.jar.sha1
diff --git a/solr/lib/httpmime-LICENSE-ASL.txt → solr/licenses/httpmime-LICENSE-ASL.txt b/solr/lib/httpmime-LICENSE-ASL.txt → solr/licenses/httpmime-LICENSE-ASL.txt
diff --git a/solr/lib/httpmime-NOTICE.txt → solr/licenses/httpmime-NOTICE.txt b/solr/lib/httpmime-NOTICE.txt → solr/licenses/httpmime-NOTICE.txt
diff --git a/...b/analysis-extras/lib/icu4j-49.1.jar.sha1 → solr/licenses/icu4j-49.1.jar.sha1 b/...b/analysis-extras/lib/icu4j-49.1.jar.sha1 → solr/licenses/icu4j-49.1.jar.sha1
diff --git a/...sis-extras/lib/icu4j-LICENSE-BSD_LIKE.txt → solr/licenses/icu4j-LICENSE-BSD_LIKE.txt b/...sis-extras/lib/icu4j-LICENSE-BSD_LIKE.txt → solr/licenses/icu4j-LICENSE-BSD_LIKE.txt
diff --git a/...trib/analysis-extras/lib/icu4j-NOTICE.txt → solr/licenses/icu4j-NOTICE.txt b/...trib/analysis-extras/lib/icu4j-NOTICE.txt → solr/licenses/icu4j-NOTICE.txt
diff --git a/...raction/lib/isoparser-1.0-beta-5.jar.sha1 → solr/licenses/isoparser-1.0-beta-5.jar.sha1 b/...raction/lib/isoparser-1.0-beta-5.jar.sha1 → solr/licenses/isoparser-1.0-beta-5.jar.sha1
diff --git a/.../extraction/lib/isoparser-LICENSE-ASL.txt → solr/licenses/isoparser-LICENSE-ASL.txt b/.../extraction/lib/isoparser-LICENSE-ASL.txt → solr/licenses/isoparser-LICENSE-ASL.txt
diff --git a/...ntrib/extraction/lib/isoparser-NOTICE.txt → solr/licenses/isoparser-NOTICE.txt b/...ntrib/extraction/lib/isoparser-NOTICE.txt → solr/licenses/isoparser-NOTICE.txt
diff --git a/...ering/lib/jackson-core-asl-1.7.4.jar.sha1 → .../licenses/jackson-core-asl-1.7.4.jar.sha1 b/...ering/lib/jackson-core-asl-1.7.4.jar.sha1 → .../licenses/jackson-core-asl-1.7.4.jar.sha1
diff --git a/...ring/lib/jackson-core-asl-LICENSE-ASL.txt → ...licenses/jackson-core-asl-LICENSE-ASL.txt b/...ring/lib/jackson-core-asl-LICENSE-ASL.txt → ...licenses/jackson-core-asl-LICENSE-ASL.txt
diff --git a/...lustering/lib/jackson-core-asl-NOTICE.txt → solr/licenses/jackson-core-asl-NOTICE.txt b/...lustering/lib/jackson-core-asl-NOTICE.txt → solr/licenses/jackson-core-asl-NOTICE.txt
diff --git a/...ing/lib/jackson-mapper-asl-1.7.4.jar.sha1 → ...icenses/jackson-mapper-asl-1.7.4.jar.sha1 b/...ing/lib/jackson-mapper-asl-1.7.4.jar.sha1 → ...icenses/jackson-mapper-asl-1.7.4.jar.sha1
diff --git a/...ng/lib/jackson-mapper-asl-LICENSE-ASL.txt → ...censes/jackson-mapper-asl-LICENSE-ASL.txt b/...ng/lib/jackson-mapper-asl-LICENSE-ASL.txt → ...censes/jackson-mapper-asl-LICENSE-ASL.txt
diff --git a/...stering/lib/jackson-mapper-asl-NOTICE.txt → solr/licenses/jackson-mapper-asl-NOTICE.txt b/...stering/lib/jackson-mapper-asl-NOTICE.txt → solr/licenses/jackson-mapper-asl-NOTICE.txt
diff --git a/...on/lib/javassist-3.6.0.GA-LICENSE-MPL.txt → ...censes/javassist-3.6.0.GA-LICENSE-MPL.txt b/...on/lib/javassist-3.6.0.GA-LICENSE-MPL.txt → ...censes/javassist-3.6.0.GA-LICENSE-MPL.txt
diff --git a/...raction/lib/javassist-3.6.0.GA-NOTICE.txt → solr/licenses/javassist-3.6.0.GA-NOTICE.txt b/...raction/lib/javassist-3.6.0.GA-NOTICE.txt → solr/licenses/javassist-3.6.0.GA-NOTICE.txt
diff --git a/...xtraction/lib/javassist-3.6.0.GA.jar.sha1 → solr/licenses/javassist-3.6.0.GA.jar.sha1 b/...xtraction/lib/javassist-3.6.0.GA.jar.sha1 → solr/licenses/javassist-3.6.0.GA.jar.sha1
diff --git a/solr/lib/javax.servlet-api-3.0.1.jar.sha1 → ...licenses/javax.servlet-api-3.0.1.jar.sha1 b/solr/lib/javax.servlet-api-3.0.1.jar.sha1 → ...licenses/javax.servlet-api-3.0.1.jar.sha1
diff --git a/solr/lib/javax.servlet-api-LICENSE-ASL.txt → ...icenses/javax.servlet-api-LICENSE-ASL.txt b/solr/lib/javax.servlet-api-LICENSE-ASL.txt → ...icenses/javax.servlet-api-LICENSE-ASL.txt
diff --git a/solr/lib/javax.servlet-api-NOTICE.txt → solr/licenses/javax.servlet-api-NOTICE.txt b/solr/lib/javax.servlet-api-NOTICE.txt → solr/licenses/javax.servlet-api-NOTICE.txt
diff --git a/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1 → solr/licenses/jcl-over-slf4j-1.6.4.jar.sha1 b/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1 → solr/licenses/jcl-over-slf4j-1.6.4.jar.sha1
diff --git a/solr/lib/jcl-over-slf4j-LICENSE-BSD_LIKE.txt → ...enses/jcl-over-slf4j-LICENSE-BSD_LIKE.txt b/solr/lib/jcl-over-slf4j-LICENSE-BSD_LIKE.txt → ...enses/jcl-over-slf4j-LICENSE-BSD_LIKE.txt
diff --git a/solr/lib/jcl-over-slf4j-NOTICE.txt → solr/licenses/jcl-over-slf4j-NOTICE.txt b/solr/lib/jcl-over-slf4j-NOTICE.txt → solr/licenses/jcl-over-slf4j-NOTICE.txt
diff --git a/.../contrib/extraction/lib/jdom-1.0.jar.sha1 → solr/licenses/jdom-1.0.jar.sha1 b/.../contrib/extraction/lib/jdom-1.0.jar.sha1 → solr/licenses/jdom-1.0.jar.sha1
diff --git a/.../extraction/lib/jdom-LICENSE-BSD_LIKE.txt → solr/licenses/jdom-LICENSE-BSD_LIKE.txt b/.../extraction/lib/jdom-LICENSE-BSD_LIKE.txt → solr/licenses/jdom-LICENSE-BSD_LIKE.txt
diff --git a/solr/contrib/extraction/lib/jdom-NOTICE.txt → solr/licenses/jdom-NOTICE.txt b/solr/contrib/extraction/lib/jdom-NOTICE.txt → solr/licenses/jdom-NOTICE.txt
diff --git a/...rib/extraction/lib/jempbox-1.6.0.jar.sha1 → solr/licenses/jempbox-1.6.0.jar.sha1 b/...rib/extraction/lib/jempbox-1.6.0.jar.sha1 → solr/licenses/jempbox-1.6.0.jar.sha1
diff --git a/...ib/extraction/lib/jempbox-LICENSE-ASL.txt → solr/licenses/jempbox-LICENSE-ASL.txt b/...ib/extraction/lib/jempbox-LICENSE-ASL.txt → solr/licenses/jempbox-LICENSE-ASL.txt
diff --git a/...contrib/extraction/lib/jempbox-NOTICE.txt → solr/licenses/jempbox-NOTICE.txt b/...contrib/extraction/lib/jempbox-NOTICE.txt → solr/licenses/jempbox-NOTICE.txt
diff --git a/solr/example/lib/jetty-LICENSE-ASL.txt → solr/licenses/jetty-LICENSE-ASL.txt b/solr/example/lib/jetty-LICENSE-ASL.txt → solr/licenses/jetty-LICENSE-ASL.txt
diff --git a/solr/example/lib/jetty-NOTICE.txt → solr/licenses/jetty-NOTICE.txt b/solr/example/lib/jetty-NOTICE.txt → solr/licenses/jetty-NOTICE.txt
diff --git a/...tty-continuation-8.1.2.v20120308.jar.sha1 → ...tty-continuation-8.1.2.v20120308.jar.sha1 b/...tty-continuation-8.1.2.v20120308.jar.sha1 → ...tty-continuation-8.1.2.v20120308.jar.sha1
diff --git a/...lib/jetty-deploy-8.1.2.v20120308.jar.sha1 → ...ses/jetty-deploy-8.1.2.v20120308.jar.sha1 b/...lib/jetty-deploy-8.1.2.v20120308.jar.sha1 → ...ses/jetty-deploy-8.1.2.v20120308.jar.sha1
diff --git a/...e/lib/jetty-http-8.1.2.v20120308.jar.sha1 → ...enses/jetty-http-8.1.2.v20120308.jar.sha1 b/...e/lib/jetty-http-8.1.2.v20120308.jar.sha1 → ...enses/jetty-http-8.1.2.v20120308.jar.sha1
diff --git a/...ple/lib/jetty-io-8.1.2.v20120308.jar.sha1 → ...icenses/jetty-io-8.1.2.v20120308.jar.sha1 b/...ple/lib/jetty-io-8.1.2.v20120308.jar.sha1 → ...icenses/jetty-io-8.1.2.v20120308.jar.sha1
diff --git a/...le/lib/jetty-jmx-8.1.2.v20120308.jar.sha1 → ...censes/jetty-jmx-8.1.2.v20120308.jar.sha1 b/...le/lib/jetty-jmx-8.1.2.v20120308.jar.sha1 → ...censes/jetty-jmx-8.1.2.v20120308.jar.sha1
diff --git a/...b/jetty-security-8.1.2.v20120308.jar.sha1 → ...s/jetty-security-8.1.2.v20120308.jar.sha1 b/...b/jetty-security-8.1.2.v20120308.jar.sha1 → ...s/jetty-security-8.1.2.v20120308.jar.sha1
diff --git a/...lib/jetty-server-8.1.2.v20120308.jar.sha1 → ...ses/jetty-server-8.1.2.v20120308.jar.sha1 b/...lib/jetty-server-8.1.2.v20120308.jar.sha1 → ...ses/jetty-server-8.1.2.v20120308.jar.sha1
diff --git a/...ib/jetty-servlet-8.1.2.v20120308.jar.sha1 → ...es/jetty-servlet-8.1.2.v20120308.jar.sha1 b/...ib/jetty-servlet-8.1.2.v20120308.jar.sha1 → ...es/jetty-servlet-8.1.2.v20120308.jar.sha1
diff --git a/...e/lib/jetty-util-8.1.2.v20120308.jar.sha1 → ...enses/jetty-util-8.1.2.v20120308.jar.sha1 b/...e/lib/jetty-util-8.1.2.v20120308.jar.sha1 → ...enses/jetty-util-8.1.2.v20120308.jar.sha1
diff --git a/...lib/jetty-webapp-8.1.2.v20120308.jar.sha1 → ...ses/jetty-webapp-8.1.2.v20120308.jar.sha1 b/...lib/jetty-webapp-8.1.2.v20120308.jar.sha1 → ...ses/jetty-webapp-8.1.2.v20120308.jar.sha1
diff --git a/...le/lib/jetty-xml-8.1.2.v20120308.jar.sha1 → ...censes/jetty-xml-8.1.2.v20120308.jar.sha1 b/...le/lib/jetty-xml-8.1.2.v20120308.jar.sha1 → ...censes/jetty-xml-8.1.2.v20120308.jar.sha1
diff --git a/.../contrib/langid/lib/jsonic-1.2.7.jar.sha1 → solr/licenses/jsonic-1.2.7.jar.sha1 b/.../contrib/langid/lib/jsonic-1.2.7.jar.sha1 → solr/licenses/jsonic-1.2.7.jar.sha1
diff --git a/...contrib/langid/lib/jsonic-LICENSE-ASL.txt → solr/licenses/jsonic-LICENSE-ASL.txt b/...contrib/langid/lib/jsonic-LICENSE-ASL.txt → solr/licenses/jsonic-LICENSE-ASL.txt
diff --git a/solr/contrib/langid/lib/jsonic-NOTICE.txt → solr/licenses/jsonic-NOTICE.txt b/solr/contrib/langid/lib/jsonic-NOTICE.txt → solr/licenses/jsonic-NOTICE.txt
diff --git a/...ngid/lib/langdetect-1.1-20120112.jar.sha1 → ...licenses/langdetect-1.1-20120112.jar.sha1 b/...ngid/lib/langdetect-1.1-20120112.jar.sha1 → ...licenses/langdetect-1.1-20120112.jar.sha1
diff --git a/...rib/langid/lib/langdetect-LICENSE-ASL.txt → solr/licenses/langdetect-LICENSE-ASL.txt b/...rib/langid/lib/langdetect-LICENSE-ASL.txt → solr/licenses/langdetect-LICENSE-ASL.txt
diff --git a/.../contrib/langid/lib/langdetect-NOTICE.txt → solr/licenses/langdetect-NOTICE.txt b/.../contrib/langid/lib/langdetect-NOTICE.txt → solr/licenses/langdetect-NOTICE.txt
diff --git a/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1 → .../licenses/log4j-over-slf4j-1.6.4.jar.sha1 b/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1 → .../licenses/log4j-over-slf4j-1.6.4.jar.sha1
diff --git a/...lib/log4j-over-slf4j-LICENSE-BSD_LIKE.txt → ...ses/log4j-over-slf4j-LICENSE-BSD_LIKE.txt b/...lib/log4j-over-slf4j-LICENSE-BSD_LIKE.txt → ...ses/log4j-over-slf4j-LICENSE-BSD_LIKE.txt
diff --git a/solr/lib/log4j-over-slf4j-NOTICE.txt → solr/licenses/log4j-over-slf4j-NOTICE.txt b/solr/lib/log4j-over-slf4j-NOTICE.txt → solr/licenses/log4j-over-slf4j-NOTICE.txt
diff --git a/...ering/lib/mahout-collections-0.3.jar.sha1 → .../licenses/mahout-collections-0.3.jar.sha1 b/...ering/lib/mahout-collections-0.3.jar.sha1 → .../licenses/mahout-collections-0.3.jar.sha1
diff --git a/...ng/lib/mahout-collections-LICENSE-ASL.txt → ...censes/mahout-collections-LICENSE-ASL.txt b/...ng/lib/mahout-collections-LICENSE-ASL.txt → ...censes/mahout-collections-LICENSE-ASL.txt
diff --git a/...stering/lib/mahout-collections-NOTICE.txt → solr/licenses/mahout-collections-NOTICE.txt b/...stering/lib/mahout-collections-NOTICE.txt → solr/licenses/mahout-collections-NOTICE.txt
diff --git a/...b/clustering/lib/mahout-math-0.3.jar.sha1 → solr/licenses/mahout-math-0.3.jar.sha1 b/...b/clustering/lib/mahout-math-0.3.jar.sha1 → solr/licenses/mahout-math-0.3.jar.sha1
diff --git a/...lustering/lib/mahout-math-LICENSE-ASL.txt → solr/licenses/mahout-math-LICENSE-ASL.txt b/...lustering/lib/mahout-math-LICENSE-ASL.txt → solr/licenses/mahout-math-LICENSE-ASL.txt
diff --git a/...rib/clustering/lib/mahout-math-NOTICE.txt → solr/licenses/mahout-math-NOTICE.txt b/...rib/clustering/lib/mahout-math-NOTICE.txt → solr/licenses/mahout-math-NOTICE.txt
diff --git a/...dataimporthandler/lib/mail-1.4.1.jar.sha1 → solr/licenses/mail-1.4.1.jar.sha1 b/...dataimporthandler/lib/mail-1.4.1.jar.sha1 → solr/licenses/mail-1.4.1.jar.sha1
diff --git a/...taimporthandler/lib/mail-LICENSE-CDDL.txt → solr/licenses/mail-LICENSE-CDDL.txt b/...taimporthandler/lib/mail-LICENSE-CDDL.txt → solr/licenses/mail-LICENSE-CDDL.txt
diff --git a/.../metadata-extractor-2.4.0-beta-1.jar.sha1 → .../metadata-extractor-2.4.0-beta-1.jar.sha1 b/.../metadata-extractor-2.4.0-beta-1.jar.sha1 → .../metadata-extractor-2.4.0-beta-1.jar.sha1
diff --git a/...ion/lib/metadata-extractor-LICENSE-PD.txt → ...icenses/metadata-extractor-LICENSE-PD.txt b/...ion/lib/metadata-extractor-LICENSE-PD.txt → ...icenses/metadata-extractor-LICENSE-PD.txt
diff --git a/...-extras/lib/morfologik-fsa-1.5.3.jar.sha1 → solr/licenses/morfologik-fsa-1.5.3.jar.sha1 b/...-extras/lib/morfologik-fsa-1.5.3.jar.sha1 → solr/licenses/morfologik-fsa-1.5.3.jar.sha1
diff --git a/...extras/lib/morfologik-fsa-LICENSE-BSD.txt → solr/licenses/morfologik-fsa-LICENSE-BSD.txt b/...extras/lib/morfologik-fsa-LICENSE-BSD.txt → solr/licenses/morfologik-fsa-LICENSE-BSD.txt
diff --git a/...ysis-extras/lib/morfologik-fsa-NOTICE.txt → solr/licenses/morfologik-fsa-NOTICE.txt b/...ysis-extras/lib/morfologik-fsa-NOTICE.txt → solr/licenses/morfologik-fsa-NOTICE.txt
diff --git a/...tras/lib/morfologik-polish-1.5.3.jar.sha1 → ...licenses/morfologik-polish-1.5.3.jar.sha1 b/...tras/lib/morfologik-polish-1.5.3.jar.sha1 → ...licenses/morfologik-polish-1.5.3.jar.sha1
diff --git a/...ras/lib/morfologik-polish-LICENSE-BSD.txt → ...icenses/morfologik-polish-LICENSE-BSD.txt b/...ras/lib/morfologik-polish-LICENSE-BSD.txt → ...icenses/morfologik-polish-LICENSE-BSD.txt
diff --git a/...s-extras/lib/morfologik-polish-NOTICE.txt → solr/licenses/morfologik-polish-NOTICE.txt b/...s-extras/lib/morfologik-polish-NOTICE.txt → solr/licenses/morfologik-polish-NOTICE.txt
diff --git a/...as/lib/morfologik-stemming-1.5.3.jar.sha1 → ...censes/morfologik-stemming-1.5.3.jar.sha1 b/...as/lib/morfologik-stemming-1.5.3.jar.sha1 → ...censes/morfologik-stemming-1.5.3.jar.sha1
diff --git a/...s/lib/morfologik-stemming-LICENSE-BSD.txt → ...enses/morfologik-stemming-LICENSE-BSD.txt b/...s/lib/morfologik-stemming-LICENSE-BSD.txt → ...enses/morfologik-stemming-LICENSE-BSD.txt
diff --git a/...extras/lib/morfologik-stemming-NOTICE.txt → solr/licenses/morfologik-stemming-NOTICE.txt b/...extras/lib/morfologik-stemming-NOTICE.txt → solr/licenses/morfologik-stemming-NOTICE.txt
diff --git a/...ib/extraction/lib/netcdf-4.2-min.jar.sha1 → solr/licenses/netcdf-4.2-min.jar.sha1 b/...ib/extraction/lib/netcdf-4.2-min.jar.sha1 → solr/licenses/netcdf-4.2-min.jar.sha1
diff --git a/...xtraction/lib/netcdf-LICENSE-BSD_LIKE.txt → solr/licenses/netcdf-LICENSE-BSD_LIKE.txt b/...xtraction/lib/netcdf-LICENSE-BSD_LIKE.txt → solr/licenses/netcdf-LICENSE-BSD_LIKE.txt
diff --git a/.../contrib/extraction/lib/netcdf-NOTICE.txt → solr/licenses/netcdf-NOTICE.txt b/.../contrib/extraction/lib/netcdf-NOTICE.txt → solr/licenses/netcdf-NOTICE.txt
diff --git a/...trib/extraction/lib/pdfbox-1.6.0.jar.sha1 → solr/licenses/pdfbox-1.6.0.jar.sha1 b/...trib/extraction/lib/pdfbox-1.6.0.jar.sha1 → solr/licenses/pdfbox-1.6.0.jar.sha1
diff --git a/...rib/extraction/lib/pdfbox-LICENSE-ASL.txt → solr/licenses/pdfbox-LICENSE-ASL.txt b/...rib/extraction/lib/pdfbox-LICENSE-ASL.txt → solr/licenses/pdfbox-LICENSE-ASL.txt
diff --git a/.../contrib/extraction/lib/pdfbox-NOTICE.txt → solr/licenses/pdfbox-NOTICE.txt b/.../contrib/extraction/lib/pdfbox-NOTICE.txt → solr/licenses/pdfbox-NOTICE.txt
diff --git a/...rib/extraction/lib/poi-3.8-beta5.jar.sha1 → solr/licenses/poi-3.8-beta5.jar.sha1 b/...rib/extraction/lib/poi-3.8-beta5.jar.sha1 → solr/licenses/poi-3.8-beta5.jar.sha1
diff --git a/...ontrib/extraction/lib/poi-LICENSE-ASL.txt → solr/licenses/poi-LICENSE-ASL.txt b/...ontrib/extraction/lib/poi-LICENSE-ASL.txt → solr/licenses/poi-LICENSE-ASL.txt
diff --git a/solr/contrib/extraction/lib/poi-NOTICE.txt → solr/licenses/poi-NOTICE.txt b/solr/contrib/extraction/lib/poi-NOTICE.txt → solr/licenses/poi-NOTICE.txt
diff --git a/...traction/lib/poi-ooxml-3.8-beta5.jar.sha1 → solr/licenses/poi-ooxml-3.8-beta5.jar.sha1 b/...traction/lib/poi-ooxml-3.8-beta5.jar.sha1 → solr/licenses/poi-ooxml-3.8-beta5.jar.sha1
diff --git a/.../extraction/lib/poi-ooxml-LICENSE-ASL.txt → solr/licenses/poi-ooxml-LICENSE-ASL.txt b/.../extraction/lib/poi-ooxml-LICENSE-ASL.txt → solr/licenses/poi-ooxml-LICENSE-ASL.txt
diff --git a/...ntrib/extraction/lib/poi-ooxml-NOTICE.txt → solr/licenses/poi-ooxml-NOTICE.txt b/...ntrib/extraction/lib/poi-ooxml-NOTICE.txt → solr/licenses/poi-ooxml-NOTICE.txt
diff --git a/.../lib/poi-ooxml-schemas-3.8-beta5.jar.sha1 → ...nses/poi-ooxml-schemas-3.8-beta5.jar.sha1 b/.../lib/poi-ooxml-schemas-3.8-beta5.jar.sha1 → ...nses/poi-ooxml-schemas-3.8-beta5.jar.sha1
diff --git a/...ion/lib/poi-ooxml-schemas-LICENSE-ASL.txt → ...icenses/poi-ooxml-schemas-LICENSE-ASL.txt b/...ion/lib/poi-ooxml-schemas-LICENSE-ASL.txt → ...icenses/poi-ooxml-schemas-LICENSE-ASL.txt
diff --git a/...traction/lib/poi-ooxml-schemas-NOTICE.txt → solr/licenses/poi-ooxml-schemas-NOTICE.txt b/...traction/lib/poi-ooxml-schemas-NOTICE.txt → solr/licenses/poi-ooxml-schemas-NOTICE.txt
diff --git a/...ion/lib/poi-scratchpad-3.8-beta5.jar.sha1 → ...icenses/poi-scratchpad-3.8-beta5.jar.sha1 b/...ion/lib/poi-scratchpad-3.8-beta5.jar.sha1 → ...icenses/poi-scratchpad-3.8-beta5.jar.sha1
diff --git a/...action/lib/poi-scratchpad-LICENSE-ASL.txt → solr/licenses/poi-scratchpad-LICENSE-ASL.txt b/...action/lib/poi-scratchpad-LICENSE-ASL.txt → solr/licenses/poi-scratchpad-LICENSE-ASL.txt
diff --git a/.../extraction/lib/poi-scratchpad-NOTICE.txt → solr/licenses/poi-scratchpad-NOTICE.txt b/.../extraction/lib/poi-scratchpad-NOTICE.txt → solr/licenses/poi-scratchpad-NOTICE.txt
diff --git a/.../contrib/extraction/lib/rome-0.9.jar.sha1 → solr/licenses/rome-0.9.jar.sha1 b/.../contrib/extraction/lib/rome-0.9.jar.sha1 → solr/licenses/rome-0.9.jar.sha1
diff --git a/...ntrib/extraction/lib/rome-LICENSE-ASL.txt → solr/licenses/rome-LICENSE-ASL.txt b/...ntrib/extraction/lib/rome-LICENSE-ASL.txt → solr/licenses/rome-LICENSE-ASL.txt
diff --git a/solr/contrib/extraction/lib/rome-NOTICE.txt → solr/licenses/rome-NOTICE.txt b/solr/contrib/extraction/lib/rome-NOTICE.txt → solr/licenses/rome-NOTICE.txt
diff --git a/...xtraction/lib/scannotation-1.0.2.jar.sha1 → solr/licenses/scannotation-1.0.2.jar.sha1 b/...xtraction/lib/scannotation-1.0.2.jar.sha1 → solr/licenses/scannotation-1.0.2.jar.sha1
diff --git a/...traction/lib/scannotation-LICENSE-ASL.txt → solr/licenses/scannotation-LICENSE-ASL.txt b/...traction/lib/scannotation-LICENSE-ASL.txt → solr/licenses/scannotation-LICENSE-ASL.txt
diff --git a/...ib/extraction/lib/scannotation-NOTICE.txt → solr/licenses/scannotation-NOTICE.txt b/...ib/extraction/lib/scannotation-NOTICE.txt → solr/licenses/scannotation-NOTICE.txt
diff --git a/solr/example/lib/servlet-api-3.0.jar.sha1 → solr/licenses/servlet-api-3.0.jar.sha1 b/solr/example/lib/servlet-api-3.0.jar.sha1 → solr/licenses/servlet-api-3.0.jar.sha1
diff --git a/.../example/lib/servlet-api-LICENSE-CDDL.txt → solr/licenses/servlet-api-LICENSE-CDDL.txt b/.../example/lib/servlet-api-LICENSE-CDDL.txt → solr/licenses/servlet-api-LICENSE-CDDL.txt
diff --git a/solr/example/lib/servlet-api-NOTICE.txt → solr/licenses/servlet-api-NOTICE.txt b/solr/example/lib/servlet-api-NOTICE.txt → solr/licenses/servlet-api-NOTICE.txt
diff --git a/.../clustering/lib/simple-xml-2.4.1.jar.sha1 → solr/licenses/simple-xml-2.4.1.jar.sha1 b/.../clustering/lib/simple-xml-2.4.1.jar.sha1 → solr/licenses/simple-xml-2.4.1.jar.sha1
diff --git a/...clustering/lib/simple-xml-LICENSE-ASL.txt → solr/licenses/simple-xml-LICENSE-ASL.txt b/...clustering/lib/simple-xml-LICENSE-ASL.txt → solr/licenses/simple-xml-LICENSE-ASL.txt
diff --git a/...trib/clustering/lib/simple-xml-NOTICE.txt → solr/licenses/simple-xml-NOTICE.txt b/...trib/clustering/lib/simple-xml-NOTICE.txt → solr/licenses/simple-xml-NOTICE.txt
diff --git a/solr/lib/slf4j-LICENSE-BSD_LIKE.txt → solr/licenses/slf4j-LICENSE-BSD_LIKE.txt b/solr/lib/slf4j-LICENSE-BSD_LIKE.txt → solr/licenses/slf4j-LICENSE-BSD_LIKE.txt
diff --git a/solr/lib/slf4j-NOTICE.txt → solr/licenses/slf4j-NOTICE.txt b/solr/lib/slf4j-NOTICE.txt → solr/licenses/slf4j-NOTICE.txt
diff --git a/solr/lib/slf4j-api-1.6.4.jar.sha1 → solr/licenses/slf4j-api-1.6.4.jar.sha1 b/solr/lib/slf4j-api-1.6.4.jar.sha1 → solr/licenses/slf4j-api-1.6.4.jar.sha1
diff --git a/solr/lib/slf4j-jdk14-1.6.4.jar.sha1 → solr/licenses/slf4j-jdk14-1.6.4.jar.sha1 b/solr/lib/slf4j-jdk14-1.6.4.jar.sha1 → solr/licenses/slf4j-jdk14-1.6.4.jar.sha1
diff --git a/solr/lib/spatial4j-0.2.jar.sha1 → solr/licenses/spatial4j-0.2.jar.sha1 b/solr/lib/spatial4j-0.2.jar.sha1 → solr/licenses/spatial4j-0.2.jar.sha1
diff --git a/solr/lib/spatial4j-LICENSE-ASL.txt → solr/licenses/spatial4j-LICENSE-ASL.txt b/solr/lib/spatial4j-LICENSE-ASL.txt → solr/licenses/spatial4j-LICENSE-ASL.txt
diff --git a/solr/lib/spatial4j-NOTICE.txt → solr/licenses/spatial4j-NOTICE.txt b/solr/lib/spatial4j-NOTICE.txt → solr/licenses/spatial4j-NOTICE.txt
diff --git a/solr/example/start.jar.sha1 → solr/licenses/start.jar.sha1 b/solr/example/start.jar.sha1 → solr/licenses/start.jar.sha1
diff --git a/...rib/extraction/lib/tagsoup-1.2.1.jar.sha1 → solr/licenses/tagsoup-1.2.1.jar.sha1 b/...rib/extraction/lib/tagsoup-1.2.1.jar.sha1 → solr/licenses/tagsoup-1.2.1.jar.sha1
diff --git a/...ib/extraction/lib/tagsoup-LICENSE-ASL.txt → solr/licenses/tagsoup-LICENSE-ASL.txt b/...ib/extraction/lib/tagsoup-LICENSE-ASL.txt → solr/licenses/tagsoup-LICENSE-ASL.txt
diff --git a/...contrib/extraction/lib/tagsoup-NOTICE.txt → solr/licenses/tagsoup-NOTICE.txt b/...contrib/extraction/lib/tagsoup-NOTICE.txt → solr/licenses/tagsoup-NOTICE.txt
diff --git a/...rib/extraction/lib/tika-core-1.1.jar.sha1 → solr/licenses/tika-core-1.1.jar.sha1 b/...rib/extraction/lib/tika-core-1.1.jar.sha1 → solr/licenses/tika-core-1.1.jar.sha1
diff --git a/.../extraction/lib/tika-core-LICENSE-ASL.txt → solr/licenses/tika-core-LICENSE-ASL.txt b/.../extraction/lib/tika-core-LICENSE-ASL.txt → solr/licenses/tika-core-LICENSE-ASL.txt
diff --git a/...ntrib/extraction/lib/tika-core-NOTICE.txt → solr/licenses/tika-core-NOTICE.txt b/...ntrib/extraction/lib/tika-core-NOTICE.txt → solr/licenses/tika-core-NOTICE.txt
diff --git a/.../extraction/lib/tika-parsers-1.1.jar.sha1 → solr/licenses/tika-parsers-1.1.jar.sha1 b/.../extraction/lib/tika-parsers-1.1.jar.sha1 → solr/licenses/tika-parsers-1.1.jar.sha1
diff --git a/...traction/lib/tika-parsers-LICENSE-ASL.txt → solr/licenses/tika-parsers-LICENSE-ASL.txt b/...traction/lib/tika-parsers-LICENSE-ASL.txt → solr/licenses/tika-parsers-LICENSE-ASL.txt
diff --git a/...ib/extraction/lib/tika-parsers-NOTICE.txt → solr/licenses/tika-parsers-NOTICE.txt b/...ib/extraction/lib/tika-parsers-NOTICE.txt → solr/licenses/tika-parsers-NOTICE.txt
diff --git a/...ontrib/uima/lib/uimaj-core-2.3.1.jar.sha1 → solr/licenses/uimaj-core-2.3.1.jar.sha1 b/...ontrib/uima/lib/uimaj-core-2.3.1.jar.sha1 → solr/licenses/uimaj-core-2.3.1.jar.sha1
diff --git a/...ntrib/uima/lib/uimaj-core-LICENSE-ASL.txt → solr/licenses/uimaj-core-LICENSE-ASL.txt b/...ntrib/uima/lib/uimaj-core-LICENSE-ASL.txt → solr/licenses/uimaj-core-LICENSE-ASL.txt
diff --git a/solr/contrib/uima/lib/uimaj-core-NOTICE.txt → solr/licenses/uimaj-core-NOTICE.txt b/solr/contrib/uima/lib/uimaj-core-NOTICE.txt → solr/licenses/uimaj-core-NOTICE.txt
diff --git a/...trib/velocity/lib/velocity-1.6.4.jar.sha1 → solr/licenses/velocity-1.6.4.jar.sha1 b/...trib/velocity/lib/velocity-1.6.4.jar.sha1 → solr/licenses/velocity-1.6.4.jar.sha1
diff --git a/...rib/velocity/lib/velocity-LICENSE-ASL.txt → solr/licenses/velocity-LICENSE-ASL.txt b/...rib/velocity/lib/velocity-LICENSE-ASL.txt → solr/licenses/velocity-LICENSE-ASL.txt
diff --git a/.../contrib/velocity/lib/velocity-NOTICE.txt → solr/licenses/velocity-NOTICE.txt b/.../contrib/velocity/lib/velocity-NOTICE.txt → solr/licenses/velocity-NOTICE.txt
diff --git a/.../velocity/lib/velocity-tools-2.0.jar.sha1 → solr/licenses/velocity-tools-2.0.jar.sha1 b/.../velocity/lib/velocity-tools-2.0.jar.sha1 → solr/licenses/velocity-tools-2.0.jar.sha1
diff --git a/...locity/lib/velocity-tools-LICENSE-ASL.txt → solr/licenses/velocity-tools-LICENSE-ASL.txt b/...locity/lib/velocity-tools-LICENSE-ASL.txt → solr/licenses/velocity-tools-LICENSE-ASL.txt
diff --git a/...ib/velocity/lib/velocity-tools-NOTICE.txt → solr/licenses/velocity-tools-NOTICE.txt b/...ib/velocity/lib/velocity-tools-NOTICE.txt → solr/licenses/velocity-tools-NOTICE.txt
diff --git a/...raction/lib/vorbis-java-core-0.1.jar.sha1 → solr/licenses/vorbis-java-core-0.1.jar.sha1 b/...raction/lib/vorbis-java-core-0.1.jar.sha1 → solr/licenses/vorbis-java-core-0.1.jar.sha1
diff --git a/...lib/vorbis-java-core-LICENSE-BSD_LIKE.txt → ...ses/vorbis-java-core-LICENSE-BSD_LIKE.txt b/...lib/vorbis-java-core-LICENSE-BSD_LIKE.txt → ...ses/vorbis-java-core-LICENSE-BSD_LIKE.txt
diff --git a/...xtraction/lib/vorbis-java-core-NOTICE.txt → solr/licenses/vorbis-java-core-NOTICE.txt b/...xtraction/lib/vorbis-java-core-NOTICE.txt → solr/licenses/vorbis-java-core-NOTICE.txt
diff --git a/...raction/lib/vorbis-java-tika-0.1.jar.sha1 → solr/licenses/vorbis-java-tika-0.1.jar.sha1 b/...raction/lib/vorbis-java-tika-0.1.jar.sha1 → solr/licenses/vorbis-java-tika-0.1.jar.sha1
diff --git a/...lib/vorbis-java-tika-LICENSE-BSD_LIKE.txt → ...ses/vorbis-java-tika-LICENSE-BSD_LIKE.txt b/...lib/vorbis-java-tika-LICENSE-BSD_LIKE.txt → ...ses/vorbis-java-tika-LICENSE-BSD_LIKE.txt
diff --git a/...xtraction/lib/vorbis-java-tika-NOTICE.txt → solr/licenses/vorbis-java-tika-NOTICE.txt b/...xtraction/lib/vorbis-java-tika-NOTICE.txt → solr/licenses/vorbis-java-tika-NOTICE.txt
diff --git a/solr/lib/wstx-asl-3.2.7.jar.sha1 → solr/licenses/wstx-asl-3.2.7.jar.sha1 b/solr/lib/wstx-asl-3.2.7.jar.sha1 → solr/licenses/wstx-asl-3.2.7.jar.sha1
diff --git a/solr/lib/wstx-asl-LICENSE-ASL.txt → solr/licenses/wstx-asl-LICENSE-ASL.txt b/solr/lib/wstx-asl-LICENSE-ASL.txt → solr/licenses/wstx-asl-LICENSE-ASL.txt
diff --git a/solr/lib/wstx-asl-NOTICE.txt → solr/licenses/wstx-asl-NOTICE.txt b/solr/lib/wstx-asl-NOTICE.txt → solr/licenses/wstx-asl-NOTICE.txt
diff --git a/.../extraction/lib/xercesImpl-2.9.1.jar.sha1 → solr/licenses/xercesImpl-2.9.1.jar.sha1 b/.../extraction/lib/xercesImpl-2.9.1.jar.sha1 → solr/licenses/xercesImpl-2.9.1.jar.sha1
diff --git a/...extraction/lib/xercesImpl-LICENSE-ASL.txt → solr/licenses/xercesImpl-LICENSE-ASL.txt b/...extraction/lib/xercesImpl-LICENSE-ASL.txt → solr/licenses/xercesImpl-LICENSE-ASL.txt
diff --git a/...trib/extraction/lib/xercesImpl-NOTICE.txt → solr/licenses/xercesImpl-NOTICE.txt b/...trib/extraction/lib/xercesImpl-NOTICE.txt → solr/licenses/xercesImpl-NOTICE.txt
diff --git a/...ib/extraction/lib/xmlbeans-2.3.0.jar.sha1 → solr/licenses/xmlbeans-2.3.0.jar.sha1 b/...ib/extraction/lib/xmlbeans-2.3.0.jar.sha1 → solr/licenses/xmlbeans-2.3.0.jar.sha1
diff --git a/...b/extraction/lib/xmlbeans-LICENSE-ASL.txt → solr/licenses/xmlbeans-LICENSE-ASL.txt b/...b/extraction/lib/xmlbeans-LICENSE-ASL.txt → solr/licenses/xmlbeans-LICENSE-ASL.txt
diff --git a/...ontrib/extraction/lib/xmlbeans-NOTICE.txt → solr/licenses/xmlbeans-NOTICE.txt b/...ontrib/extraction/lib/xmlbeans-NOTICE.txt → solr/licenses/xmlbeans-NOTICE.txt
diff --git a/solr/lib/zookeeper-3.3.5.jar.sha1 → solr/licenses/zookeeper-3.3.5.jar.sha1 b/solr/lib/zookeeper-3.3.5.jar.sha1 → solr/licenses/zookeeper-3.3.5.jar.sha1
diff --git a/solr/lib/zookeeper-LICENSE-ASL.txt → solr/licenses/zookeeper-LICENSE-ASL.txt b/solr/lib/zookeeper-LICENSE-ASL.txt → solr/licenses/zookeeper-LICENSE-ASL.txt
diff --git a/solr/lib/zookeeper-NOTICE.txt → solr/licenses/zookeeper-NOTICE.txt b/solr/lib/zookeeper-NOTICE.txt → solr/licenses/zookeeper-NOTICE.txt
diff --git a/solr/solrj/build.xml b/solr/solrj/build.xml
@@ -20,6 +20,9 @@
 
   <property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
 
+  <!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
+  <property name="ivy.sync" value="false"/>
+
   <import file="../common-build.xml"/>
 
   <!-- Specialized common-solr.test.classpath, to remove the Solr core test output -->