Permalink
Browse files

migrated Solr 5.5 -> Solr 6.6 and from Java 1.7 -> 1.8

Also: now Version 1.921
  • Loading branch information...
Orbiter committed Jun 9, 2017
1 parent ce89492 commit 6fe735945da97abcbb91ac545fb11cff9d48effc
Showing with 558 additions and 1,230 deletions.
  1. +28 −24 .classpath
  2. +4 −3 .settings/org.eclipse.jdt.core.prefs
  3. +3 −3 build.properties
  4. +27 −23 build.xml
  5. +1 −5 defaults/solr/schema.xml
  6. +452 −709 defaults/solr/solrconfig.xml
  7. +4 −7 htroot/yacysearchtrailer.java
  8. BIN lib/commons-math3-3.4.1.jar
  9. BIN lib/lucene-analyzers-common-5.5.4.jar
  10. BIN lib/lucene-analyzers-common-6.6.0.jar
  11. BIN lib/lucene-analyzers-phonetic-5.5.4.jar
  12. BIN lib/lucene-analyzers-phonetic-6.6.0.jar
  13. BIN lib/lucene-backward-codecs-5.5.4.jar
  14. BIN lib/lucene-backward-codecs-6.6.0.jar
  15. BIN lib/lucene-classification-5.5.4.jar
  16. BIN lib/lucene-classification-6.6.0.jar
  17. BIN lib/lucene-codecs-5.5.4.jar
  18. BIN lib/lucene-codecs-6.6.0.jar
  19. BIN lib/lucene-core-5.5.4.jar
  20. BIN lib/lucene-core-6.6.0.jar
  21. BIN lib/lucene-facet-5.5.4.jar
  22. BIN lib/lucene-facet-6.6.0.jar
  23. BIN lib/lucene-grouping-5.5.4.jar
  24. BIN lib/lucene-grouping-6.6.0.jar
  25. BIN lib/lucene-highlighter-5.5.4.jar
  26. BIN lib/lucene-highlighter-6.6.0.jar
  27. BIN lib/lucene-join-5.5.4.jar
  28. BIN lib/lucene-join-6.6.0.jar
  29. BIN lib/lucene-memory-5.5.4.jar
  30. BIN lib/lucene-memory-6.6.0.jar
  31. BIN lib/lucene-misc-5.5.4.jar
  32. BIN lib/lucene-misc-6.6.0.jar
  33. BIN lib/lucene-queries-5.5.4.jar
  34. BIN lib/lucene-queries-6.6.0.jar
  35. BIN lib/lucene-queryparser-5.5.4.jar
  36. BIN lib/lucene-queryparser-6.6.0.jar
  37. BIN lib/lucene-spatial-5.5.4.jar
  38. BIN lib/lucene-spatial-6.6.0.jar
  39. BIN lib/lucene-suggest-5.5.4.jar
  40. BIN lib/lucene-suggest-6.6.0.jar
  41. BIN lib/metrics-core-3.2.2.jar
  42. BIN lib/solr-core-5.5.4.jar
  43. BIN lib/solr-core-6.6.0.jar
  44. BIN lib/solr-dataimporthandler-6.6.0.jar
  45. BIN lib/solr-solrj-5.5.4.jar
  46. BIN lib/solr-solrj-6.6.0.jar
  47. BIN lib/spatial4j-0.5.jar
  48. BIN lib/spatial4j-0.6.jar
  49. BIN lib/zookeeper-3.4.10.jar
  50. BIN lib/zookeeper-3.4.6.jar
  51. +0 −400 source/net/yacy/cora/federate/solr/connector/ConcurrentUpdateSolrConnector.java
  52. +2 −2 source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java
  53. +1 −7 source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java
  54. +2 −2 source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java
  55. +1 −5 source/net/yacy/cora/federate/solr/instance/InstanceMirror.java
  56. +2 −2 source/net/yacy/cora/federate/solr/instance/ServerMirror.java
  57. +2 −2 source/net/yacy/cora/federate/solr/instance/ServerShard.java
  58. +3 −4 source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java
  59. +2 −3 source/net/yacy/cora/federate/solr/responsewriter/FlatJSONResponseWriter.java
  60. +1 −1 source/net/yacy/cora/federate/solr/responsewriter/GSAResponseWriter.java
  61. +1 −1 source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java
  62. +2 −3 source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java
  63. +1 −1 source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java
  64. +1 −1 source/net/yacy/cora/federate/solr/responsewriter/SnapshotImagesReponseWriter.java
  65. +1 −1 source/net/yacy/cora/federate/solr/responsewriter/YJsonResponseWriter.java
  66. +1 −1 source/net/yacy/http/servlets/GSAsearchServlet.java
  67. +1 −1 source/net/yacy/http/servlets/SolrSelectServlet.java
  68. +4 −5 source/net/yacy/search/index/Fulltext.java
  69. +3 −4 source/net/yacy/search/query/QueryModifier.java
  70. +2 −3 source/net/yacy/search/query/QueryParams.java
  71. +6 −7 test/java/net/yacy/document/DateDetectionTest.java
