From 5a691986a1e6e567921f38c665a127c630c1a500 Mon Sep 17 00:00:00 2001
From: Martin Sachs <sachs.martin@gmail.com>
Date: Fri, 4 Jul 2014 12:40:30 +0200
Subject: [PATCH] DATAES-94 - Bump to support ES 1.2.0

---
 pom.xml     | 2 +-
 template.mf | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7fec87255..a55d162c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 		<commonscollections>3.2.1</commonscollections>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>1.1.1</elasticsearch>
+		<elasticsearch>1.2.1</elasticsearch>
 		<springdata.commons>1.9.0.BUILD-SNAPSHOT</springdata.commons>
 
 	</properties>
diff --git a/template.mf b/template.mf
index 11f176c03..dc8c2142d 100644
--- a/template.mf
+++ b/template.mf
@@ -11,8 +11,8 @@ Import-Template:
  org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional,
  org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
  com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
- org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.1.1)}",
- org.apache.lucene.*;version="4.7.2",
+ org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.2.1)}",
+ org.apache.lucene.*;version="4.8.1",
  org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
  org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
  org.springframework.*;version="${spring:[=.=.=.=,+1.0.0)}",