Update to 1.1.0.

This upgade requires a full cluster restart.

Changes: http://www.elasticsearch.org/downloads/1-1-0/

5 files changed, 20 insertions, 12 deletions

diff --git a/UPDATING b/UPDATING
index fcc2907e46ba..dd194524c60d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140402:
+  AFFECTS: users of textproc/elasticsearch
+  AUTHOR: tj@FreeBSD.org
+
+  Elasticsearch has been updated to version 1.1.0. If you are updating 
+  from a version prior to 1.0.0 you will need to do a full cluster 
+  shutdown for this update as it can not be performed in a rolling
+  fashion.
+
 20140401:
   AFFECTS: users of security/gnutls3
   AUTHOR: bdrewery@FreeBSD.org
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index 1df60a12d3eb..7de748ffc4f3 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	0.90.11
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -24,11 +23,11 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-LUCENEVER=	4.6.1
+LUCENEVER=	4.7.0
 CONFIG_FILES=	elasticsearch.yml logging.yml
 JARS=		elasticsearch-${PORTVERSION}.jar \
 		jna-3.3.0.jar \
-		jts-1.12.jar \
+		jts-1.13.jar \
 		log4j-1.2.17.jar \
 		lucene-analyzers-common-${LUCENEVER}.jar \
 		lucene-codecs-${LUCENEVER}.jar \
@@ -42,7 +41,7 @@ JARS=		elasticsearch-${PORTVERSION}.jar \
 		lucene-sandbox-${LUCENEVER}.jar \
 		lucene-spatial-${LUCENEVER}.jar \
 		lucene-suggest-${LUCENEVER}.jar \
-		spatial4j-0.3.jar
+		spatial4j-0.4.1.jar
 DOCS=		LICENSE.txt \
 		NOTICE.txt \
 		README.textile
diff --git a/textproc/elasticsearch/distinfo b/textproc/elasticsearch/distinfo
index 732db2fdb652..790014b2f7ca 100644
--- a/textproc/elasticsearch/distinfo
+++ b/textproc/elasticsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-0.90.11.tar.gz) = cff503078fcb3e1b1d2b966e9173599be38a1a451278f587415c7f2311fd5697
-SIZE (elasticsearch-0.90.11.tar.gz) = 18147996
+SHA256 (elasticsearch-1.1.0.tar.gz) = 8f409517e027f1497f3690bf4dc9967a75212089792a32994f8ce47fd4a549cc
+SIZE (elasticsearch-1.1.0.tar.gz) = 19867444
diff --git a/textproc/elasticsearch/files/elasticsearch.in b/textproc/elasticsearch/files/elasticsearch.in
index 1e4f27500cfa..feac0198ca64 100644
--- a/textproc/elasticsearch/files/elasticsearch.in
+++ b/textproc/elasticsearch/files/elasticsearch.in
@@ -68,7 +68,7 @@ start_precmd="elasticsearch_precmd"
 status_cmd="elasticsearch_status"
 stop_cmd="elasticsearch_stop"
 command="/usr/sbin/daemon"
-command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.ElasticSearch"
+command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch"
 
 elasticsearch_precmd() {
         touch ${pidfile}
@@ -79,7 +79,7 @@ elasticsearch_precmd() {
 }
 
 elasticsearch_console () {
-	%%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.ElasticSearch
+	%%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch
 }
 
 
@@ -121,7 +121,7 @@ elasticsearch_check_pidfile() {
 		debug "pid file ($_pidfile): no pid in file."
 		return
 	fi
-	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid org.elasticsearch.bootstrap.ElasticSearch\$"`" ]; then
+	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid org.elasticsearch.bootstrap.Elasticsearch\$"`" ]; then
 		echo -n $_pid
 	fi
 }
diff --git a/textproc/elasticsearch/pkg-plist b/textproc/elasticsearch/pkg-plist
index fb0a611a8e59..c33e416ae704 100644
--- a/textproc/elasticsearch/pkg-plist
+++ b/textproc/elasticsearch/pkg-plist
@@ -13,7 +13,7 @@ etc/elasticsearch/logging.yml.sample
 bin/elasticsearch-plugin
 lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
 lib/elasticsearch/jna-3.3.0.jar
-lib/elasticsearch/jts-1.12.jar
+lib/elasticsearch/jts-1.13.jar
 lib/elasticsearch/log4j-1.2.17.jar
 lib/elasticsearch/lucene-analyzers-common-%%LUCENEVER%%.jar
 lib/elasticsearch/lucene-codecs-%%LUCENEVER%%.jar
@@ -28,7 +28,7 @@ lib/elasticsearch/lucene-sandbox-%%LUCENEVER%%.jar
 lib/elasticsearch/lucene-spatial-%%LUCENEVER%%.jar
 lib/elasticsearch/lucene-suggest-%%LUCENEVER%%.jar
 lib/elasticsearch/sigar/sigar-1.6.4.jar
-lib/elasticsearch/spatial4j-0.3.jar
+lib/elasticsearch/spatial4j-0.4.1.jar
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile