upgrade to solr 3.6.1

yacy · Aug 17, 2012 · 2ccf1db · 2ccf1db
1 parent e651d3e
commit 2ccf1db
Show file tree

Hide file tree

Showing 7 changed files with 1,075 additions and 6 deletions.
diff --git a/.classpath b/.classpath
@@ -48,7 +48,6 @@
 	<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="lib/lucene-core-3.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/apache-solr-solrj-3.6.0.jar" sourcepath="/Volumes/Raptor/Data/workspace/apache-solr-3.6.0/src/"/>
 	<classpathentry kind="lib" path="lib/lucene-phonetic-3.6.0.jar"/>
 	<classpathentry kind="lib" path="lib/lucene-spatial-3.6.0.jar"/>
 	<classpathentry kind="lib" path="lib/lucene-spellchecker-3.6.0.jar"/>
@@ -61,14 +60,15 @@
 	<classpathentry kind="lib" path="lib/fontbox-1.7.0.jar"/>
 	<classpathentry kind="lib" path="lib/pdfbox-1.7.0.jar"/>
 	<classpathentry kind="lib" path="lib/jempbox-1.7.0.jar"/>
+	<classpathentry kind="lib" path="lib/apache-solr-core-3.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/apache-solr-solrj-3.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>
 	<classpathentry kind="lib" path="lib/jena-2.6.4.jar" sourcepath="/Users/admin/.m2/repository/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-sources.jar"/>
 	<classpathentry kind="lib" path="lib/sax-2.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/arq-2.8.7.jar"/>
 	<classpathentry kind="lib" path="lib/iri-0.8.jar"/>
-	<classpathentry kind="lib" path="lib/apache-solr-core-3.6.0.jar" sourcepath="/Volumes/Raptor/Data/workspace/apache-solr-3.6.0/src/java"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.6.3.jar"/>
 	<classpathentry kind="output" path="gen"/>
 </classpath>
diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
@@ -40,8 +40,8 @@
 			<string>$JAVAROOT/lib/J7Zip-modified.jar</string>
 			<string>$JAVAROOT/lib/activation.jar</string>
 			<string>$JAVAROOT/lib/apache-mime4j-0.6.jar</string>
-			<string>$JAVAROOT/lib/apache-solr-core-3.6.0.jar</string>
-			<string>$JAVAROOT/lib/apache-solr-solrj-3.6.0.jar</string>
+			<string>$JAVAROOT/lib/apache-solr-core-3.6.1.jar</string>
+			<string>$JAVAROOT/lib/apache-solr-solrj-3.6.1.jar</string>
 			<string>$JAVAROOT/lib/arq-2.8.7.jar</string>
 			<string>$JAVAROOT/lib/bcmail-jdk15-145.jar</string>
 			<string>$JAVAROOT/lib/bcprov-jdk15-145.jar</string>

diff --git a/build.xml b/build.xml
@@ -159,8 +159,8 @@
         <pathelement location="${lib}/J7Zip-modified.jar" />
     	<pathelement location="${lib}/activation.jar" />
         <pathelement location="${lib}/apache-mime4j-0.6.jar" />
-        <pathelement location="${lib}/apache-solr-core-3.6.0.jar" />
-        <pathelement location="${lib}/apache-solr-solrj-3.6.0.jar" />
+        <pathelement location="${lib}/apache-solr-core-3.6.1.jar" />
+        <pathelement location="${lib}/apache-solr-solrj-3.6.1.jar" />
         <pathelement location="${lib}/arq-2.8.7.jar" />
     	<pathelement location="${lib}/bcmail-jdk15-145.jar" />
     	<pathelement location="${lib}/bcprov-jdk15-145.jar" />

diff --git a/lib/apache-solr-solrj-3.6.0.License → lib/apache-solr-core-3.6.1.License b/lib/apache-solr-solrj-3.6.0.License → lib/apache-solr-core-3.6.1.License
diff --git a/lib/apache-solr-core-3.6.0.jar → lib/apache-solr-core-3.6.1.jar b/lib/apache-solr-core-3.6.0.jar → lib/apache-solr-core-3.6.1.jar
diff --git a/lib/apache-solr-solrj-3.6.1.License b/lib/apache-solr-solrj-3.6.1.License
diff --git a/lib/apache-solr-solrj-3.6.0.jar → lib/apache-solr-solrj-3.6.1.jar b/lib/apache-solr-solrj-3.6.0.jar → lib/apache-solr-solrj-3.6.1.jar