Merge branch 'gradle'
diff --git a/.gitignore b/.gitignore
index 2c51bc2..0d9437d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,23 @@
+.ant-targets*
+.classpath
+.gitignore
+.gradle
+.idea
+.project
+.settings
+/_eclipse/
TESTNG-*
-ivy*
+build
eclipse-build
+ivy*
javadocs
-target
lib
+maven-testng-plugin-1.2.jar
+nb-configuration.xml
+src/generated
+src/test/java/test/ignore
+target
test-output
test-output-tests
-z_build
-maven-testng-plugin-1.2.jar
-.settings
-src/test/java/test/ignore
-.classpath
-.project
-.idea
testng.iml
-.ant-targets*
-nb-configuration.xml
-/_eclipse/
+z_build
diff --git a/.travis.yml b/.travis.yml
index 45471e9..e52f871 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,6 @@
- oraclejdk7
- openjdk7
-install: mvn install -Dgpg.skip=true -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+#install: mvn install -Dgpg.skip=true -DskipTests=true -Dmaven.javadoc.skip=true -B -V
before_script: export TESTNG_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.4.0:exec)
-script: mvn -f pom-test.xml test -B
\ No newline at end of file
+script: ./build-with-gradle
diff --git a/build-with-gradle b/build-with-gradle
new file mode 100755
index 0000000..a48ce76
--- /dev/null
+++ b/build-with-gradle
@@ -0,0 +1 @@
+./gradlew --stacktrace clean build cleanTest test
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..93a2887
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,108 @@
+buildscript {
+ repositories {
+ mavenCentral()
+ jcenter()
+ maven {
+ url 'http://dl.bintray.com/cbeust/maven'
+ }
+ }
+}
+
+plugins {
+ id "com.jfrog.bintray" version "1.1"
+}
+
+version = '6.9.5-SNAPSHOT'
+
+apply plugin: 'java'
+apply from: 'gradle/publishing.gradle'
+
+repositories {
+ mavenCentral()
+ jcenter()
+ maven {
+ url 'http://dl.bintray.com/cbeust/maven'
+ }
+}
+
+dependencies {
+ compile 'org.apache.ant:ant:1.7.0'
+ compile 'junit:junit:4.10'
+ compile 'org.beanshell:bsh:2.0b4'
+ compile 'com.google.inject:guice:4.0:no_aop'
+ compile 'com.beust:jcommander:1.48'
+ compile 'org.yaml:snakeyaml:1.12'
+
+ testCompile 'org.assertj:assertj-core:2.0.0'
+ testCompile 'org.testng:testng:6.9.4'
+}
+
+task sourceJar(type: Jar) {
+ group 'Build'
+ description 'An archive of the source code'
+ classifier 'sources'
+ from sourceSets.main.allSource
+}
+
+artifacts {
+ sourceJar
+}
+
+import org.apache.tools.ant.filters.ReplaceTokens
+
+def generatedSourcesFolder = projectDir.toString() + '/src/generated/java'
+
+def dirFrom = projectDir.toString() + '/src/main/resources/org/testng/internal'
+def dirTo = generatedSourcesFolder + "/org/testng/internal"
+def fileFrom = 'VersionTemplateJava'
+def fileTo = 'Version.java'
+
+task removeVersion {
+ delete dirTo + fileTo
+}
+
+sourceSets {
+ generated {
+ java {
+ srcDir 'src/generated/java'
+ }
+ resources {
+ srcDir 'src/generated/resources'
+ }
+ }
+}
+
+sourceSets {
+ main {
+ compileClasspath += generated.output
+ runtimeClasspath += generated.output
+ }
+}
+
+gradle.projectsEvaluated {
+ compileJava.dependsOn(myDir)
+}
+
+task myDir {
+ delete dirTo + "/" + fileTo
+ mkdir(dirTo)
+}
+
+task createVersion(type: Copy, dependsOn: myDir) {
+ println("Creating Version file: ${version} in ${dirTo}")
+ from dirFrom
+ include fileFrom
+ into(dirTo)
+ rename(fileFrom, fileTo)
+ filter(ReplaceTokens, tokens: [version: version])
+}
+
+compileJava.dependsOn(createVersion)
+
+test {
+ useTestNG() {
+ suites 'src/test/resources/testng.xml'
+ }
+ systemProperties = System.getProperties()
+ systemProperties['test.resources.dir'] = 'build/resources/test/'
+}
diff --git a/gradle/buildWithTravis.sh b/gradle/buildWithTravis.sh
new file mode 100644
index 0000000..9f0ddf1
--- /dev/null
+++ b/gradle/buildWithTravis.sh
@@ -0,0 +1 @@
+../gradlew check
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
new file mode 100644
index 0000000..339487c
--- /dev/null
+++ b/gradle/publishing.gradle
@@ -0,0 +1,58 @@
+import java.text.SimpleDateFormat
+
+Date buildTimeAndDate = new Date()
+ext {
+ buildTime = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+ buildDate = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+}
+
+apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
+
+jar {
+ manifest {
+ attributes(
+ 'Built-By': System.properties['user.name'],
+ 'Created-By': System.properties['java.version'] + " (" + System.properties['java.vendor'] + " " + System.getProperty("java.vm.version") + ")",
+ 'Build-Date': project.buildTime,
+ 'Build-Time': project.buildDate,
+ 'Specification-Title': project.name,
+ 'Specification-Version': project.version,
+ )
+ }
+}
+
+publishing {
+ publications {
+ mavenCustom(MavenPublication) {
+ from components.java
+ artifact sourceJar
+
+ groupId 'com.beust'
+ artifactId 'klaxon'
+ version project.version
+ }
+ }
+}
+
+task install(dependsOn: publishToMavenLocal)
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+bintray {
+ user = properties.getProperty("bintray.user")
+ key = properties.getProperty("bintray.apikey")
+ publications = ['mavenCustom']
+ pkg {
+ repo = 'maven'
+ name = 'klaxon'
+ desc = 'JSON parsing for Kotlin'
+ licenses = ['Apache-2.0']
+ labels = ['kotlin']
+
+ version {
+ name = project.version //Bintray logical version name
+ }
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..085a1cd
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f3562e8
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun May 10 15:22:08 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# 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\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+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" ] ; 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"`
+
+ # 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
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..aa1f0b3
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,6 @@
+bintray.user=cbeust
+bintray.apikey=60ada4b8fecb43800b68580863aa5b5b82373607
+
+bintray.gpg.password=<your gpg signing password>
+bintray.oss.user=<your sonatype username>
+bintray.oss.password=<your sonatype password>
diff --git a/src/main/resources/org/testng/internal/Version.java b/src/generated/java/org/testng/internal/VersionTemplateJava
similarity index 76%
copy from src/main/resources/org/testng/internal/Version.java
copy to src/generated/java/org/testng/internal/VersionTemplateJava
index ab56291..e5185a6 100644
--- a/src/main/resources/org/testng/internal/Version.java
+++ b/src/generated/java/org/testng/internal/VersionTemplateJava
@@ -1,7 +1,7 @@
package org.testng.internal;
public class Version {
- public static final String VERSION = "${project.version}";
+ public static final String VERSION = "6.9.47-SNAPSHOT";
public static void displayBanner() {
System.out.println("...\n... TestNG " + VERSION + " by Cédric Beust (cedric@beust.com)\n...\n");
diff --git a/src/main/resources/org/testng/internal/Version.java b/src/main/resources/org/testng/internal/VersionTemplateJava
similarity index 76%
rename from src/main/resources/org/testng/internal/Version.java
rename to src/main/resources/org/testng/internal/VersionTemplateJava
index ab56291..ad43b84 100644
--- a/src/main/resources/org/testng/internal/Version.java
+++ b/src/main/resources/org/testng/internal/VersionTemplateJava
@@ -1,7 +1,7 @@
package org.testng.internal;
public class Version {
- public static final String VERSION = "${project.version}";
+ public static final String VERSION = "@version@";
public static void displayBanner() {
System.out.println("...\n... TestNG " + VERSION + " by Cédric Beust (cedric@beust.com)\n...\n");