es 2.2.0

.travis.yml

@@ -1,5 +1,4 @@
 language: java
 
 jdk:
-  - oraclejdk8
-  - oraclejdk7
+  - oraclejdk8

build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 group = 'com.github.zengde'
-version = '2.1.1'
+version = '2.2.0'
 
 description = """elasticsearch-image"""
 
@@ -23,18 +23,18 @@ sourceSets {
 }
 
 dependencies {
-    compile(group: 'org.elasticsearch', name: 'elasticsearch', version:'2.1.1') {
+    compile(group: 'org.elasticsearch', name: 'elasticsearch', version:'2.2.0') {
 exclude(module: 'junit')
     }
     compile group: 'com.twelvemonkeys.imageio', name: 'imageio-jpeg', version:'3.1.2'
     compile group: 'com.drewnoakes', name: 'metadata-extractor', version:'2.8.1'
     compile group: 'com.github.zengde', name: 'lire', version:'1.0b2'
-    compile(group: 'org.elasticsearch', name: 'elasticsearch', version: '2.1.1', ext: 'jar', classifier: 'tests')
-    testCompile(group: 'org.apache.lucene', name: 'lucene-test-framework', version:'5.3.1') {
+    compile(group: 'org.elasticsearch', name: 'elasticsearch', version: '2.2.0', ext: 'jar', classifier: 'tests')
+    testCompile(group: 'org.apache.lucene', name: 'lucene-test-framework', version:'5.4.1') {
 exclude(module: 'junit')
     }
     testCompile group: 'log4j', name: 'log4j', version:'1.2.17'
-    testCompile group: 'org.elasticsearch', name: 'elasticsearch', version:'2.1.1'
+    testCompile group: 'org.elasticsearch', name: 'elasticsearch', version:'2.2.0'
     testCompile group: 'org.hamcrest', name: 'hamcrest-all', version:'1.3'
     testCompile(group: 'junit', name: 'junit-dep', version:'4.10') {
 exclude(module: 'hamcrest-core')

src/main/java/org/elasticsearch/index/mapper/image/ImageMapper.java

@@ -90,7 +90,7 @@ public static class Builder extends FieldMapper.Builder<Builder, ImageMapper> {
         private String hash="";
 
         public Builder(String name) {
-            super(name, Defaults.FIELD_TYPE);
+            super(name,Defaults.FIELD_TYPE ,Defaults.FIELD_TYPE);
             builder = this;
         }
 

src/main/java/org/elasticsearch/index/query/image/ImageQuery.java

@@ -100,6 +100,11 @@ public boolean matches() throws IOException {
 
                     return matchingDocs.get(doc);
                 }
+
+                @Override
+                public float matchCost() {
+                    return 0;
+                }
             };
             return new ImageScorer(context.reader(), this,twoPhase,getBoost());
         }

src/main/resources/plugin-descriptor.properties

@@ -35,7 +35,7 @@
 description=Image Plugin for ElasticSearch.
 #
 # 'version': plugin's version
-version=2.1.1
+version=2.2.0
 #
 # 'name': the plugin name
 name=elasticsearch-image
@@ -69,7 +69,7 @@ java.version=1.7
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=2.1.1
+elasticsearch.version=2.2.0
 #
 ### deprecated elements for jvm plugins :
 #