From 31362e4c601ff49b8dd37ef04283cce6fa1f130c Mon Sep 17 00:00:00 2001 From: kimchy Date: Thu, 9 Sep 2010 00:53:20 +0300 Subject: [PATCH] upgrade to joda 1.6 --- .../index/mapper/xcontent/XContentGeoPointFieldMapper.java | 6 +++++- modules/jarjar/build.gradle | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentGeoPointFieldMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentGeoPointFieldMapper.java index 83dbf35053e..19d575b0df3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentGeoPointFieldMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentGeoPointFieldMapper.java @@ -365,7 +365,11 @@ public class XContentGeoPointFieldMapper implements XContentMapper, XContentArra builder.field("lat_lon", enableLatLon); builder.field("geohash", enableGeohash); builder.field("resolution", resolution); - builder.field("store", latMapper.name().toLowerCase()); + if (latMapper != null) { + builder.field("store", latMapper.store().name().toLowerCase()); + } else if (geohashMapper != null) { + builder.field("store", geohashMapper.store().name().toLowerCase()); + } builder.field("geohash_precision", geohashPrecision); if (precisionStep != null) { builder.field("precision_step", precisionStep); diff --git a/modules/jarjar/build.gradle b/modules/jarjar/build.gradle index 83b2ff2f180..c9f810fe930 100644 --- a/modules/jarjar/build.gradle +++ b/modules/jarjar/build.gradle @@ -15,7 +15,7 @@ dependencies { runtime 'joda-time:joda-time:1.6.1' runtime 'org.mvel:mvel2:2.0.17' - runtime 'org.codehaus.jackson:jackson-core-asl:1.5.5' + runtime 'org.codehaus.jackson:jackson-core-asl:1.6.0' runtime 'org.yaml:snakeyaml:1.6' runtime('org.jboss.netty:netty:3.2.2.Final') { transitive = false }