diff --git a/.classpath b/.classpath index 1b3d1c1f1..5fbd5c72f 100644 --- a/.classpath +++ b/.classpath @@ -33,7 +33,6 @@ - @@ -46,27 +45,28 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index c69d0140b..12a4ae6d3 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -76,21 +76,21 @@ $JAVAROOT/lib/jsch-0.1.50.jar $JAVAROOT/lib/json-simple-1.1.1.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar - $JAVAROOT/lib/lucene-analyzers-common-4.6.1.jar - $JAVAROOT/lib/lucene-analyzers-phonetic-4.6.1.jar - $JAVAROOT/lib/lucene-classification-4.6.1.jar - $JAVAROOT/lib/lucene-codecs-4.6.1.jar - $JAVAROOT/lib/lucene-core-4.6.1.jar - $JAVAROOT/lib/lucene-facet-4.6.1.jar - $JAVAROOT/lib/lucene-grouping-4.6.1.jar - $JAVAROOT/lib/lucene-highlighter-4.6.1.jar - $JAVAROOT/lib/lucene-join-4.6.1.jar - $JAVAROOT/lib/lucene-memory-4.6.1.jar - $JAVAROOT/lib/lucene-misc-4.6.1.jar - $JAVAROOT/lib/lucene-queries-4.6.1.jar - $JAVAROOT/lib/lucene-queryparser-4.6.1.jar - $JAVAROOT/lib/lucene-spatial-4.6.1.jar - $JAVAROOT/lib/lucene-suggest-4.6.1.jar + $JAVAROOT/lib/lucene-analyzers-common-4.7.1.jar + $JAVAROOT/lib/lucene-analyzers-phonetic-4.7.1.jar + $JAVAROOT/lib/lucene-classification-4.7.1.jar + $JAVAROOT/lib/lucene-codecs-4.7.1.jar + $JAVAROOT/lib/lucene-core-4.7.1.jar + $JAVAROOT/lib/lucene-facet-4.7.1.jar + $JAVAROOT/lib/lucene-grouping-4.7.1.jar + $JAVAROOT/lib/lucene-highlighter-4.7.1.jar + $JAVAROOT/lib/lucene-join-4.7.1.jar + $JAVAROOT/lib/lucene-memory-4.7.1.jar + $JAVAROOT/lib/lucene-misc-4.7.1.jar + $JAVAROOT/lib/lucene-queries-4.7.1.jar + $JAVAROOT/lib/lucene-queryparser-4.7.1.jar + $JAVAROOT/lib/lucene-spatial-4.7.1.jar + $JAVAROOT/lib/lucene-suggest-4.7.1.jar $JAVAROOT/lib/metadata-extractor-2.6.2.jar $JAVAROOT/lib/noggit-0.5.jar $JAVAROOT/lib/pdfbox-1.8.4.jar @@ -99,9 +99,9 @@ $JAVAROOT/lib/servlet-api-3.0.jar $JAVAROOT/lib/slf4j-api-1.7.2.jar $JAVAROOT/lib/slf4j-jdk14-1.7.2.jar - $JAVAROOT/lib/solr-core-4.6.1.jar - $JAVAROOT/lib/solr-solrj-4.6.1.jar - $JAVAROOT/lib/spatial4j-0.3.jar + $JAVAROOT/lib/solr-core-4.7.1.jar + $JAVAROOT/lib/solr-solrj-4.7.1.jar + $JAVAROOT/lib/spatial4j-0.4.1.jar $JAVAROOT/lib/webcat-0.1-swf.jar $JAVAROOT/lib/wstx-asl-3.2.9.jar $JAVAROOT/lib/xercesImpl.jar diff --git a/build.xml b/build.xml index 0819c58ca..c73db345d 100644 --- a/build.xml +++ b/build.xml @@ -201,21 +201,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -224,9 +224,9 @@ - - - + + + diff --git a/defaults/solr/solrconfig.xml b/defaults/solr/solrconfig.xml index 02ceec670..375420cd8 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. --> - 4.6 + 4.7