fix gradle distribution and package naming

.gitignore

@@ -1,7 +1,5 @@
 .gradle
 build/
 gradle-app.setting
-!gradle-wrapper.jar
 .gradletasknamecache
 /.idea
-/gradle

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.1'
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-        classpath 'pl.allegro.tech.build:axion-release-plugin:0.9.5'
+        classpath 'pl.allegro.tech.build:axion-release-plugin:1.3.4'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu Jun 23 22:26:38 CEST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# 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"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# 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
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+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

src/main/groovy/com/pszymczyk/consul/ConsulStarter.groovy

@@ -1,9 +1,9 @@
 package com.pszymczyk.consul
 
-import com.pszymczyk.consul.infrstructure.AntUnzip
-import com.pszymczyk.consul.infrstructure.ConsulWaiter
-import com.pszymczyk.consul.infrstructure.HttpBinaryRepository
-import com.pszymczyk.consul.infrstructure.Ports
+import com.pszymczyk.consul.infrastructure.AntUnzip
+import com.pszymczyk.consul.infrastructure.ConsulWaiter
+import com.pszymczyk.consul.infrastructure.HttpBinaryRepository
+import com.pszymczyk.consul.infrastructure.Ports
 import org.codehaus.groovy.runtime.IOGroovyMethods
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

src/main/groovy/com/pszymczyk/consul/ConsulStarterBuilder.groovy

@@ -1,6 +1,6 @@
 package com.pszymczyk.consul
 
-import com.pszymczyk.consul.infrstructure.Ports
+import com.pszymczyk.consul.infrastructure.Ports
 
 import java.nio.file.Files
 import java.nio.file.Path

src/main/groovy/com/pszymczyk/consul/infrstructure/AntUnzip.groovy → src/main/groovy/com/pszymczyk/consul/infrastructure/AntUnzip.groovy

@@ -1,4 +1,4 @@
-package com.pszymczyk.consul.infrstructure
+package com.pszymczyk.consul.infrastructure
 
 import java.nio.file.Files
 import java.nio.file.Paths

src/main/groovy/com/pszymczyk/consul/infrstructure/ConsulWaiter.groovy → src/main/groovy/com/pszymczyk/consul/infrastructure/ConsulWaiter.groovy

@@ -1,4 +1,4 @@
-package com.pszymczyk.consul.infrstructure
+package com.pszymczyk.consul.infrastructure
 
 import com.pszymczyk.consul.EmbeddedConsulException
 

src/main/groovy/com/pszymczyk/consul/infrstructure/HttpBinaryRepository.groovy → src/main/groovy/com/pszymczyk/consul/infrastructure/HttpBinaryRepository.groovy

@@ -1,4 +1,4 @@
-package com.pszymczyk.consul.infrstructure
+package com.pszymczyk.consul.infrastructure
 
 public class HttpBinaryRepository {
 

src/main/groovy/com/pszymczyk/consul/infrstructure/OsResolver.groovy → src/main/groovy/com/pszymczyk/consul/infrastructure/OsResolver.groovy

@@ -1,4 +1,4 @@
-package com.pszymczyk.consul.infrstructure;
+package com.pszymczyk.consul.infrastructure;
 
 class OsResolver {
 

src/main/groovy/com/pszymczyk/consul/infrstructure/Ports.groovy → src/main/groovy/com/pszymczyk/consul/infrastructure/Ports.groovy

@@ -1,4 +1,4 @@
-package com.pszymczyk.consul.infrstructure
+package com.pszymczyk.consul.infrastructure
 
 import org.codehaus.groovy.runtime.IOGroovyMethods
 

src/test/groovy/com/pszymczyk/consul/infrstructure/ConsulWaiterTest.groovy → src/test/groovy/com/pszymczyk/consul/infrastructure/ConsulWaiterTest.groovy

@@ -1,4 +1,4 @@
-package com.pszymczyk.consul.infrstructure
+package com.pszymczyk.consul.infrastructure
 
 import com.pszymczyk.consul.EmbeddedConsulException
 import spock.lang.Specification