honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to joda 1.6

This commit is contained in:
kimchy 2010-09-09 00:53:20 +03:00
parent a768016779
commit 31362e4c60
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentGeoPointFieldMapper.java
View File

@ -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);

2
modules/jarjar/build.gradle
View File

@ -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 }