This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag OpenBSD in repository testng.
commit 0730d08ad0b4812c5b2a798729cb7b6cc618dc9b Author: Cedric Beust <[email protected]> Date: Sun May 10 21:52:20 2015 -0700 Check in. --- .gradle/2.3/taskArtifacts/cache.properties | 1 + .gradle/2.3/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .gradle/2.3/taskArtifacts/fileHashes.bin | Bin 0 -> 273757 bytes .gradle/2.3/taskArtifacts/fileSnapshots.bin | Bin 0 -> 429032 bytes .gradle/2.3/taskArtifacts/outputFileStates.bin | Bin 0 -> 19052 bytes .gradle/2.3/taskArtifacts/taskArtifacts.bin | Bin 0 -> 23145 bytes build.gradle | 101 +++++++++++++ gradle/buildWithTravis.sh | 1 + gradle/publishing.gradle | 58 ++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52141 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 +++++++++++++++++++++ gradlew.bat | 90 +++++++++++ local.properties | 6 + .../java/org/testng/internal/VersionTemplateJava} | 2 +- .../internal/{Version.java => VersionTemplateJava} | 2 +- 16 files changed, 429 insertions(+), 2 deletions(-) diff --git a/.gradle/2.3/taskArtifacts/cache.properties b/.gradle/2.3/taskArtifacts/cache.properties new file mode 100644 index 0000000..f04d8c7 --- /dev/null +++ b/.gradle/2.3/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Sun May 10 10:36:06 PDT 2015 diff --git a/.gradle/2.3/taskArtifacts/cache.properties.lock b/.gradle/2.3/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000..90f2621 Binary files /dev/null and b/.gradle/2.3/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.3/taskArtifacts/fileHashes.bin b/.gradle/2.3/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000..9a84ee3 Binary files /dev/null and b/.gradle/2.3/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.3/taskArtifacts/fileSnapshots.bin b/.gradle/2.3/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000..ff03518 Binary files /dev/null and b/.gradle/2.3/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.3/taskArtifacts/outputFileStates.bin b/.gradle/2.3/taskArtifacts/outputFileStates.bin new file mode 100644 index 0000000..8f728e2 Binary files /dev/null and b/.gradle/2.3/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.3/taskArtifacts/taskArtifacts.bin b/.gradle/2.3/taskArtifacts/taskArtifacts.bin new file mode 100644 index 0000000..cd208f2 Binary files /dev/null and b/.gradle/2.3/taskArtifacts/taskArtifacts.bin differ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d7e8849 --- /dev/null +++ b/build.gradle @@ -0,0 +1,101 @@ +buildscript { + repositories { + mavenCentral() + jcenter() + maven { + url 'http://dl.bintray.com/cbeust/maven' + } + } +} + +plugins { + id "com.jfrog.bintray" version "1.1" +} + +version = '6.9.47-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 { +// file('build/libs/klaxon.jar') + sourceJar +} + +import org.apache.tools.ant.filters.ReplaceTokens + +task removeVersion { + delete 'src/main/java/org/testng/internal/Version.java' +} + + +//sourceSets { +// generated +//} +// +//sourceSets { +// generated { +// java { +// srcDir 'src/generated/java' +// } +// } +//} + +sourceSets.each { s -> + println("Source set: ${s}") +} + +def generatedSourcesFolder = projectDir.toString() + '/src/generated/java' + +def dirFrom = projectDir.toString() + '/src/main/resources/org/testng/internal' +def dirTo = generatedSourcesFolder + "/org/testng/internal" +def fileTemplate = 'VersionTemplateJava' + +task myDir { + delete dirTo + "/Version.java" +// doLast { + println("@@@ MKDIR " + dirTo) + mkdir(dirTo) +// } +} + +task createVersion(type: Copy, dependsOn: myDir) { + println("Creating Version file: ${version} in ${dirTo}") + println("FROM " + dirFrom + "/" + fileTemplate) + println("TO " + dirTo + "/Version.java") + from dirFrom + include fileTemplate + into(dirTo) + rename(fileTemplate, 'Version.java') + filter(ReplaceTokens, tokens: [version: version]) +// expand project.properties +// filter(FixCrLfFilter) +// filter() +} 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 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar 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 100644 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 ([email protected])\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 ([email protected])\n...\n"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
