diff --git a/IsraelHiking.DataAccess/ElasticSearch/ElasticSearchHelper.cs b/IsraelHiking.DataAccess/ElasticSearch/ElasticSearchHelper.cs index 46358f57f..d1c1829ef 100644 --- a/IsraelHiking.DataAccess/ElasticSearch/ElasticSearchHelper.cs +++ b/IsraelHiking.DataAccess/ElasticSearch/ElasticSearchHelper.cs @@ -7,7 +7,7 @@ public class ElasticSearchHelper : BaseNssmHelper protected override string RelativePath => "ElasticSearch"; protected override string Name => "\"Elastic Search Service\""; protected override string Description => "Name search service for israel hiking site"; - protected override string CommandLine => "java -Delasticsearch -Des-foreground=yes -Des.path.home=\"./ \" -cp \"lib/elasticsearch-2.2.1.jar;lib/*\" \"org.elasticsearch.bootstrap.Elasticsearch\" start"; + protected override string CommandLine => "java -Delasticsearch -Des-foreground=yes -Des.path.home=\"./ \" -cp \"lib/elasticsearch-2.3.5.jar;lib/*\" \"org.elasticsearch.bootstrap.Elasticsearch\" start"; public ElasticSearchHelper(ILogger logger, IProcessHelper processHelper) : base(logger, processHelper) { diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/elasticsearch-2.2.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/elasticsearch-2.3.5.jar similarity index 57% rename from IsraelHiking.DataAccess/ElasticSearch/lib/elasticsearch-2.2.1.jar rename to IsraelHiking.DataAccess/ElasticSearch/lib/elasticsearch-2.3.5.jar index f36e70bb5..a4dd56dba 100644 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/elasticsearch-2.2.1.jar and b/IsraelHiking.DataAccess/ElasticSearch/lib/elasticsearch-2.3.5.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-core-2.6.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-core-2.6.6.jar similarity index 62% rename from IsraelHiking.DataAccess/ElasticSearch/lib/jackson-core-2.6.2.jar rename to IsraelHiking.DataAccess/ElasticSearch/lib/jackson-core-2.6.6.jar index a7d87f067..cbec17cd3 100644 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-core-2.6.2.jar and b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-core-2.6.6.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.2.jar deleted file mode 100644 index c924e6386..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.2.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.6.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.6.jar new file mode 100644 index 000000000..f5f6541b8 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.6.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.2.jar deleted file mode 100644 index 34113c012..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.2.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.6.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.6.jar new file mode 100644 index 000000000..39529a108 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.6.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-yaml-2.6.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-yaml-2.6.6.jar similarity index 85% rename from IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-yaml-2.6.2.jar rename to IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-yaml-2.6.6.jar index f2bb0c6e3..6b619f84d 100644 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-yaml-2.6.2.jar and b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-yaml-2.6.6.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/joda-time-2.8.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/joda-time-2.9.4.jar similarity index 62% rename from IsraelHiking.DataAccess/ElasticSearch/lib/joda-time-2.8.2.jar rename to IsraelHiking.DataAccess/ElasticSearch/lib/joda-time-2.9.4.jar index 05960ff12..3f2f2763f 100644 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/joda-time-2.8.2.jar and b/IsraelHiking.DataAccess/ElasticSearch/lib/joda-time-2.9.4.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-analyzers-common-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-analyzers-common-5.5.0.jar similarity index 85% rename from IsraelHiking.DataAccess/ElasticSearch/lib/lucene-analyzers-common-5.4.1.jar rename to IsraelHiking.DataAccess/ElasticSearch/lib/lucene-analyzers-common-5.5.0.jar index bcbeedb93..f4706ba9f 100644 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-analyzers-common-5.4.1.jar and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-analyzers-common-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.4.1.jar deleted file mode 100644 index 67b83eefa..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.5.0.jar new file mode 100644 index 000000000..6be43920e Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-core-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-core-5.5.0.jar similarity index 74% rename from IsraelHiking.DataAccess/ElasticSearch/lib/lucene-core-5.4.1.jar rename to IsraelHiking.DataAccess/ElasticSearch/lib/lucene-core-5.5.0.jar index 769566bc8..ef6a46015 100644 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-core-5.4.1.jar and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-core-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.4.1.jar deleted file mode 100644 index 06ed59dda..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.5.0.jar new file mode 100644 index 000000000..b29482ae7 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.4.1.jar deleted file mode 100644 index 381ea4759..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.5.0.jar new file mode 100644 index 000000000..b7d9e45f9 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.4.1.jar deleted file mode 100644 index 16a3e8792..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.5.0.jar new file mode 100644 index 000000000..d6b436ca5 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.4.1.jar deleted file mode 100644 index 6b65fe259..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.5.0.jar new file mode 100644 index 000000000..81c1acdd8 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.4.1.jar deleted file mode 100644 index 8d36fe7ed..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.5.0.jar new file mode 100644 index 000000000..789a77f4b Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.4.1.jar deleted file mode 100644 index 168771d5d..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.5.0.jar new file mode 100644 index 000000000..895138abe Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.4.1.jar deleted file mode 100644 index f7c2e477c..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.5.0.jar new file mode 100644 index 000000000..e69bb905c Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.4.1.jar deleted file mode 100644 index 530aa27f0..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.5.0.jar new file mode 100644 index 000000000..8b438514e Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.4.1.jar deleted file mode 100644 index f534568aa..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.5.0.jar new file mode 100644 index 000000000..adcbae78d Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.4.1.jar deleted file mode 100644 index 27b24f379..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.5.0.jar new file mode 100644 index 000000000..46774975a Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.4.1.jar deleted file mode 100644 index 348a75501..000000000 Binary files a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.4.1.jar and /dev/null differ diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.5.0.jar new file mode 100644 index 000000000..191a0b3d1 Binary files /dev/null and b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.5.0.jar differ diff --git a/IsraelHiking.DataAccess/IsraelHiking.DataAccess.csproj b/IsraelHiking.DataAccess/IsraelHiking.DataAccess.csproj index bc8e66741..f9f2099c3 100644 --- a/IsraelHiking.DataAccess/IsraelHiking.DataAccess.csproj +++ b/IsraelHiking.DataAccess/IsraelHiking.DataAccess.csproj @@ -243,7 +243,7 @@ PreserveNewest - + PreserveNewest @@ -255,16 +255,16 @@ PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest @@ -273,7 +273,7 @@ PreserveNewest - + PreserveNewest @@ -285,46 +285,46 @@ PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/IsrealHiking.Web/OSM2012.pubxml b/IsrealHiking.Web/OSM2012.pubxml index ebb9dcb5f..5730a54ec 100644 --- a/IsrealHiking.Web/OSM2012.pubxml +++ b/IsrealHiking.Web/OSM2012.pubxml @@ -31,7 +31,4 @@ by editing this MSBuild file. In order to learn more about this please visit htt False - - - \ No newline at end of file