Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump to Solr-/Lucene-4.10.3

Browse Source
This commit is contained in:
sixcooler 2015-01-04 18:47:47 +01:00
parent d44d8996d0
commit 5594c43d2e
23 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.classpath
View File

@ -52,23 +52,23 @@
<classpathentry kind="lib" path="lib/poi-scratchpad-3.10.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.3.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.9.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.10.3.jar"/>
<classpathentry kind="lib" path="lib/chardet.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/>

34
addon/YaCy.app/Contents/Info.plist
View File

@ -81,21 +81,21 @@
<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
<string>$JAVAROOT/lib/jsoup-1.8.1.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.9.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.10.3.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.10.3.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.7.0.jar</string>
<string>$JAVAROOT/lib/noggit-0.5.jar</string>
<string>$JAVAROOT/lib/org.restlet.jar</string>
@ -104,8 +104,8 @@
<string>$JAVAROOT/lib/poi-scratchpad-3.10.1.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.9.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.9.jar</string>
<string>$JAVAROOT/lib/solr-core-4.10.2.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.10.2.jar</string>
<string>$JAVAROOT/lib/solr-core-4.10.3.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.10.3.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.4.1.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/weupnp-0.1.2.jar</string>

34
build.xml
View File

@ -205,21 +205,21 @@
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsoup-1.8.1.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.9.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.10.2.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.10.2.jar" />
<pathelement location="${lib}/lucene-classification-4.10.2.jar" />
<pathelement location="${lib}/lucene-codecs-4.10.2.jar" />
<pathelement location="${lib}/lucene-core-4.10.2.jar" />
<pathelement location="${lib}/lucene-facet-4.10.2.jar" />
<pathelement location="${lib}/lucene-grouping-4.10.2.jar" />
<pathelement location="${lib}/lucene-highlighter-4.10.2.jar" />
<pathelement location="${lib}/lucene-join-4.10.2.jar" />
<pathelement location="${lib}/lucene-memory-4.10.2.jar" />
<pathelement location="${lib}/lucene-misc-4.10.2.jar" />
<pathelement location="${lib}/lucene-queries-4.10.2.jar" />
<pathelement location="${lib}/lucene-queryparser-4.10.2.jar" />
<pathelement location="${lib}/lucene-spatial-4.10.2.jar" />
<pathelement location="${lib}/lucene-suggest-4.10.2.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.10.3.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.10.3.jar" />
<pathelement location="${lib}/lucene-classification-4.10.3.jar" />
<pathelement location="${lib}/lucene-codecs-4.10.3.jar" />
<pathelement location="${lib}/lucene-core-4.10.3.jar" />
<pathelement location="${lib}/lucene-facet-4.10.3.jar" />
<pathelement location="${lib}/lucene-grouping-4.10.3.jar" />
<pathelement location="${lib}/lucene-highlighter-4.10.3.jar" />
<pathelement location="${lib}/lucene-join-4.10.3.jar" />
<pathelement location="${lib}/lucene-memory-4.10.3.jar" />
<pathelement location="${lib}/lucene-misc-4.10.3.jar" />
<pathelement location="${lib}/lucene-queries-4.10.3.jar" />
<pathelement location="${lib}/lucene-queryparser-4.10.3.jar" />
<pathelement location="${lib}/lucene-spatial-4.10.3.jar" />
<pathelement location="${lib}/lucene-suggest-4.10.3.jar" />
<pathelement location="${lib}/metadata-extractor-2.7.0.jar" />
<pathelement location="${lib}/noggit-0.5.jar" />
<pathelement location="${lib}/org.restlet.jar" />
@ -228,8 +228,8 @@
<pathelement location="${lib}/poi-scratchpad-3.10.1.jar" />
<pathelement location="${lib}/slf4j-api-1.7.9.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.9.jar" />
<pathelement location="${lib}/solr-core-4.10.2.jar" />
<pathelement location="${lib}/solr-solrj-4.10.2.jar" />
<pathelement location="${lib}/solr-core-4.10.3.jar" />
<pathelement location="${lib}/solr-solrj-4.10.3.jar" />
<pathelement location="${lib}/spatial4j-0.4.1.jar" />
<pathelement location="${lib}/webcat-0.1-swf.jar" />
<pathelement location="${lib}/weupnp-0.1.2.jar" />