@@ -35,8 +35,6 @@
<classpathentry kind="lib" path="lib/xmpcore-5.1.3.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.5.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.6.jar"/>
<classpathentry kind="lib" path="lib/org.restlet.jar"/>
<classpathentry kind="lib" path="lib/fontbox-2.0.6.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-2.0.6.jar"/>
@@ -64,26 +62,32 @@
<classpathentry kind="lib" path="lib/httpclient-4.5.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.3.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
<classpathentry kind="lib" path="lib/solr-core-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
<classpathentry kind="lib" path="lib/woodstox-core-asl-4.4.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.5.4.jar"/>
<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.4.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-backward-codecs-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.10.jar"/>
<classpathentry kind="lib" path="lib/metrics-core-3.2.2.jar"/>
<classpathentry kind="lib" path="lib/solr-dataimporthandler-6.6.0.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-58_2.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/>
@@ -99,9 +103,9 @@
<classpathentry kind="lib" path="lib/imageio-bmp-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/jsonic-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/langdetect.jar"/>
<classpathentry kind="lib" path="lib/jwat-common-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-gzip-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-archive-common-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-warc-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-common-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-gzip-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-archive-common-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/jwat-warc-1.0.5.jar"/>
<classpathentry kind="output" path="gen"/>
</classpath>
@@ -6,9 +6,10 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +97,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8
@@ -1,9 +1,9 @@
# defining some compiler arguments
javacSource=1.7
javacTarget=1.7
javacSource=1.8
javacTarget=1.8
# Release Configuration
releaseVersion=1.92
releaseVersion=1.921
stdReleaseFile=yacy${branch}_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
releaseFileParentDir=yacy
@@ -170,6 +170,7 @@
<!-- when changing paths here, please also update the paths in /addon/YaCy.app/Contents/Info.plist -->
<path id="project.class.path">
<pathelement location="${build}" />
<pathelement location="${lib}/apache-mime4j-0.6.jar" />
<pathelement location="${lib}/bcmail-jdk15-1.46.jar" />
<pathelement location="${lib}/bcprov-jdk15-1.46.jar" />
<pathelement location="${lib}/chardet.jar" />
@@ -183,6 +184,7 @@
<pathelement location="${lib}/commons-jxpath-1.3.jar" />
<pathelement location="${lib}/commons-lang-2.6.jar" />
<pathelement location="${lib}/commons-logging-1.2.jar" />
<pathelement location="${lib}/commons-math3-3.4.1.jar" />
<pathelement location="${lib}/fontbox-2.0.6.jar" />
<pathelement location="${lib}/guava-18.0.jar" />
<pathelement location="${lib}/htmllexer.jar" />
@@ -216,48 +218,50 @@
<pathelement location="${lib}/jetty-xml-9.2.21.v20170120.jar" />
<pathelement location="${lib}/jsch-0.1.54.jar" />
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsonic-1.2.0.jar" />
<pathelement location="${lib}/jsoup-1.10.2.jar" />
<pathelement location="${lib}/jwat-archive-common-1.0.5.jar" />
<pathelement location="${lib}/jwat-common-1.0.5.jar" />
<pathelement location="${lib}/jwat-gzip-1.0.5.jar" />
<pathelement location="${lib}/jwat-archive-common-1.0.5.jar" />
<pathelement location="${lib}/jwat-warc-1.0.5.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.24.jar" />
<pathelement location="${lib}/lucene-analyzers-common-5.5.4.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-5.5.4.jar" />
<pathelement location="${lib}/lucene-backward-codecs-5.5.4.jar" />
<pathelement location="${lib}/lucene-classification-5.5.4.jar" />
<pathelement location="${lib}/lucene-codecs-5.5.4.jar" />
<pathelement location="${lib}/lucene-core-5.5.4.jar" />
<pathelement location="${lib}/lucene-facet-5.5.4.jar" />
<pathelement location="${lib}/lucene-grouping-5.5.4.jar" />
<pathelement location="${lib}/lucene-highlighter-5.5.4.jar" />
<pathelement location="${lib}/lucene-join-5.5.4.jar" />
<pathelement location="${lib}/lucene-memory-5.5.4.jar" />
<pathelement location="${lib}/lucene-misc-5.5.4.jar" />
<pathelement location="${lib}/lucene-queries-5.5.4.jar" />
<pathelement location="${lib}/lucene-queryparser-5.5.4.jar" />
<pathelement location="${lib}/lucene-spatial-5.5.4.jar" />
<pathelement location="${lib}/lucene-suggest-5.5.4.jar" />
<pathelement location="${lib}/jsonic-1.2.0.jar" />
<pathelement location="${lib}/langdetect.jar" />
<pathelement location="${lib}/lucene-analyzers-common-6.6.0.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-6.6.0.jar" />
<pathelement location="${lib}/lucene-backward-codecs-6.6.0.jar" />
<pathelement location="${lib}/lucene-classification-6.6.0.jar" />
<pathelement location="${lib}/lucene-codecs-6.6.0.jar" />
<pathelement location="${lib}/lucene-core-6.6.0.jar" />
<pathelement location="${lib}/lucene-facet-6.6.0.jar" />
<pathelement location="${lib}/lucene-grouping-6.6.0.jar" />
<pathelement location="${lib}/lucene-highlighter-6.6.0.jar" />
<pathelement location="${lib}/lucene-join-6.6.0.jar" />
<pathelement location="${lib}/lucene-memory-6.6.0.jar" />
<pathelement location="${lib}/lucene-misc-6.6.0.jar" />
<pathelement location="${lib}/lucene-queries-6.6.0.jar" />
<pathelement location="${lib}/lucene-queryparser-6.6.0.jar" />
<pathelement location="${lib}/lucene-spatial-6.6.0.jar" />
<pathelement location="${lib}/lucene-suggest-6.6.0.jar" />
<pathelement location="${lib}/metadata-extractor-2.10.1.jar" />
<pathelement location="${lib}/metrics-core-3.2.2.jar" />
<pathelement location="${lib}/noggit-0.6.jar" />
<pathelement location="${lib}/org.restlet.jar" />
<pathelement location="${lib}/langdetect.jar" />
<pathelement location="${lib}/pdfbox-2.0.6.jar" />
<pathelement location="${lib}/poi-3.15.jar" />
<pathelement location="${lib}/poi-scratchpad-3.15.jar" />
<pathelement location="${lib}/slf4j-api-1.7.24.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.24.jar" />
<pathelement location="${lib}/solr-core-5.5.4.jar" />
<pathelement location="${lib}/solr-solrj-5.5.4.jar" />
<pathelement location="${lib}/spatial4j-0.5.jar" />
<pathelement location="${lib}/solr-core-6.6.0.jar" />
<pathelement location="${lib}/solr-dataimporthandler-6.6.0.jar" />
<pathelement location="${lib}/solr-solrj-6.6.0.jar" />
<pathelement location="${lib}/spatial4j-0.6.jar" />
<pathelement location="${lib}/stax2-api_3.1.4.jar" />
<pathelement location="${lib}/weupnp-0.1.4.jar" />
<pathelement location="${lib}/woodstox-core-asl-4.4.1.jar" />
<pathelement location="${lib}/xercesImpl.jar" />
<pathelement location="${lib}/xml-apis.jar" />
<pathelement location="${lib}/xmpcore-5.1.3.jar" />
<pathelement location="${lib}/zookeeper-3.4.6.jar" />
<pathelement location="${lib}/zookeeper-3.4.10.jar" />
</path>
<target name="compile-core" depends="init" description="compile YaCy core">
@@ -111,11 +111,7 @@
</fields>
<uniqueKey>id</uniqueKey>
<!-- defaultSearchField element is deprecated in Solr versions 3.6 and higher. Instead, df request parameter should be used-->
<defaultSearchField>text_t</defaultSearchField>
<!-- default operator parameter has been deprecated in Solr versions 3.6 and higher. Instead, the query parser q.op parameter should be used in request handler. -->
<solrQueryParser defaultOperator="AND"/>
<!-- if you are using a search client using the default search field "text", then use this line to get to all indexed documents -->
<!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
</schema>
Oops, something went wrong.

1 comment on commit 6fe7359

@luccioman

This comment has been minimized.

Member

luccioman commented on 6fe7359 Jun 15, 2017

@Orbiter , quite many changes in the solrconfig.xml!
It looks like it includes now some sample elements, maybe not really relevant to YaCy (notably the suggester config, applying on the "cat" field ;) . Is it coming from the Solr sample config at https://github.com/apache/lucene-solr/blob/master/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml?)
Maybe some cleanup has still to be done?

Please sign in to comment.