update to Elasticsearch 2.3.3

Author: jprante

README.md

@@ -27,6 +27,7 @@ When importing archive files again, this information is reapplied.
 
 | Elasticsearch  |   Plugin       | Release date |
 | -------------- | -------------- | ------------ |
+| 2.3.3          | 2.3.3.0        | May 23, 2016 |
 | 2.3.1          | 2.3.1.0        | Apr 21, 2016 |
 | 2.3.0          | 2.3.0.0        | Mar 31, 2016 |
 | 2.2.1          | 2.2.1.0        | Mar 31, 2016 |
@@ -41,7 +42,7 @@ For older releases and 1.x versions, see the repective branches.
 
 ## Installation 2.x
 
-    ./bin/plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-knapsack/2.3.1.0/elasticsearch-knapsack-2.3.1.0-plugin.zip
+    ./bin/plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-knapsack/2.3.3.0/elasticsearch-knapsack-2.3.3.0-plugin.zip
 
 Do not forget to restart the node after installation.
 

build.gradle

@@ -26,7 +26,7 @@ println "Build: group: '${project.group}', name: '${project.name}', version: '${
 println "Timestamp: " + java.time.Instant.now().atZone(java.time.ZoneId.systemDefault()).toString()
 
 group = 'org.xbib.elasticsearch.plugin'
-version = '2.3.2.0'
+version = '2.3.3.0'
 
 ext {
     pluginName = 'knapsack'
@@ -38,8 +38,8 @@ ext {
     scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
     scmDeveloperConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
     versions = [
-        'elasticsearch' : '2.3.2',
-        'elasticsearch-helper' : '2.3.2.0',
+        'elasticsearch' : '2.3.3',
+        'elasticsearch-helper' : '2.3.3.0',
         'log4j': '2.5',
         'junit' : '4.12',
         'wagon' : '2.10'
@@ -88,7 +88,6 @@ dependencies {
     testCompile "junit:junit:${versions.junit}"
     integrationTestCompile "junit:junit:${versions.junit}"
     releaseJars "${project.group}:${project.name}:${project.version}"
-    //releaseJars "${project.group}:${project.name}:${project.version}:all"
     wagon "org.apache.maven.wagon:wagon-ssh-external:${versions.wagon}"
 }
 

gradle/publish.gradle

@@ -15,7 +15,9 @@ nexusStaging {
     packageGroup = "org.xbib"
 }
 
-uploadArchives {
+task xbibUpload(type: Upload) {
+    configuration = configurations.archives
+    uploadDescriptor = true
     repositories {
         if (project.hasProperty("xbibUsername")) {
             mavenDeployer {
@@ -25,6 +27,13 @@ uploadArchives {
                         authentication: [userName: xbibUsername, privateKey: xbibPrivateKey])
             }
         }
+    }
+}
+
+task mavenCentralUpload(type: Upload) {
+    configuration = configurations.archives
+    uploadDescriptor = true
+    repositories {
         if (project.hasProperty('ossrhUsername')) {
             mavenDeployer {
                 beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
@@ -37,7 +46,7 @@ uploadArchives {
                     description pluginDescription
                     packaging 'jar'
                     inceptionYear '2012'
-                    url url
+                    url scmUrl
                     organization {
                         name 'xbib'
                         url 'http://xbib.org'
@@ -67,6 +76,7 @@ uploadArchives {
     }
 }
 
+
 if (project.hasProperty('githubToken')) {
     github {
         owner = user

src/main/java/org/xbib/elasticsearch/action/knapsack/state/TransportKnapsackStateAction.java

@@ -49,11 +49,13 @@ public TransportKnapsackStateAction(Settings settings,
     protected void doExecute(final KnapsackStateRequest request, ActionListener<KnapsackStateResponse> listener) {
         final KnapsackStateResponse response = new KnapsackStateResponse();
         try {
-            for (KnapsackState state : knapsack.getExports()) {
-                response.addState(state);
-            }
-            for (KnapsackState state : knapsack.getImports()) {
-                response.addState(state);
+            if (knapsack != null) {
+                for (KnapsackState state : knapsack.getExports()) {
+                    response.addState(state);
+                }
+                for (KnapsackState state : knapsack.getImports()) {
+                    response.addState(state);
+                }
             }
             listener.onResponse(response);
         } catch (Throwable e) {