Switched to Gradle

.gitignore

@@ -8,9 +8,9 @@
 *.iml
 *.iws
 
+# Gradle
+.gradle
+build
+
 # Mac
 .DS_Store
-
-# Maven
-log/
-target/

README.md

@@ -1,23 +1,21 @@
 Consul Based Discovery Plugin for Elasticsearch
-======================================
+===============================================
 
 Uses [Consul](https://consul.io) API for Elasticsearch discovery
 
-## Installation
+## Build
 
-Do `vagrant up`, `vagrant ssh` and then run `mvn package` to build.
+Run `gradle build` to build plugin.
 
-The plugin ZIP will be under target/releases/
+The plugin zip archive will be under build/distributions/
 
-Do
+## Installation
 
 ```
-bin/plugin --url file:///path-to-plugin-zip --install lithiumtech/elasticsearch-consul-discovery
+./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-consul-discovery-5.5.2.0.zip
 ```
 
-to install plugin.
-
-For easy provisioning, an RPM file is created under target/rpm if you do `mvn package rpm:rpm`. The plugin ZIP will be under /usr/local/lib when the RPM has been installed.
+**Do not forget to restart the node after installation !**
 
 ## Configuration
 

build.gradle

@@ -0,0 +1,115 @@
+buildscript {
+	repositories {
+		jcenter()
+		mavenCentral()
+	}
+	dependencies {
+		classpath 'co.riiid:gradle-github-plugin:0.4.2'
+		classpath 'com.github.skhatri:gradle-s3-plugin:1.0.4'
+	}
+}
+
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'co.riiid.gradle'
+apply plugin: 's3'
+
+println "Host: " + java.net.InetAddress.getLocalHost()
+println "Gradle: " + gradle.gradleVersion + " JVM: " + org.gradle.internal.jvm.Jvm.current() + " Groovy: " + GroovySystem.getVersion()
+println "Build: group: '${project.group}', name: '${project.name}', version: '${project.version}'"
+println "Timestamp: " + java.time.Instant.now().atZone(java.time.ZoneId.systemDefault()).toString()
+
+ext {
+	versions = [
+		'elasticsearch' : version.replaceAll(/\.[0-9]+$/, ''),
+		'gson' : '2.3.1',
+		'log4j': '2.6.2',
+	]
+}
+
+repositories {
+	mavenCentral()
+	mavenLocal()
+}
+
+configurations {
+	releaseJars {
+		extendsFrom runtime
+		exclude group: 'org.elasticsearch'
+		exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+		exclude group: 'org.apache.logging.log4j'
+	}
+}
+
+dependencies {
+	compile "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
+	compile "com.google.code.gson:gson:${versions.gson}"
+	compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
+	releaseJars "${project.group}:${project.name}:${project.version}"
+}
+
+tasks.withType(JavaCompile) {
+	options.compilerArgs << '-Xlint:unchecked,deprecation'
+}
+
+task javadocJar(type: Jar, dependsOn: classes) {
+	from javadoc
+	into 'build/tmp'
+	classifier 'javadoc'
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+	from sourceSets.main.allSource
+	into 'build/tmp/sources'
+	classifier 'sources'
+}
+
+task copyPluginFiles(type: Copy) {
+	from 'src/main/templates'
+	into 'build/tmp/plugin'
+	expand([
+		'descriptor': [
+			'name': pluginName,
+			'classname': pluginClassname,
+			'description': pluginDescription,
+			'version': project.property('version'),
+			'javaVersion': project.property('targetCompatibility'),
+			'elasticsearchVersion' : versions.elasticsearch
+		]
+	])
+	outputs.upToDateWhen { false }
+}
+
+task buildPluginZip(type: Zip, dependsOn: [':jar', ':copyPluginFiles']) {
+	from configurations.releaseJars
+	from 'build/tmp/plugin'
+	into 'elasticsearch'
+}
+
+artifacts {
+	archives javadocJar, sourcesJar, buildPluginZip
+}
+
+github {
+	owner = github_owner
+	repo = project.name
+	token = System.getenv('GRADLE_GITHUB_TOKEN')
+	tagName = version
+	targetCommitish = 'master'
+	name = version
+	assets = [
+			"build/distributions/${project.name}-${version}.zip"
+	]
+}
+
+s3 {
+	bucket = s3_bucket
+	awsProfile = 'default'
+	upload {
+		key = "elasticsearch/${project.name}-${version}.zip"
+		file = "build/distributions/${project.name}-${version}.zip"
+	}
+}
+
+task release (dependsOn: ['buildPluginZip', 'githubRelease', 's3Upload']) {
+}

gradle.properties

@@ -0,0 +1,12 @@
+org.gradle.daemon = true
+
+group = org.elasticsearch.plugin.discovery
+
+version = 5.5.2.0
+
+pluginName = consul-discovery
+pluginClassname = org.elasticsearch.plugin.discovery.ConsulDiscoveryPlugin
+pluginDescription = Consul Discovery
+
+github_owner = vvanholl
+s3_bucket = distfiles.compuscene.net

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Aug 29 09:24:40 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"