From 58c266ce13518fa937fd955ab144a1847821436e Mon Sep 17 00:00:00 2001
From: Areek Zillur <areek.zillur@elasticsearch.com>
Date: Tue, 7 Oct 2014 12:03:50 -0400
Subject: [PATCH] update es 1.4 snapshot

Original commit: elastic/x-pack-elasticsearch@ec23733d6ec3e28f449c24ffc7fdd0b7abcea2ef
---
 pom.xml                                              |  2 +-
 .../elasticsearch/license/plugin/LicensePlugin.java  |  5 +++--
 .../license/plugin/core/LicensesMetaData.java        | 12 +++---------
 .../license/plugin/core/LicensesService.java         |  6 +++---
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5714e71685a..ffbbd1c8d65 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java b/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java
index 8c0e593d8c6..8ca165a5993 100644
--- a/src/main/java/org/elasticsearch/license/plugin/LicensePlugin.java
+++ b/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)
 }
diff --git a/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java b/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java
index 0b1e52b95d5..fbc2c390d74 100644
--- a/src/main/java/org/elasticsearch/license/plugin/core/LicensesMetaData.java
+++ b/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 {
diff --git a/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java b/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java
index 5d7b9134f24..09509f45a17 100644
--- a/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java
+++ b/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