13
defaults/solr/solrconfig.xml
View File

@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>4.10.2</luceneMatchVersion>
<luceneMatchVersion>4.10.3</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
@ -224,7 +224,6 @@
<int name="segmentsPerTier">10</int>
</mergePolicy>
-->
<!-- Merge Factor
The merge factor controls how many segments will get merged at a time.
@ -446,7 +445,6 @@
-->
</updateHandler>
<!-- IndexReaderFactory
@ -600,6 +598,7 @@
/>
-->
<!-- Lazy Field Loading
If true, stored fields that are not requested will be loaded
@ -636,13 +635,13 @@
then documents 0 through 49 will be collected and cached. Any further
requests in that range can be satisfied via the cache.
-->
<queryResultWindowSize>1</queryResultWindowSize>
<queryResultWindowSize>20</queryResultWindowSize>
<!-- Maximum number of documents to cache for any entry in the
queryResultCache.
-->
<queryResultMaxDocsCached>100</queryResultMaxDocsCached>
<queryResultMaxDocsCached>200</queryResultMaxDocsCached>
<!-- Query Related Event Listeners
Various IndexSearcher related events can trigger Listeners to
@ -722,6 +721,7 @@
-->
<requestDispatcher handleSelect="false" >
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
what restrictions may be placed on the ContentStreams from
those requests
@ -748,6 +748,7 @@
The settings below authorize Solr to fetch remote files, You
should make sure your system has some authentication before
using enableRemoteStreaming="true"
-->
<requestParsers enableRemoteStreaming="true"
multipartUploadLimitInKB="2048000"

BIN
lib/lucene-analyzers-common-4.10.2.jar → lib/lucene-analyzers-common-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-phonetic-4.10.2.jar → lib/lucene-analyzers-phonetic-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-classification-4.10.2.jar → lib/lucene-classification-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-codecs-4.10.2.jar → lib/lucene-codecs-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-core-4.10.2.jar → lib/lucene-core-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-facet-4.10.2.jar → lib/lucene-facet-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-grouping-4.10.2.jar → lib/lucene-grouping-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-highlighter-4.10.2.jar → lib/lucene-highlighter-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-join-4.10.2.jar → lib/lucene-join-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.10.2.jar → lib/lucene-memory-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-misc-4.10.2.jar → lib/lucene-misc-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-queries-4.10.2.jar → lib/lucene-queries-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-queryparser-4.10.2.jar → lib/lucene-queryparser-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-spatial-4.10.2.jar → lib/lucene-spatial-4.10.3.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.10.2.jar → lib/lucene-suggest-4.10.3.jar
View File

Binary file not shown.

BIN
lib/solr-core-4.10.2.jar → lib/solr-core-4.10.3.jar
View File

Binary file not shown.

BIN
lib/solr-solrj-4.10.2.jar → lib/solr-solrj-4.10.3.jar
View File

Binary file not shown.

2
nbproject/project.xml
View File

@ -83,7 +83,7 @@
<compilation-unit>
<package-root>source</package-root>
<package-root>htroot</package-root>
<classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
<classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
<built-to>lib/yacycore.jar</built-to>
<source-level>1.7</source-level>
</compilation-unit>

2
pom.xml
View File

@ -34,7 +34,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<!-- the Solr version used in dependency section for all related dependencies -->
<solr.version>4.10.2</solr.version>
<solr.version>4.10.3</solr.version>
<!-- properties used for filtering yacyBuildProperties.java -->
<REPL_DATE>${DSTAMP}</REPL_DATE>