diff options
| -rw-r--r-- | .classpath | 34 | ||||
| -rw-r--r-- | addon/YaCy.app/Contents/Info.plist | 34 | ||||
| -rw-r--r-- | build.xml | 34 | ||||
| -rw-r--r-- | defaults/solr/solrconfig.xml | 2 | ||||
| -rw-r--r-- | lib/lucene-analyzers-common-4.6.0.jar (renamed from lib/lucene-analyzers-common-4.5.0.jar) | bin | 1584046 -> 1589250 bytes | |||
| -rw-r--r-- | lib/lucene-analyzers-phonetic-4.6.0.jar (renamed from lib/lucene-analyzers-phonetic-4.5.0.jar) | bin | 23110 -> 23105 bytes | |||
| -rw-r--r-- | lib/lucene-classification-4.5.0.jar | bin | 20897 -> 0 bytes | |||
| -rw-r--r-- | lib/lucene-classification-4.6.0.jar | bin | 0 -> 22113 bytes | |||
| -rw-r--r-- | lib/lucene-codecs-4.6.0.jar (renamed from lib/lucene-codecs-4.5.0.jar) | bin | 321348 -> 342596 bytes | |||
| -rw-r--r-- | lib/lucene-core-4.6.0.jar (renamed from lib/lucene-core-4.5.0.jar) | bin | 2297684 -> 2347398 bytes | |||
| -rw-r--r-- | lib/lucene-facet-4.6.0.jar (renamed from lib/lucene-facet-4.5.0.jar) | bin | 368179 -> 366028 bytes | |||
| -rw-r--r-- | lib/lucene-grouping-4.6.0.jar (renamed from lib/lucene-grouping-4.5.0.jar) | bin | 107632 -> 107622 bytes | |||
| -rw-r--r-- | lib/lucene-highlighter-4.6.0.jar (renamed from lib/lucene-highlighter-4.5.0.jar) | bin | 123552 -> 127506 bytes | |||
| -rw-r--r-- | lib/lucene-join-4.6.0.jar (renamed from lib/lucene-join-4.5.0.jar) | bin | 64106 -> 64145 bytes | |||
| -rw-r--r-- | lib/lucene-memory-4.5.0.jar | bin | 35818 -> 0 bytes | |||
| -rw-r--r-- | lib/lucene-memory-4.6.0.jar | bin | 0 -> 35838 bytes | |||
| -rw-r--r-- | lib/lucene-misc-4.6.0.jar (renamed from lib/lucene-misc-4.5.0.jar) | bin | 93054 -> 95779 bytes | |||
| -rw-r--r-- | lib/lucene-queries-4.5.0.jar | bin | 205261 -> 0 bytes | |||
| -rw-r--r-- | lib/lucene-queries-4.6.0.jar | bin | 0 -> 210977 bytes | |||
| -rw-r--r-- | lib/lucene-queryparser-4.6.0.jar (renamed from lib/lucene-queryparser-4.5.0.jar) | bin | 384884 -> 383344 bytes | |||
| -rw-r--r-- | lib/lucene-spatial-4.6.0.jar (renamed from lib/lucene-spatial-4.5.0.jar) | bin | 93424 -> 93408 bytes | |||
| -rw-r--r-- | lib/lucene-suggest-4.5.0.jar | bin | 155610 -> 0 bytes | |||
| -rw-r--r-- | lib/lucene-suggest-4.6.0.jar | bin | 0 -> 184918 bytes | |||
| -rw-r--r-- | lib/solr-core-4.6.0.jar (renamed from lib/solr-core-4.5.0.jar) | bin | 2386834 -> 2435805 bytes | |||
| -rw-r--r-- | lib/solr-solr-4.6.0.License | 226 | ||||
| -rw-r--r-- | lib/solr-solrj-4.6.0.License (renamed from lib/solr-solrj-4.5.0.License) | 0 | ||||
| -rw-r--r-- | lib/solr-solrj-4.6.0.jar (renamed from lib/solr-solrj-4.5.0.jar) | bin | 384368 -> 402912 bytes | |||
| -rw-r--r-- | source/net/yacy/search/index/Fulltext.java | 4 |
28 files changed, 280 insertions, 54 deletions
diff --git a/.classpath b/.classpath index b584ca1c4..f67069bc8 100644 --- a/.classpath +++ b/.classpath @@ -54,23 +54,23 @@ <classpathentry kind="lib" path="lib/fontbox-1.8.2.jar"/> <classpathentry kind="lib" path="lib/jempbox-1.8.2.jar"/> <classpathentry kind="lib" path="lib/pdfbox-1.8.2.jar"/> - <classpathentry kind="lib" path="lib/lucene-analyzers-common-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-classification-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-codecs-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-core-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-facet-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-grouping-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-highlighter-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-join-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-memory-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-misc-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-queries-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-queryparser-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-spatial-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/lucene-suggest-4.5.0.jar"/> - <classpathentry kind="lib" path="lib/solr-core-4.5.0.jar" sourcepath="/Volumes/Tres/noBackup/Downloads/solr-4.5.0/solr/core/src/java"/> - <classpathentry kind="lib" path="lib/solr-solrj-4.5.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-analyzers-common-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-classification-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-codecs-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-core-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-facet-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-grouping-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-highlighter-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-join-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-memory-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-misc-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-queries-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-queryparser-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-spatial-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/lucene-suggest-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/solr-core-4.6.0.jar"/> + <classpathentry kind="lib" path="lib/solr-solrj-4.6.0.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"/> diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 2374e2510..6f904b96b 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -68,21 +68,21 @@ <string>$JAVAROOT/lib/jsch-0.1.42.jar</string> <string>$JAVAROOT/lib/json-simple-1.1.jar</string> <string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string> - <string>$JAVAROOT/lib/lucene-analyzers-common-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-classification-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-codecs-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-core-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-facet-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-grouping-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-highlighter-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-join-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-memory-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-misc-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-queries-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-queryparser-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-spatial-4.5.0.jar</string> - <string>$JAVAROOT/lib/lucene-suggest-4.5.0.jar</string> + <string>$JAVAROOT/lib/lucene-analyzers-common-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-classification-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-codecs-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-core-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-facet-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-grouping-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-highlighter-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-join-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-memory-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-misc-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-queries-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-queryparser-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-spatial-4.6.0.jar</string> + <string>$JAVAROOT/lib/lucene-suggest-4.6.0.jar</string> <string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string> <string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string> <string>$JAVAROOT/lib/noggit-0.5.jar</string> @@ -93,8 +93,8 @@ <string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string> <string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string> - <string>$JAVAROOT/lib/solr-core-4.5.0.jar</string> - <string>$JAVAROOT/lib/solr-solrj-4.5.0.jar</string> + <string>$JAVAROOT/lib/solr-core-4.6.0.jar</string> + <string>$JAVAROOT/lib/solr-solrj-4.6.0.jar</string> <string>$JAVAROOT/lib/spatial4j-0.3.jar</string> <string>$JAVAROOT/lib/webcat-0.1-swf.jar</string> <string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string> @@ -193,21 +193,21 @@ <pathelement location="${lib}/json-simple-1.1.jar" /> <pathelement location="${lib}/jsoup-1.6.3.jar" /> <pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" /> - <pathelement location="${lib}/lucene-analyzers-common-4.5.0.jar" /> - <pathelement location="${lib}/lucene-analyzers-phonetic-4.5.0.jar" /> - <pathelement location="${lib}/lucene-classification-4.5.0.jar" /> - <pathelement location="${lib}/lucene-codecs-4.5.0.jar" /> - <pathelement location="${lib}/lucene-core-4.5.0.jar" /> - <pathelement location="${lib}/lucene-facet-4.5.0.jar" /> - <pathelement location="${lib}/lucene-grouping-4.5.0.jar" /> - <pathelement location="${lib}/lucene-highlighter-4.5.0.jar" /> - <pathelement location="${lib}/lucene-join-4.5.0.jar" /> - <pathelement location="${lib}/lucene-memory-4.5.0.jar" /> - <pathelement location="${lib}/lucene-misc-4.5.0.jar" /> - <pathelement location="${lib}/lucene-queries-4.5.0.jar" /> - <pathelement location="${lib}/lucene-queryparser-4.5.0.jar" /> - <pathelement location="${lib}/lucene-spatial-4.5.0.jar" /> - <pathelement location="${lib}/lucene-suggest-4.5.0.jar" /> + <pathelement location="${lib}/lucene-analyzers-common-4.6.0.jar" /> + <pathelement location="${lib}/lucene-analyzers-phonetic-4.6.0.jar" /> + <pathelement location="${lib}/lucene-classification-4.6.0.jar" /> + <pathelement location="${lib}/lucene-codecs-4.6.0.jar" /> + <pathelement location="${lib}/lucene-core-4.6.0.jar" /> + <pathelement location="${lib}/lucene-facet-4.6.0.jar" /> + <pathelement location="${lib}/lucene-grouping-4.6.0.jar" /> + <pathelement location="${lib}/lucene-highlighter-4.6.0.jar" /> + <pathelement location="${lib}/lucene-join-4.6.0.jar" /> + <pathelement location="${lib}/lucene-memory-4.6.0.jar" /> + <pathelement location="${lib}/lucene-misc-4.6.0.jar" /> + <pathelement location="${lib}/lucene-queries-4.6.0.jar" /> + <pathelement location="${lib}/lucene-queryparser-4.6.0.jar" /> + <pathelement location="${lib}/lucene-spatial-4.6.0.jar" /> + <pathelement location="${lib}/lucene-suggest-4.6.0.jar" /> <pathelement location="${lib}/metadata-extractor-2.6.2.jar" /> <pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" /> <pathelement location="${lib}/noggit-0.5.jar" /> @@ -218,8 +218,8 @@ <pathelement location="${lib}/servlet-api-2.5-20081211.jar" /> <pathelement location="${lib}/slf4j-api-1.7.2.jar" /> <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" /> - <pathelement location="${lib}/solr-core-4.5.0.jar" /> - <pathelement location="${lib}/solr-solrj-4.5.0.jar" /> + <pathelement location="${lib}/solr-core-4.6.0.jar" /> + <pathelement location="${lib}/solr-solrj-4.6.0.jar" /> <pathelement location="${lib}/spatial4j-0.3.jar" /> <pathelement location="${lib}/webcat-0.1-swf.jar" /> <pathelement location="${lib}/wstx-asl-3.2.9.jar" /> diff --git a/defaults/solr/solrconfig.xml b/defaults/solr/solrconfig.xml index e0f895152..5e14661a0 100644 --- a/defaults/solr/solrconfig.xml +++ b/defaults/solr/solrconfig.xml @@ -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.5</luceneMatchVersion> + <luceneMatchVersion>4.6</luceneMatchVersion> <!-- <lib/> directives can be used to instruct Solr to load an Jars identified and use them to resolve any "plugins" specified in diff --git a/lib/lucene-analyzers-common-4.5.0.jar b/lib/lucene-analyzers-common-4.6.0.jar Binary files differindex 2ac54ac26..8306ed731 100644 --- a/lib/lucene-analyzers-common-4.5.0.jar +++ b/lib/lucene-analyzers-common-4.6.0.jar diff --git a/lib/lucene-analyzers-phonetic-4.5.0.jar b/lib/lucene-analyzers-phonetic-4.6.0.jar Binary files differindex 87f8d3415..3604fbac1 100644 --- a/lib/lucene-analyzers-phonetic-4.5.0.jar +++ b/lib/lucene-analyzers-phonetic-4.6.0.jar diff --git a/lib/lucene-classification-4.5.0.jar b/lib/lucene-classification-4.5.0.jar Binary files differdeleted file mode 100644 index 26ad061ed..000000000 --- a/lib/lucene-classification-4.5.0.jar +++ /dev/null diff --git a/lib/lucene-classification-4.6.0.jar b/lib/lucene-classification-4.6.0.jar Binary files differnew file mode 100644 index 000000000..225e28273 --- /dev/null +++ b/lib/lucene-classification-4.6.0.jar diff --git a/lib/lucene-codecs-4.5.0.jar b/lib/lucene-codecs-4.6.0.jar Binary files differindex 3df158e9b..4966e2be9 100644 --- a/lib/lucene-codecs-4.5.0.jar +++ b/lib/lucene-codecs-4.6.0.jar diff --git a/lib/lucene-core-4.5.0.jar b/lib/lucene-core-4.6.0.jar Binary files differindex e710cc776..a71f9d384 100644 --- a/lib/lucene-core-4.5.0.jar +++ b/lib/lucene-core-4.6.0.jar diff --git a/lib/lucene-facet-4.5.0.jar b/lib/lucene-facet-4.6.0.jar Binary files differindex 2d1f558c6..d6894c168 100644 --- a/lib/lucene-facet-4.5.0.jar +++ b/lib/lucene-facet-4.6.0.jar diff --git a/lib/lucene-grouping-4.5.0.jar b/lib/lucene-grouping-4.6.0.jar Binary files differindex 4e75486a3..d644e5f19 100644 --- a/lib/lucene-grouping-4.5.0.jar +++ b/lib/lucene-grouping-4.6.0.jar diff --git a/lib/lucene-highlighter-4.5.0.jar b/lib/lucene-highlighter-4.6.0.jar Binary files differindex e7545d356..2458522ee 100644 --- a/lib/lucene-highlighter-4.5.0.jar +++ b/lib/lucene-highlighter-4.6.0.jar diff --git a/lib/lucene-join-4.5.0.jar b/lib/lucene-join-4.6.0.jar Binary files differindex b8e3ad7c4..08946134e 100644 --- a/lib/lucene-join-4.5.0.jar +++ b/lib/lucene-join-4.6.0.jar diff --git a/lib/lucene-memory-4.5.0.jar b/lib/lucene-memory-4.5.0.jar Binary files differdeleted file mode 100644 index 76ab93ad1..000000000 --- a/lib/lucene-memory-4.5.0.jar +++ /dev/null diff --git a/lib/lucene-memory-4.6.0.jar b/lib/lucene-memory-4.6.0.jar Binary files differnew file mode 100644 index 000000000..0f536ddc7 --- /dev/null +++ b/lib/lucene-memory-4.6.0.jar diff --git a/lib/lucene-misc-4.5.0.jar b/lib/lucene-misc-4.6.0.jar Binary files differindex 586fb17c5..1495da99f 100644 --- a/lib/lucene-misc-4.5.0.jar +++ b/lib/lucene-misc-4.6.0.jar diff --git a/lib/lucene-queries-4.5.0.jar b/lib/lucene-queries-4.5.0.jar Binary files differdeleted file mode 100644 index 21a916d31..000000000 --- a/lib/lucene-queries-4.5.0.jar +++ /dev/null diff --git a/lib/lucene-queries-4.6.0.jar b/lib/lucene-queries-4.6.0.jar Binary files differnew file mode 100644 index 000000000..f99010488 --- /dev/null +++ b/lib/lucene-queries-4.6.0.jar diff --git a/lib/lucene-queryparser-4.5.0.jar b/lib/lucene-queryparser-4.6.0.jar Binary files differindex fb2c9179e..56cbe60aa 100644 --- a/lib/lucene-queryparser-4.5.0.jar +++ b/lib/lucene-queryparser-4.6.0.jar diff --git a/lib/lucene-spatial-4.5.0.jar b/lib/lucene-spatial-4.6.0.jar Binary files differindex a23813033..934fd3bb1 100644 --- a/lib/lucene-spatial-4.5.0.jar +++ b/lib/lucene-spatial-4.6.0.jar diff --git a/lib/lucene-suggest-4.5.0.jar b/lib/lucene-suggest-4.5.0.jar Binary files differdeleted file mode 100644 index d80395e74..000000000 --- a/lib/lucene-suggest-4.5.0.jar +++ /dev/null diff --git a/lib/lucene-suggest-4.6.0.jar b/lib/lucene-suggest-4.6.0.jar Binary files differnew file mode 100644 index 000000000..1a55946f1 --- /dev/null +++ b/lib/lucene-suggest-4.6.0.jar diff --git a/lib/solr-core-4.5.0.jar b/lib/solr-core-4.6.0.jar Binary files differindex 7704e1c17..f2945dbd7 100644 --- a/lib/solr-core-4.5.0.jar +++ b/lib/solr-core-4.6.0.jar diff --git a/lib/solr-solr-4.6.0.License b/lib/solr-solr-4.6.0.License new file mode 100644 index 000000000..534e44ea1 --- /dev/null +++ b/lib/solr-solr-4.6.0.License @@ -0,0 +1,226 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +========================================================================== +The following license applies to the JQuery JavaScript library +-------------------------------------------------------------------------- +Copyright (c) 2010 John Resig, http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/lib/solr-solrj-4.5.0.License b/lib/solr-solrj-4.6.0.License index 8f21d8b38..8f21d8b38 100644 --- a/lib/solr-solrj-4.5.0.License +++ b/lib/solr-solrj-4.6.0.License diff --git a/lib/solr-solrj-4.5.0.jar b/lib/solr-solrj-4.6.0.jar Binary files differindex c45dd589a..f6e1c0274 100644 --- a/lib/solr-solrj-4.5.0.jar +++ b/lib/solr-solrj-4.6.0.jar diff --git a/source/net/yacy/search/index/Fulltext.java b/source/net/yacy/search/index/Fulltext.java index 512772a52..0e2079feb 100644 --- a/source/net/yacy/search/index/Fulltext.java +++ b/source/net/yacy/search/index/Fulltext.java @@ -84,8 +84,8 @@ import org.apache.lucene.util.Version; public final class Fulltext { - private static final String SOLR_PATH = "solr_45"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml - private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44"}; + private static final String SOLR_PATH = "solr_46"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml + private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44", "solr_45"}; // class objects private final File segmentPath; |
