update es 1.4 snapshot

Original commit: elastic/x-pack-elasticsearch@ec23733d6e

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <elasticsearch.version>1.4.0-SNAPSHOT</elasticsearch.version>
-        <lucene.version>4.10.0</lucene.version>
+        <lucene.version>4.10.1</lucene.version>
     </properties>
 
     <dependencies>

src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java

@@ -55,10 +55,11 @@ public class LicensePlugin extends AbstractPlugin {
     public Collection<Class<? extends LifecycleComponent>> services() {
         return ImmutableSet.<Class<? extends LifecycleComponent>>of(LicensesService.class);
     }
-/*
+
+    /*
     @Override
     public Collection<Class<? extends Module>> modules() {
         return ImmutableSet.<Class<? extends Module>>of(LicenseModule.class);
-    } */
+    }*/
     //TODO: module binding? (LicenseModule)
 }

src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java

@@ -75,7 +75,7 @@ public class LicensesMetaData implements MetaData.Custom, ESLicenses {
     /**
      * Licenses metadata factory
      */
-    public static class Factory implements MetaData.Custom.Factory<LicensesMetaData> {
+    public static class Factory extends MetaData.Custom.Factory<LicensesMetaData> {
 
         /**
          * {@inheritDoc}
@@ -143,16 +143,10 @@ public class LicensesMetaData implements MetaData.Custom, ESLicenses {
             builder.endObject();
         }
 
-        @Override
-        public boolean isPersistent() {
-            return true;
-        }
-
-        /*
         @Override
         public EnumSet<MetaData.XContentContext> context() {
-            return MetaData.API_AND_GATEWAY;
-        }*/
+            return EnumSet.of(MetaData.XContentContext.API);
+        }
 
 
         private final static class Fields {

src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java

@@ -29,16 +29,16 @@ import org.elasticsearch.license.plugin.action.put.PutLicenseRequest;
  */
 public class LicensesService extends AbstractLifecycleComponent<LicensesService> implements ClusterStateListener {
 
-    private final Injector injector;
+   // private final Injector injector;
 
     private final ClusterService clusterService;
 
     //private volatile ESLicenses licenses = null;//ImmutableMap.of();
 
     @Inject
-    public LicensesService(Settings settings, ClusterService clusterService, Injector injector) {
+    public LicensesService(Settings settings, ClusterService clusterService/*, Injector injector*/) {
         super(settings);
-        this.injector = injector;
+        //this.injector = injector;
         this.clusterService = clusterService;
         // Doesn't make sense to maintain repositories on non-master and non-data nodes
         // Nothing happens there anyway