Centralized versions in main Gradle build file.

Grade build

.gitignore

@@ -11,3 +11,5 @@ libs
 out
 .DS_Store
 lib/kotlin-*
+build
+.history

README.md

@@ -1,6 +1,6 @@
 # Kobalt
 
-[<img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:OpenSourceProjects_Kobalt_Build)/statusIcon">](https://teamcity.jetbrains.com/project.html?projectId=OpenSourceProjects_Kobalt&tab=projectOverview)
+[<img src="https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:OpenSourceProjects_Kobalt_Build)/statusIcon.svg">](https://teamcity.jetbrains.com/project.html?projectId=OpenSourceProjects_Kobalt&tab=projectOverview)
 
 
 Kobalt is a universal build system.
@@ -8,7 +8,7 @@ Kobalt is a universal build system.
 To build it:
 
 ```
-./kobaltw assemble
+$ ./kobaltw assemble
 ```
 
 Please see [the web site](http://beust.com/kobalt/) for the full documentation.

build.gradle

@@ -0,0 +1,58 @@
+allprojects {
+    group = 'com.beust'
+    version = '1.1.0'
+}
+
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
+
+    ext {
+        bndlib = '3.5.0'
+        findbugs = '3.0.2'
+        groovy = '2.4.12'
+        gson = '2.8.2'
+        guice = '4.2.2'
+        inject = '1'
+        jaxb = '2.3.0'
+        jcommander = '1.72'
+        kotlin = '1.2.71'
+        maven = '3.5.2'
+        mavenResolver = '1.1.0'
+        okhttp = '3.9.1'
+        okio = '1.13.0'
+        retrofit = '2.3.0'
+        slf4j = '1.7.3'
+        spark = '2.6.0'
+        testng = '6.12'
+
+        junit = '4.12'
+        junitJupiter = '5.1.0'
+        junitPlatform = '1.1.0'
+    }
+
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        jcenter()
+        maven {
+            url = 'https://dl.bintray.com/cbeust/maven'
+        }
+
+        maven {
+            url = 'https://repo.maven.apache.org/maven2'
+        }
+    }
+
+    sourceCompatibility = '1.7'
+
+    task sourcesJar(type: Jar) {
+        from sourceSets.main.allJava
+        archiveClassifier = 'sources'
+    }
+
+    task javadocJar(type: Jar) {
+        from javadoc
+        archiveClassifier = 'javadoc'
+    }
+}

dist/kobaltw

@@ -1,7 +1,11 @@
 #!/usr/bin/env sh
 
-DIRNAME=`dirname $(readlink -f "$0")`
-if [[ "$(uname)" == "CYGWIN"* ]]; then
-    DIRNAME=`cygpath -d "$DIRNAME"`
+case "$(uname)" in
+    CYGWIN*) DIRNAME=$(cygpath -d "$(dirname "$(readlink -f "$0")")");;
+    Darwin*) DIRNAME=$(dirname "$(readlink "$0")");;
+    *) DIRNAME=$(dirname "$(readlink -f "$0")");;
+esac
+if [ "$DIRNAME" = "." ]; then
+    DIRNAME="$(dirname "$0")"
 fi
 java -jar "${DIRNAME}/../kobalt/wrapper/kobalt-wrapper.jar" $*

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  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='"-Xmx64m" "-Xms64m"'
+
+# 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" "$@"

gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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="-Xmx64m" "-Xms64m"
+
+@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 Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_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=%*
+
+: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

kobalt/src/Build.kt

@@ -1,3 +1,4 @@
+
 import com.beust.kobalt.*
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.Task
@@ -16,22 +17,31 @@ import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 
 val bs = buildScript {
-    repos("http://dl.bintray.com/cbeust/maven")
+    repos("https://dl.bintray.com/cbeust/maven")
 }
 
 object Versions {
-    val okhttp = "3.2.0"
-    val okio = "1.6.0"
-    val retrofit = "2.1.0"
-    val gson = "2.6.2"
-    val maven = "3.3.9"
-    val mavenResolver = "1.0.3"
+    val kotlin = "1.2.71"
+    val okhttp = "3.9.1"
+    val okio = "1.13.0"
+    val retrofit = "2.3.0"
+    val gson = "2.8.2"
+    val guice = "4.2.2"
+    val maven = "3.5.2"
+    val mavenResolver = "1.1.0"
     val slf4j = "1.7.3"
-    val kotlin = "1.1.1"
     val aether = "1.0.2.v20150114"
-    val testng = "6.11"
+    val testng = "6.12"
+    val jcommander = "1.72"
+
+    // JUnit 5
+    val junit = "4.12"
+    val junitPlatform = "1.1.0"
+    val junitJupiter = "5.1.0"
 }
 
 fun mavenResolver(vararg m: String)
@@ -54,6 +64,7 @@ val wrapper = project {
     }
 
     assemble {
+        jar { }
         jar {
             name = projectName + ".jar"
             manifest {
@@ -65,6 +76,13 @@ val wrapper = project {
     application {
         mainClass = "com.beust.kobalt.wrapper.Main"
     }
+
+    bintray {
+        publish = true
+        sign = true
+    }
+
+    pom = createPom(name, "Wrapper for Kobalt")
 }
 
 val kobaltPluginApi = project {
@@ -74,47 +92,42 @@ val kobaltPluginApi = project {
     version = readVersion()
     directory = "modules/kobalt-plugin-api"
     description = "A build system in Kotlin"
-    url = "http://beust.com/kobalt"
+    url = "https://beust.com/kobalt"
 
-    pom = Model().apply {
-        name = project.name
-        description = "A build system in Kotlin"
-        url = "http://beust.com/kobalt"
-        licenses = listOf(License().apply {
-            name = "Apache 2.0"
-            url = "http://www.apache .org/licenses/LICENSE-2.0"
-        })
-        scm = Scm().apply {
-            url = "http://github.com/cbeust/kobalt"
-            connection = "https://github.com/cbeust/kobalt.git"
-            developerConnection = "git@github.com:cbeust/kobalt.git"
-        }
-        developers = listOf(Developer().apply {
-            name = "Cedric Beust"
-            email = "cedric@beust.com"
-        })
-    }
+    pom = createPom(name, "A build system in Kotlin")
 
     dependencies {
         compile(
-                "com.google.inject:guice:4.0",
-                "com.google.inject.extensions:guice-assistedinject:4.0",
+                "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}",
+                "com.google.inject:guice:${Versions.guice}",
+                "com.google.inject.extensions:guice-assistedinject:4.1.0",
                 "javax.inject:javax.inject:1",
-                "com.google.guava:guava:19.0",
+                "com.google.guava:guava:27.0.1-jre",
                 "org.apache.maven:maven-model:${Versions.maven}",
-                "io.reactivex:rxjava:1.1.5",
+                "io.reactivex:rxjava:1.3.3",
                 "com.squareup.okio:okio:${Versions.okio}",
                 "com.google.code.gson:gson:${Versions.gson}",
                 "com.squareup.okhttp3:okhttp:${Versions.okhttp}",
                 "com.squareup.retrofit2:retrofit:${Versions.retrofit}",
                 "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
-                "com.beust:jcommander:1.48",
-                "org.eclipse.jgit:org.eclipse.jgit:4.5.0.201609210915-r",
+                "com.beust:jcommander:${Versions.jcommander}",
+                "org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r",
                 "org.slf4j:slf4j-simple:${Versions.slf4j}",
                 *mavenResolver("api", "spi", "util", "impl", "connector-basic", "transport-http", "transport-file"),
                 "org.apache.maven:maven-aether-provider:3.3.9",
-                "org.testng.testng-remote:testng-remote:1.3.0",
-                "org.testng:testng:${Versions.testng}"
+                "org.testng.testng-remote:testng-remote:1.3.2",
+                "org.testng:testng:${Versions.testng}",
+                "org.junit.platform:junit-platform-surefire-provider:${Versions.junitPlatform}",
+                "org.junit.platform:junit-platform-runner:${Versions.junitPlatform}",
+                "org.junit.platform:junit-platform-engine:${Versions.junitPlatform}",
+                "org.junit.platform:junit-platform-console:${Versions.junitPlatform}",
+                "org.junit.jupiter:junit-jupiter-engine:${Versions.junitJupiter}",
+                "org.junit.vintage:junit-vintage-engine:${Versions.junitJupiter}",
+                "org.apache.commons:commons-compress:1.15",
+                "commons-io:commons-io:2.6",
+
+                // Java 9
+                "javax.xml.bind:jaxb-api:2.3.0"
         )
         exclude(*aether("impl", "spi", "util", "api"))
     }
@@ -129,12 +142,8 @@ val kobaltPluginApi = project {
         }
     }
 
-//    install {
-//        libDir = "lib-test"
-//    }
-
     kotlinCompiler {
-        args("-nowarn")
+        args("nowarn")
     }
 
     bintray {
@@ -153,24 +162,32 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
         compile("org.jetbrains.kotlin:kotlin-compiler-embeddable:${Versions.kotlin}")
 
         // Used by the main app
-        compile("com.github.spullara.mustache.java:compiler:0.9.1",
+        compile(
+                "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}",
+                "com.github.spullara.mustache.java:compiler:0.9.5",
                 "javax.inject:javax.inject:1",
-                "com.google.inject:guice:4.0",
-                "com.google.inject.extensions:guice-assistedinject:4.0",
-                "com.beust:jcommander:1.65",
+                "com.google.inject:guice:${Versions.guice}",
+                "com.google.inject.extensions:guice-assistedinject:${Versions.guice}",
+                "com.beust:jcommander:${Versions.jcommander}",
                 "org.apache.maven:maven-model:${Versions.maven}",
-                "com.google.code.findbugs:jsr305:3.0.1",
+                "com.google.code.findbugs:jsr305:3.0.2",
                 "com.google.code.gson:gson:${Versions.gson}",
                 "com.squareup.retrofit2:retrofit:${Versions.retrofit}",
                 "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
-                "com.squareup.okhttp3:okhttp-ws:${Versions.okhttp}",
-                "biz.aQute.bnd:bndlib:2.4.0",
+//                "com.squareup.okhttp3:okhttp-ws:3.4.2",
+                "biz.aQute.bnd:biz.aQute.bndlib:3.5.0",
                 *mavenResolver("spi"),
 
-                "com.squareup.okhttp3:logging-interceptor:3.2.0",
+                "com.squareup.okhttp3:logging-interceptor:3.9.0",
 
-                "com.sparkjava:spark-core:2.5",
-                "org.codehaus.groovy:groovy:2.4.8"
+                "com.sparkjava:spark-core:2.6.0",
+                "org.codehaus.groovy:groovy:2.4.12",
+
+                // Java 9
+                "javax.xml.bind:jaxb-api:2.3.0",
+                "com.sun.xml.bind:jaxb-impl:2.3.0",
+                "com.sun.xml.bind:jaxb-core:2.3.0",
+                "com.sun.activation:javax.activation:1.2.0"
 
 //                "org.eclipse.jetty:jetty-server:${Versions.jetty}",
 //                "org.eclipse.jetty:jetty-servlet:${Versions.jetty}",
@@ -184,8 +201,9 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
     }
 
     dependenciesTest {
-        compile("org.testng:testng:${Versions.testng}",
-                "org.assertj:assertj-core:3.4.1",
+        compile("org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}",
+                "org.testng:testng:${Versions.testng}",
+                "org.assertj:assertj-core:3.8.0",
                 *mavenResolver("util")
                 )
     }
@@ -199,17 +217,27 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
         }
         zip {
             val dir = "kobalt-$version"
-            include(from("dist"), to("$dir/bin"), "kobaltw")
-            include(from("dist"), to("$dir/bin"), "kobaltw.bat")
-            include(from("$buildDirectory/libs"), to("$dir/kobalt/wrapper"),
-                    "$projectName-$version.jar")
-            include(from("modules/wrapper/$buildDirectory/libs"), to("$dir/kobalt/wrapper"),
-                    "$projectName-wrapper.jar")
+            val files = listOf(
+                    "dist", "$dir/bin", "kobaltw",
+                    "dist", "$dir/bin", "kobaltw.bat",
+                    "$buildDirectory/libs", "$dir/kobalt/wrapper", "$projectName-$version.jar",
+                    "modules/wrapper/$buildDirectory/libs", "$dir/kobalt/wrapper", "$projectName-wrapper.jar")
+
+            (0 .. files.size - 1 step 3).forEach { i ->
+                include(from(files[i]), to(files[i + 1]), files[i + 2])
+            }
+
+            // Package the sources
+            val currentDir = Paths.get(".").toAbsolutePath().normalize().toString()
+            zipFolders("$currentDir/$buildDirectory/libs/all-sources/$projectName-$version-sources.jar",
+                    "$currentDir/$directory/src/main/kotlin",
+                    "$currentDir/${kobaltPluginApi.directory}/src/main/kotlin")
+            include(from("$buildDirectory/libs/all-sources"), to("$dir/kobalt/wrapper"), "$projectName-$version-sources.jar")
         }
     }
 
     kotlinCompiler {
-        args("-nowarn")
+        args("nowarn")
     }
 
     bintray {
@@ -229,6 +257,28 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
     }
 }
 
+fun zipFolders(zipFilePath: String, vararg foldersPath: String) {
+    val zip = Paths.get(zipFilePath)
+    Files.deleteIfExists(zip)
+    Files.createDirectories(zip.parent)
+    val zipPath = Files.createFile(zip)
+    ZipOutputStream(Files.newOutputStream(zipPath)).use {
+        foldersPath.map {Paths.get(it)}.forEach { folderPath ->
+            Files.walk(folderPath)
+                    .filter { path -> !Files.isDirectory(path) }
+                    .forEach { path ->
+                        val zipEntry = ZipEntry(folderPath.relativize(path).toString())
+                        try {
+                            it.putNextEntry(zipEntry)
+                            Files.copy(path, it)
+                            it.closeEntry()
+                        } catch (e: Exception) {
+                        }
+                    }
+        }
+    }
+}
+
 fun readVersion() : String {
     val localFile =
             listOf("src/main/resources/kobalt.properties",
@@ -255,3 +305,22 @@ fun taskCopyVersionForWrapper(project: Project) : TaskResult {
     }
     return TaskResult()
 }
+
+fun createPom(projectName: String, projectDescription: String) = Model().apply {
+    name = projectName
+    description = projectDescription
+    url = "https://beust.com/kobalt"
+    licenses = listOf(License().apply {
+        name = "Apache-2.0"
+        url = "https://www.apache.org/licenses/LICENSE-2.0"
+    })
+    scm = Scm().apply {
+        url = "https://github.com/cbeust/kobalt"
+        connection = "https://github.com/cbeust/kobalt.git"
+        developerConnection = "git@github.com:cbeust/kobalt.git"
+    }
+    developers = listOf(Developer().apply {
+        name = "Cedric Beust"
+        email = "cedric@beust.com"
+    })
+}

kobalt/wrapper/kobalt-wrapper.properties

@@ -1 +1 @@
-kobalt.version=1.0.45
+kobalt.version=1.0.122

kobaltw-test

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+JAR=$(ls -1 -t kobaltBuild/libs/*.jar | grep -Ev "(sources|javadoc)" | head -1)
+TEMPDIR=$(mktemp -d)
+cp -pf "$JAR" "$TEMPDIR"
+TEMPJAR=$TEMPDIR/$(basename "$JAR")
+export KOBALT_JAR=$TEMPJAR
+java -jar "$TEMPJAR" "$@"
+rm -rf "$TEMPDIR"

modules/kobalt-plugin-api/build.gradle

@@ -0,0 +1,85 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.2.71'
+    id 'com.github.johnrengelman.shadow' version '5.0.0'
+}
+
+dependencies {
+    implementation "biz.aQute.bnd:biz.aQute.bndlib:$bndlib"
+    implementation "com.google.code.findbugs:jsr305:$findbugs"
+    implementation "com.sparkjava:spark-core:$spark"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp"
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'io.reactivex:rxjava:1.3.3'
+    implementation "javax.inject:javax.inject:$inject"
+    implementation "javax.xml.bind:jaxb-api:$jaxb"
+    implementation 'org.apache.commons:commons-compress:1.15'
+    implementation 'org.apache.maven:maven-aether-provider:3.3.9'
+    implementation "org.apache.maven.resolver:maven-resolver-api:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-connector-basic:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-impl:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-spi:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-transport-file:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-transport-http:$mavenResolver"
+    implementation "org.apache.maven.resolver:maven-resolver-util:$mavenResolver"
+    implementation "org.codehaus.groovy:groovy:$groovy"
+    implementation 'org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r'
+    implementation "org.junit.jupiter:junit-jupiter-engine:$junitJupiter"
+    implementation "org.junit.platform:junit-platform-console:$junitPlatform"
+    implementation "org.junit.platform:junit-platform-engine:$junitPlatform"
+    implementation "org.junit.platform:junit-platform-runner:$junitPlatform"
+    implementation "org.junit.platform:junit-platform-surefire-provider:$junitPlatform"
+    implementation "org.junit.vintage:junit-vintage-engine:$junitJupiter"
+    implementation "org.slf4j:slf4j-simple:$slf4j"
+    implementation "org.testng:testng:$testng"
+    implementation 'org.testng.testng-remote:testng-remote:1.3.2'
+    implementation "com.beust:jcommander:$jcommander"
+    implementation "com.google.code.gson:gson:$gson"
+    implementation "com.google.inject:guice:$guice"
+    implementation "com.google.inject.extensions:guice-assistedinject:$guice"
+    implementation "com.squareup.okio:okio:$okio"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit"
+    implementation "org.apache.maven:maven-model:$maven"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin"
+}
+
+shadowJar {
+    classifier = null
+}
+
+test {
+    useTestNG()
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = project.name
+                description = 'A build system in Kotlin'
+                url = 'https://beust.com/kobalt'
+                licenses {
+                    license {
+                        name = 'Apache-2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'Cedric Beust'
+                        email = 'cedric@beust.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:https://github.com/cbeust/kobalt.git'
+                    developerConnection = 'scm:git@github.com:cbeust/kobalt.git'
+                    url = 'https://github.com/cbeust/kobalt'
+                }
+            }
+        }
+    }
+}

modules/kobalt-plugin-api/pom.xml

@@ -0,0 +1,279 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.beust</groupId>
+        <artifactId>kobalt-pom</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>kobalt-plugin-api</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-aether-provider</artifactId>
+            <version>3.3.9</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-api</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-spi</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-util</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-impl</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-connector-basic</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-transport-http</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-transport-file</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>1.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio</artifactId>
+            <version>${okio.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>1.72</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-gson</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>2.4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-console</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junitJupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junitJupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng.testng-remote</groupId>
+            <artifactId>testng-remote</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>4.9.0.201710071750-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <!-- java 9 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals> <goal>compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals> <goal>test-compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals> <goal>compile</goal> </goals>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>testCompile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/ArchiveGenerator.kt

@@ -3,7 +3,6 @@ package com.beust.kobalt
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.archive.Zip
-import com.beust.kobalt.misc.IncludedFile
 import com.beust.kobalt.misc.KFiles
 import java.io.File
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt

@@ -61,6 +61,9 @@ class Args {
     @Parameter(names = arrayOf("--noIncremental"), description = "Turn off incremental builds")
     var noIncremental: Boolean = false
 
+    @Parameter(names = arrayOf("--offline"), description = "Don't try to download dependencies even if there is no cached version")
+    var offline: Boolean = false
+
     @Parameter(names = arrayOf("--plugins"), description = "Comma-separated list of plug-in Maven id's")
     var pluginIds: String? = null
 
@@ -101,5 +104,8 @@ class Args {
 
     @Parameter(names = arrayOf("--update"), description = "Update to the latest version of Kobalt")
     var update: Boolean = false
+
+    @Parameter(names = arrayOf("--version"), description = "Display the current version of Kobalt")
+    var version: Boolean = false
 }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt

@@ -74,7 +74,18 @@ data class ProxyConfig(val host: String = "", val port: Int = 0, val type: Strin
     fun toAetherProxy() = Proxy(type, host, port) // TODO make support for proxy auth
 }
 
-data class HostConfig(var url: String = "", var username: String? = null, var password: String? = null) {
+data class HostConfig(var url: String = "", var name: String = HostConfig.createRepoName(url),
+        var username: String? = null, var password: String? = null) {
+
+    companion object {
+        /**
+         * For repos specified in the build file (repos()) that don't have an associated unique name,
+         * create such a name from the URL. This is a requirement from Maven Resolver, and failing to do
+         * this leads to very weird resolution errors.
+         */
+        private fun createRepoName(url: String) = url.replace("/", "_").replace("\\", "_").replace(":", "_")
+    }
+
     fun hasAuth() : Boolean {
         return (! username.isNullOrBlank()) && (! password.isNullOrBlank())
     }
@@ -105,6 +116,7 @@ fun buildFileClasspath(vararg deps: String) {
 }
 
 fun newBuildFileClasspath(vararg deps: String) {
+    //FIXME newBuildFileClasspath called twice
     deps.forEach { Kobalt.addBuildFileClasspath(it) }
 }
 
@@ -114,7 +126,7 @@ fun authRepos(vararg repos : HostConfig) {
 }
 
 @Directive
-fun authRepo(init: HostConfig.() -> Unit) = HostConfig().apply { init() }
+fun authRepo(init: HostConfig.() -> Unit) = HostConfig(name = "").apply { init() }
 
 @Directive
 fun glob(g: String) : IFileSpec.GlobSpec = IFileSpec.GlobSpec(g)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt

@@ -9,15 +9,13 @@ object Constants {
     val BUILD_FILE_NAME = "Build.kt"
     val BUILD_FILE_DIRECTORY = "kobalt/src"
     val BUILD_FILE_PATH = KFiles.joinDir(BUILD_FILE_DIRECTORY, BUILD_FILE_NAME)
-    val KOTLIN_COMPILER_VERSION = "1.1.1"
+    val KOTLIN_COMPILER_VERSION = "1.2.70"
 
-    internal val DEFAULT_REPOS = listOf<String>(
+    internal val DEFAULT_REPOS = listOf<HostConfig>(
             //            "https://maven-central.storage.googleapis.com/",
-            "http://repo1.maven.org/maven2/",
-            "https://jcenter.bintray.com/",
-//            "http://repository.jetbrains.com/all/", // <-- contains snapshots
-            "https://dl.bintray.com/kotlin/kotlin-eap",
-            "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
+            HostConfig("https://repo1.maven.org/maven2/", "Maven"),
+            HostConfig("https://jcenter.bintray.com/", "JCenter")
+//            "https://repository.jetbrains.com/all/", // <-- contains snapshots
 
             // snapshots
 //            "https://oss.sonatype.org/content/repositories/snapshots/"

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/FileSpec.kt

@@ -28,15 +28,15 @@ sealed class IFileSpec {
         private fun isIncluded(includeMatchers: Glob, excludes: List<Glob>, rel: Path) : Boolean {
             excludes.forEach {
                 if (it.matches(rel)) {
-                    kobaltLog(3, "Excluding ${rel.toFile()}")
+                    kobaltLog(3, "  Excluding ${rel.toFile()}")
                     return false
                 }
             }
             if (includeMatchers.matches(rel)) {
-                kobaltLog(3, "Including ${rel.toFile().path}")
+                kobaltLog(3, "  Including ${rel.toFile().path}")
                 return true
             }
-            kobaltLog(2, "Excluding ${rel.toFile()} (not matching any include pattern")
+            kobaltLog(2, "  Excluding ${rel.toFile()} (not matching any include pattern")
             return false
         }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/IncludeFromTo.kt

@@ -0,0 +1,43 @@
+package com.beust.kobalt
+
+import com.beust.kobalt.api.annotation.Directive
+import java.io.File
+
+/**
+ * Base classes for directives that support install(from,to) (e.g. install{} or jar{}).
+ */
+open class IncludeFromTo {
+    /**
+     * Prefix path to be removed from the zip file. For example, if you add "build/lib/a.jar" to the zip
+     * file and the excludePrefix is "build/lib", then "a.jar" will be added at the root of the zip file.
+     */
+    val includedFiles = arrayListOf<IncludedFile>()
+
+    @Directive
+    fun from(s: String) = From(s)
+
+    @Directive
+    fun to(s: String) = To(s)
+
+    @Directive
+    fun copy(from: From, to: To) {
+        val dir = File(from.path).absoluteFile.parentFile
+        includedFiles.add(IncludedFile(from(dir.absolutePath), to, listOf(IFileSpec.FileSpec(from.path))))
+    }
+
+    @Directive
+    fun include(vararg files: String) {
+        includedFiles.add(IncludedFile(files.map { IFileSpec.FileSpec(it) }))
+    }
+
+    @Directive
+    fun include(from: From, to: To, vararg specs: String) {
+        includedFiles.add(IncludedFile(from, to, specs.map { IFileSpec.FileSpec(it) }))
+    }
+
+    @Directive
+    fun include(from: From, to: To, vararg specs: IFileSpec.GlobSpec) {
+        includedFiles.add(IncludedFile(from, to, listOf(*specs)))
+    }
+}
+

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/IncludedFile.kt

@@ -0,0 +1,44 @@
+package com.beust.kobalt
+
+import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.toString
+import java.io.File
+import java.nio.file.Paths
+
+class IncludedFile(val fromOriginal: From, val toOriginal: To, val specs: List<IFileSpec>,
+        val expandJarFiles: Boolean = false) {
+    constructor(specs: List<IFileSpec>, expandJarFiles: Boolean = false) : this(From(""), To(""), specs, expandJarFiles)
+    fun from(s: String) = File(if (fromOriginal.isCurrentDir()) s else KFiles.joinDir(from, s))
+    val from: String get() = fromOriginal.path.replace("\\", "/")
+    fun to(s: String) = File(if (toOriginal.isCurrentDir()) s else KFiles.joinDir(to, s))
+    val to: String get() = toOriginal.path.replace("\\", "/")
+    override fun toString() = toString("IncludedFile",
+            "files - ", specs.map { it.toString() },
+            "from", from,
+            "to", to)
+
+    fun allFromFiles(directory: String? = null): List<File> {
+        val result = arrayListOf<File>()
+        specs.forEach { spec ->
+//            val fullDir = if (directory == null) from else KFiles.joinDir(directory, from)
+            spec.toFiles(directory, from).forEach { source ->
+                result.add(if (source.isAbsolute) source else File(source.path))
+            }
+        }
+        return result.map { Paths.get(it.path).normalize().toFile()}
+    }
+}
+
+open class Direction(open val p: String) {
+    override fun toString() = path
+    fun isCurrentDir() = path == "./"
+
+    val path: String get() =
+        if (p.isEmpty()) "./"
+        else if (p.startsWith("/") || p.endsWith("/")) p
+        else p + "/"
+}
+
+class From(override val p: String) : Direction(p)
+
+class To(override val p: String) : Direction(p)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JarGenerator.kt

@@ -3,16 +3,16 @@ package com.beust.kobalt
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.archive.Archives
+import com.beust.kobalt.archive.MetaArchive
 import com.beust.kobalt.archive.Zip
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.aether.Scope
-import com.beust.kobalt.misc.*
+import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.kobaltLog
 import com.google.inject.Inject
 import java.io.File
 import java.io.FileInputStream
-import java.io.OutputStream
 import java.nio.file.Paths
-import java.util.jar.JarOutputStream
 import java.util.jar.Manifest
 
 class JarGenerator @Inject constructor(val dependencyManager: DependencyManager) : ArchiveGenerator {
@@ -142,7 +142,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
                     val allFiles = includedFiles.flatMap { file ->
                         file.allFromFiles(project.directory).map { file.from(it.path) }
                     }
-                    val manifestFiles = allFiles.filter { it.path.contains("META-INF/MANIFEST.MF") }
+                    val manifestFiles = allFiles.filter { it.path.contains(MetaArchive.MANIFEST_MF) }
                     return if (manifestFiles.any()) manifestFiles[0] else null
                 }
 
@@ -151,14 +151,12 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
                     context.logger.log(project.name, 2, "Including MANIFEST.MF file $manifestFile")
                     Manifest(FileInputStream(manifestFile))
                 } else {
-                    Manifest()
+                    null
                 }
             }
 
-        val jarFactory = { os: OutputStream -> JarOutputStream(os, manifest) }
-
         return Archives.generateArchive(project, context, zip.name, ".jar", includedFiles,
-                true /* expandJarFiles */, jarFactory)
+                true /* expandJarFiles */, manifest)
     }
 
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Jvm.kt

@@ -67,7 +67,7 @@ open class Jvm constructor(
             return toolsJar
         }
         if (javaHome!!.name.equals("jre", true)) {
-            javaHome = javaHome!!.parentFile
+            _javaHome = javaHome!!.parentFile
             toolsJar = File(javaHome, "lib/tools.jar")
             if (toolsJar.exists()) {
                 return toolsJar
@@ -78,7 +78,7 @@ open class Jvm constructor(
             val version = SystemProperties.Companion.javaVersion
             if (javaHome!!.name.toRegex().matches("jre\\d+")
                     || javaHome!!.name == "jre$version") {
-                javaHome = File(javaHome!!.parentFile, "jdk$version")
+                _javaHome = File(javaHome!!.parentFile, "jdk$version")
                 toolsJar = File(javaHome, "lib/tools.jar")
                 if (toolsJar.exists()) {
                     return toolsJar

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Plugins.kt

@@ -28,7 +28,6 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
         val depManager: DependencyManager,
         val settings: KobaltSettings,
         val executors: KobaltExecutors,
-        val pluginInfo: PluginInfo,
         val incrementalManagerFactory: IncrementalManager.IFactory,
         val taskManager: TaskManager) {
 
@@ -171,6 +170,9 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
 
     val dependencies = arrayListOf<IClasspathDependency>()
 
+//    @Inject
+//    lateinit var pluginInfo: PluginInfo
+
     fun installPlugins(dependencies: List<IClasspathDependency>, scriptClassLoader: ClassLoader) {
         val executor = executors.newExecutor("Plugins", 5)
         dependencies.forEach {
@@ -191,6 +193,8 @@ class Plugins @Inject constructor (val taskManagerProvider : Provider<TaskManage
                 // The plug-in is pointing to a jar file, read kobalt-plugin.xml from it
                 JarUtils.extractTextFile(JarFile(file), PluginInfo.PLUGIN_XML)
             }
+
+            val pluginInfo = Kobalt.INJECTOR.getInstance(PluginInfo::class.java)
             if (pluginXml != null) {
                 val pluginClassLoader = URLClassLoader(arrayOf(file.toURI().toURL()))
                 val thisPluginInfo = PluginInfo.readPluginXml(pluginXml, pluginClassLoader, scriptClassLoader)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/SystemProperties.kt

@@ -2,8 +2,16 @@ package com.beust.kobalt
 
 class SystemProperties {
     companion object {
-        val javaBase = System.getProperty("java.home") ?:
-                (System.getenv("JAVA_HOME") ?: throw IllegalArgumentException("JAVA_HOME not defined"))
+        val javaBase : String
+            get() {
+                val jh = System.getenv("JAVA_HOME")
+                    ?: System.getProperty("java.home")
+                    ?: throw IllegalArgumentException("JAVA_HOME not defined")
+                val result =
+                    if (jh.toLowerCase().endsWith("jre")) jh.substring(0, jh.length - 4)
+                    else jh
+                return result
+            }
         val javaVersion = System.getProperty("java.version")
         val homeDir = System.getProperty("user.home")
         val tmpDir = System.getProperty("java.io.tmpdir")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TaskResult.kt

@@ -1,3 +1,8 @@
 package com.beust.kobalt
 
-open public class TaskResult(val success: Boolean = true, val errorMessage: String? = null)
+class TestResult(val success: Boolean, val shortMessage: String? = null, val longMessage: String? = null)
+
+open class TaskResult(val success: Boolean = true,
+        val testResult: TestResult? = null,
+        val errorMessage: String? = null
+)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt

@@ -126,61 +126,62 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
 
     var generatedSourceDirectory: File? = null
 
-//    private fun findBuildTypeBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
-//        val buildTypeName = variant?.buildType?.name
-//        return project.buildTypes[buildTypeName]?.buildConfig
-//    }
-//
-//    private fun findProductFlavorBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
-//        val buildTypeName = variant?.productFlavor?.name
-//        return project.productFlavors[buildTypeName]?.buildConfig
-//    }
+    private fun findBuildTypeBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
+        val buildTypeName = variant?.buildType?.name
+        return project.buildTypes[buildTypeName]?.buildConfig
+    }
+
+    private fun findProductFlavorBuildConfig(project: Project, variant: Variant?) : BuildConfig? {
+        val buildTypeName = variant?.productFlavor?.name
+        return project.productFlavors[buildTypeName]?.buildConfig
+    }
 
     /**
      * Return a list of the BuildConfigs found on the productFlavor{}, buildType{} and project{} (in that order).
      */
-//    private fun findBuildConfigs(project: Project, variant: Variant?) : List<BuildConfig> {
-//        val result = listOf(
-//                findBuildTypeBuildConfig(project, variant),
-//                findProductFlavorBuildConfig(project, variant),
-//                project.buildConfig)
-//            .filterNotNull()
-//
-//        return result
-//    }
+    private fun findBuildConfigs(project: Project, variant: Variant?) : List<BuildConfig> {
+        val result = listOf(
+                findBuildTypeBuildConfig(project, variant),
+                findProductFlavorBuildConfig(project, variant),
+                project.buildConfig)
+            .filterNotNull()
+
+        return result
+    }
 
     /**
      * Generate BuildConfig.java if requested. Also look up if any BuildConfig is defined on the current build type,
      * product flavor or main project, and use them to generateAndSave any additional field (in that order to
      * respect the priorities). Return the generated file if it was generated, null otherwise.
      */
-//    fun maybeGenerateBuildConfig(project: Project, context: KobaltContext) : File? {
-//        val buildConfigs = findBuildConfigs(project, this)
-//
-//        if (buildConfigs.size > 0) {
-//            val pkg = project.packageName ?: project.group
-//                    ?: throw KobaltException(
-//                    "packageName needs to be defined on the project in order to generateAndSave BuildConfig")
-//
-//            val contributor = ActorUtils.selectAffinityActor(context.pluginInfo.buildConfigContributors, project)
-//            if (contributor != null) {
-//                val code = contributor.generateBuildConfig(project, context, pkg, this, buildConfigs)
-//                val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
-//                // Make sure the generatedSourceDirectory doesn't contain the project.directory since
-//                // that directory will be added when trying to find recursively all the sources in it
-//                generatedSourceDirectory = result.relativeTo(File(project.directory))
-//                val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
-//                val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix)
-//                KFiles.saveFile(outputDir, code)
-//                context.logger.log(project.name, 2, "Generated ${outputDir.path}")
-//                return result
-//            } else {
-//                throw KobaltException("Couldn't find a contributor to generateAndSave BuildConfig")
-//            }
-//        } else {
-//            return null
-//        }
-//    }
+    fun maybeGenerateBuildConfig(project: Project, context: KobaltContext) : File? {
+        val buildConfigs = findBuildConfigs(project, this)
+
+        if (buildConfigs.size > 0) {
+            val pkg = project.packageName ?: project.group
+                    ?: throw KobaltException(
+                    "packageName needs to be defined on the project in order to generateAndSave BuildConfig")
+
+            val contributor = ActorUtils.selectAffinityActor(project, context,
+                    context.pluginInfo.buildConfigContributors)
+            if (contributor != null) {
+                val code = contributor.generateBuildConfig(project, context, pkg, this, buildConfigs)
+                val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
+                // Make sure the generatedSourceDirectory doesn't contain the project.directory since
+                // that directory will be added when trying to find recursively all the sources in it
+                generatedSourceDirectory = result.relativeTo(File(project.directory))
+                val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
+                val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix)
+                KFiles.saveFile(outputDir, code)
+                context.logger.log(project.name, 2, "Generated ${outputDir.path}")
+                return result
+            } else {
+                throw KobaltException("Couldn't find a contributor to generateAndSave BuildConfig")
+            }
+        } else {
+            return null
+        }
+    }
 
     override fun toString() = toTask("")
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/CompilerActionInfo.kt

@@ -12,4 +12,5 @@ data class CompilerActionInfo(val directory: String?,
         val outputDir: File,
         val compilerArgs: List<String>,
         val friendPaths: List<String>,
-        val forceRecompile: Boolean)
+        val forceRecompile: Boolean,
+        val compilerSeparateProcess: Boolean = false)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/DependencyHolder.kt

@@ -13,6 +13,7 @@ interface IDependencyHolder {
     val compileDependencies : ArrayList<IClasspathDependency>
     val optionalDependencies : ArrayList<IClasspathDependency>
     val compileProvidedDependencies : ArrayList<IClasspathDependency>
+    val compileOnlyDependencies : ArrayList<IClasspathDependency>
     val compileRuntimeDependencies : ArrayList<IClasspathDependency>
     val excludedDependencies : ArrayList<IClasspathDependency>
     val nativeDependencies : ArrayList<IClasspathDependency>
@@ -29,6 +30,7 @@ open class DependencyHolder : IDependencyHolder {
     override val compileDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val optionalDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val compileProvidedDependencies : ArrayList<IClasspathDependency> = arrayListOf()
+    override val compileOnlyDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val compileRuntimeDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val excludedDependencies : ArrayList<IClasspathDependency> = arrayListOf()
     override val nativeDependencies : ArrayList<IClasspathDependency> = arrayListOf()
@@ -37,7 +39,7 @@ open class DependencyHolder : IDependencyHolder {
 
     override fun dependencies(init: Dependencies.() -> Unit) : Dependencies {
         dependencies = Dependencies(project, compileDependencies, optionalDependencies, compileProvidedDependencies,
-                compileRuntimeDependencies, excludedDependencies, nativeDependencies)
+                compileOnlyDependencies, compileRuntimeDependencies, excludedDependencies, nativeDependencies)
         dependencies!!.init()
         return dependencies!!
     }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildConfigContributor.kt

@@ -5,7 +5,7 @@ import com.beust.kobalt.Variant
 /**
  * Plug-ins that can generate a BuildConfig file.
  */
-interface IBuildConfigContributor : ISimpleAffinity<Project> {
+interface IBuildConfigContributor : IProjectAffinity {
     fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String, variant: Variant,
             buildConfigs: List<BuildConfig>) : String
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IBuildListener.kt

@@ -4,8 +4,12 @@ package com.beust.kobalt.api
  * Plug-ins that listen to build events.
  */
 interface IBuildListener : IListener {
+
+    class TaskEndInfo(val success: Boolean, val shortMessage: String? = null,
+            val longMessage: String? = null)
+
     fun taskStart(project: Project, context: KobaltContext, taskName: String) {}
-    fun taskEnd(project: Project, context: KobaltContext, taskName: String, success: Boolean) {}
+    fun taskEnd(project: Project, context: KobaltContext, taskName: String, info: TaskEndInfo) {}
 
     fun projectStart(project: Project, context: KobaltContext) {}
     fun projectEnd(project: Project, context: KobaltContext, status: ProjectBuildStatus) {}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IDependencyManager.kt

@@ -61,7 +61,7 @@ interface IDependencyManager {
                 return excluded?.map { it.id }?.contains(dep.id) ?: false
             }
 
-            val accept = dependencies.any {
+            val accept = dependencies.isEmpty() || dependencies.any {
                 // Is this dependency excluded?
                 val isExcluded = isNodeExcluded(p0, it) || isDepExcluded(p0, project?.excludedDependencies)
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt

@@ -1,10 +1,11 @@
 package com.beust.kobalt.api
 
 import com.beust.kobalt.TaskResult
-import com.beust.kobalt.api.IClasspathDependency
 
 /**
  * Plugins that can run a project (task "run" or "test") should implement this interface.
+ *
+ * Currently not used.
  */
 interface IRunnerContributor : IContributor, IProjectAffinity {
     /**

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/ITaskContributor.kt

@@ -23,9 +23,10 @@ class DynamicTask(override val plugin: IPlugin, override val name: String, overr
 
     override fun call(): TaskResult2<ITask> {
         val taskResult = closure.invoke(project)
-        return TaskResult2(taskResult.success, taskResult.errorMessage, this)
+        return TaskResult2(taskResult.success, errorMessage = taskResult.errorMessage, value = this)
     }
 
-    override fun toString() = "[DynamicTask $name dependsOn=$dependsOn reverseDependsOn=$reverseDependsOn]"
+    override fun toString() =
+        "[DynamicTask ${project.name}:$name dependsOn=$dependsOn reverseDependsOn=$reverseDependsOn]"
 }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt

@@ -5,6 +5,7 @@ import com.beust.kobalt.HostConfig
 import com.beust.kobalt.Plugins
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.maven.DependencyManager
+import com.beust.kobalt.maven.aether.KobaltMavenResolver
 import com.google.inject.Guice
 import com.google.inject.Injector
 import com.google.inject.Module
@@ -35,12 +36,12 @@ class Kobalt {
          */
         val repos : Set<HostConfig>
             get() {
-                val settingsRepos = Kobalt.context?.settings?.defaultRepos ?: emptyList()
+                val settingsRepos = Kobalt.context?.settings?.defaultRepos?.map { HostConfig(it) } ?: emptyList()
                 // Repos from <default-repos> in the settings
                 val result = ArrayList(
                         (if (settingsRepos.isEmpty()) Constants.DEFAULT_REPOS
                         else settingsRepos)
-                    .map { HostConfig(it) })
+                    )
 
                 // Repo from <kobalt-compiler-repo> in the settings
                 Kobalt.context?.settings?.kobaltCompilerRepo?.let {
@@ -55,6 +56,9 @@ class Kobalt {
                 // Repos from the build file
                 result.addAll(reposFromBuildFiles)
 
+                result.forEach {
+                    KobaltMavenResolver.initAuthentication(it)
+                }
                 return result.toHashSet()
             }
 
@@ -131,6 +135,7 @@ class Kobalt {
 
         fun cleanUp() {
             buildSourceDirs.clear()
+            buildFileClasspath.clear()
         }
     }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt

@@ -91,7 +91,8 @@ open class Project(
     @Directive
     fun dependenciesTest(init: Dependencies.() -> Unit) : Dependencies {
         dependencies = Dependencies(this, testDependencies, arrayListOf(),
-                testProvidedDependencies, compileRuntimeDependencies, excludedDependencies, nativeDependencies)
+                testProvidedDependencies, compileOnlyDependencies, compileRuntimeDependencies,
+                excludedDependencies, nativeDependencies)
         dependencies!!.init()
         return dependencies!!
     }
@@ -128,6 +129,18 @@ open class Project(
         return result
     }
 
+    class Dep(val file: File, val id: String)
+
+    /**
+     * @return a list of the transitive dependencies (absolute paths to jar files) for the given dependencies.
+     * Can be used for example as `collect(compileDependencies)`.
+     */
+    @Directive
+    fun collect(dependencies: List<IClasspathDependency>) : List<Dep> {
+        return (Kobalt.context?.dependencyManager?.transitiveClosure(dependencies) ?: emptyList())
+            .map { Dep(it.jarFile.get(), it.id) }
+    }
+
     override fun toString() = "[Project $name]"
 }
 
@@ -142,6 +155,7 @@ class Dependencies(val project: Project,
         val dependencies: ArrayList<IClasspathDependency>,
         val optionalDependencies: ArrayList<IClasspathDependency>,
         val providedDependencies: ArrayList<IClasspathDependency>,
+        val compileOnlyDependencies: ArrayList<IClasspathDependency>,
         val runtimeDependencies: ArrayList<IClasspathDependency>,
         val excludedDependencies: ArrayList<IClasspathDependency>,
         val nativeDependencies: ArrayList<IClasspathDependency>) {
@@ -232,6 +246,9 @@ class Dependencies(val project: Project,
         addToDependencies(project, dependencies, arrayOf(dep), excludeConfig = excludeConfig)
     }
 
+    @Directive
+    fun compileOnly(vararg dep: String) = addToDependencies(project, compileOnlyDependencies, dep)
+
     @Directive
     fun compileOptional(vararg dep: String) {
         addToDependencies(project, optionalDependencies, dep, optional = true)
@@ -241,7 +258,6 @@ class Dependencies(val project: Project,
     @Directive
     fun provided(vararg dep: String) {
         addToDependencies(project, providedDependencies, dep)
-        addToDependencies(project, dependencies, dep)
     }
 
     @Directive

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/TaskContributor.kt

@@ -44,6 +44,25 @@ class TaskContributor @Inject constructor(val incrementalManagerFactory: Increme
         }
     }
 
+    fun addTask(plugin: IPlugin, project: Project, taskName: String, description: String,
+            group: String = AnnotationDefault.GROUP,
+            dependsOn: List<String> = emptyList(),
+            reverseDependsOn : List<String> = emptyList(),
+            runBefore : List<String> = emptyList(),
+            runAfter : List<String> = emptyList(),
+            alwaysRunAfter: List<String> = emptyList(),
+            runTask: (Project) -> TaskResult) {
+        dynamicTasks.add(DynamicTask(plugin, taskName, description, group, project,
+                dependsOn = dependsOn,
+                reverseDependsOn = reverseDependsOn,
+                runBefore = runBefore,
+                runAfter = runAfter,
+                alwaysRunAfter = alwaysRunAfter,
+                closure = { p: Project ->
+                    runTask(project)
+                }))
+    }
+
     fun addIncrementalVariantTasks(plugin: IPlugin, project: Project, context: KobaltContext, taskName: String,
             group: String = AnnotationDefault.GROUP,
             dependsOn: List<String> = emptyList(),

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt

@@ -1,16 +1,14 @@
 package com.beust.kobalt.archive
 
-import com.beust.kobalt.Features
-import com.beust.kobalt.IFileSpec
+import com.beust.kobalt.*
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.ExportedProjectProperty
-import com.beust.kobalt.misc.*
+import com.beust.kobalt.misc.JarUtils
+import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.kobaltLog
 import java.io.File
-import java.io.FileOutputStream
-import java.io.OutputStream
 import java.util.*
-import java.util.zip.ZipOutputStream
 
 class Archives {
     companion object {
@@ -19,9 +17,8 @@ class Archives {
         @ExportedProjectProperty(doc = "The name of the a jar file with a main() method", type = "String")
         const val JAR_NAME_WITH_MAIN_CLASS = "jarNameWithMainClass"
 
-        private val DEFAULT_STREAM_FACTORY = { os : OutputStream -> ZipOutputStream(os) }
-
-        fun defaultArchiveName(project: Project) = project.name + "-" + project.version
+        fun defaultArchiveName(project: Project) = project.name +
+            if (project.version.isNullOrBlank()) "" else "-${project.version}"
 
         fun generateArchive(project: Project,
                 context: KobaltContext,
@@ -29,15 +26,15 @@ class Archives {
                 suffix: String,
                 includedFiles: List<IncludedFile>,
                 expandJarFiles : Boolean = false,
-                outputStreamFactory: (OutputStream) -> ZipOutputStream = DEFAULT_STREAM_FACTORY) : File {
+                manifest: java.util.jar.Manifest? = null) : File {
             val fullArchiveName = context.variant.archiveName(project, archiveName, suffix)
             val archiveDir = File(KFiles.libsDir(project))
             val result = File(archiveDir.path, fullArchiveName)
             context.logger.log(project.name, 3, "Creating $result")
             if (! Features.USE_TIMESTAMPS || isOutdated(project.directory, includedFiles, result)) {
                 try {
-                    outputStreamFactory(FileOutputStream(result)).use {
-                        JarUtils.addFiles(project.directory, includedFiles, it, expandJarFiles)
+                    MetaArchive(result, manifest).use { metaArchive ->
+                        JarUtils.addFiles(project.directory, includedFiles, metaArchive, expandJarFiles)
                         context.logger.log(project.name, 2, "Added ${includedFiles.size} files to $result")
                         context.logger.log(project.name, 1, "  Created $result")
                     }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/MetaArchive.kt

@@ -0,0 +1,125 @@
+package com.beust.kobalt.archive
+
+import com.beust.kobalt.Glob
+import com.beust.kobalt.misc.KFiles
+import org.apache.commons.compress.archivers.ArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
+import java.io.Closeable
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.util.jar.Manifest
+import org.apache.commons.compress.archivers.zip.ZipFile as ApacheZipFile
+
+/**
+ * Abstraction of a zip/jar/war archive that automatically manages the addition of expanded jar files.
+ * Uses ZipArchiveOutputStream for fast inclusion of expanded jar files.
+ */
+class MetaArchive(outputFile: File, val manifest: Manifest?) : Closeable {
+    companion object {
+        const val MANIFEST_MF = "META-INF/MANIFEST.MF"
+    }
+
+    private val zos= ZipArchiveOutputStream(outputFile).apply {
+        encoding = "UTF-8"
+    }
+
+    init {
+        // If no manifest was passed, create an empty one so it's the first one in the archive
+        val m = manifest ?: Manifest()
+        val manifestFile = File.createTempFile("kobalt", "tmpManifest")
+        addEntry(ZipArchiveEntry("META-INF/"), null)
+        if (manifest != null) {
+            FileOutputStream(manifestFile).use { fos ->
+                m.write(fos)
+            }
+        }
+        val entry = zos.createArchiveEntry(manifestFile, MetaArchive.MANIFEST_MF)
+        addEntry(entry, FileInputStream(manifestFile))
+    }
+
+
+    fun addFile(f: File, entryFile: File, path: String?) {
+        maybeCreateParentDirectories(f)
+        addFile2(f, entryFile, path)
+    }
+
+    private fun addFile2(f: File, entryFile: File, path: String?) {
+        val file = f.normalize()
+        FileInputStream(file).use { inputStream ->
+            val actualPath = KFiles.fixSlashes(if (path != null) path + entryFile.path else entryFile.path)
+            ZipArchiveEntry(actualPath).let { entry ->
+                maybeCreateParentDirectories(File(actualPath))
+                maybeAddEntry(entry) {
+                    addEntry(entry, inputStream)
+                }
+            }
+        }
+    }
+
+    private val createdDirs = hashSetOf<String>()
+
+    /**
+     * For an entry a/b/c/File, an entry needs to be created for each individual directory:
+     * a/
+     * a/b/
+     * a/b/c
+     * a/b/c/File
+     */
+    private fun maybeCreateParentDirectories(file: File) {
+        val toCreate = arrayListOf<String>()
+        var current = file.parentFile
+        while (current != null && current.path != ".") {
+            if (!createdDirs.contains(current.path)) {
+                toCreate.add(0, KFiles.fixSlashes(current) + "/")
+                createdDirs.add(current.path)
+            }
+            current = current.parentFile
+        }
+        toCreate.forEach { dir ->
+            addEntry(ZipArchiveEntry(dir), null)
+        }
+    }
+
+    fun addArchive(jarFile: File) {
+        ApacheZipFile(jarFile).use { jar ->
+            val jarEntries = jar.entries
+            for (entry in jarEntries) {
+                maybeAddEntry(entry) {
+                    zos.addRawArchiveEntry(entry, jar.getRawInputStream(entry))
+                }
+            }
+        }
+    }
+
+
+
+    private fun okToAdd(name: String) : Boolean {
+        val result = !KFiles.isExcluded(name,
+                Glob("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", MANIFEST_MF))
+//        if (name.startsWith("META-INF")) println((if (result) "ADDING" else "NOT ADDING") + " $name")
+        return result
+    }
+
+    override fun close() = zos.close()
+
+    private fun addEntry(entry: ArchiveEntry, inputStream: FileInputStream?) {
+        zos.putArchiveEntry(entry)
+        inputStream?.use { ins ->
+            ins.copyTo(zos, 50 * 1024)
+        }
+        zos.closeArchiveEntry()
+    }
+
+    private val seen = hashSetOf<String>()
+
+    private fun maybeAddEntry(entry: ArchiveEntry, action:() -> Unit) {
+        entry.name.let { name ->
+            if (!seen.contains(name) && okToAdd(name)) {
+                action()
+            }
+            seen.add(name)
+        }
+    }
+}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/War.kt

@@ -6,7 +6,7 @@ import com.beust.kobalt.glob
 class War(override val project: Project, override var name: String = Archives.defaultArchiveName(project) + ".war")
         : Jar(project, name), AttributeHolder {
     init {
-        include(from("src/main/webapp"),to(""), glob("**"))
+        include(from("src/main/webapp"), to(""), glob("**"))
         include(from("kobaltBuild/classes"), to("WEB-INF/classes"), glob("**"))
     }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Zip.kt

@@ -1,23 +1,13 @@
 package com.beust.kobalt.archive
 
-import com.beust.kobalt.Glob
-import com.beust.kobalt.IFileSpec
+import com.beust.kobalt.*
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.annotation.Directive
-import com.beust.kobalt.misc.From
-import com.beust.kobalt.misc.IncludedFile
-import com.beust.kobalt.misc.To
 
 open class Zip(open val project: Project, open var name: String = Archives.defaultArchiveName(project) + ".zip",
-        open var fatJar: Boolean = false): AttributeHolder  {
+        open var fatJar: Boolean = false): AttributeHolder, IncludeFromTo()  {
     val excludes = arrayListOf<Glob>()
 
-    @Directive
-    fun from(s: String) = From(s)
-
-    @Directive
-    fun to(s: String) = To(s)
-
     @Directive
     fun exclude(vararg files: String) {
         files.forEach { excludes.add(Glob(it)) }
@@ -28,34 +18,10 @@ open class Zip(open val project: Project, open var name: String = Archives.defau
         specs.forEach { excludes.add(it) }
     }
 
-    @Directive
-    fun include(vararg files: String) {
-        includedFiles.add(IncludedFile(files.map { IFileSpec.FileSpec(it) }))
-    }
-
-    @Directive
-    fun include(from: From, to: To, vararg specs: String) {
-        includedFiles.add(IncludedFile(from, to, specs.map { IFileSpec.FileSpec(it) }))
-    }
-
-    @Directive
-    fun include(from: From, to: To, vararg specs: IFileSpec.GlobSpec) {
-        includedFiles.add(IncludedFile(from, to, listOf(*specs)))
-    }
-
-    /**
-     * Prefix path to be removed from the zip file. For example, if you add "build/lib/a.jar" to the zip
-     * file and the excludePrefix is "build/lib", then "a.jar" will be added at the root of the zip file.
-     */
-    val includedFiles = arrayListOf<IncludedFile>()
-
     @Directive
     open val attributes = arrayListOf(Pair("Manifest-Version", "1.0"))
 
     override fun addAttribute(k: String, v: String) {
         attributes.add(Pair(k, v))
     }
-
 }
-
-

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BaseProjectRunner.kt

@@ -1,5 +1,7 @@
 package com.beust.kobalt.internal
 
+import com.beust.kobalt.TestResult
+import com.beust.kobalt.api.IBuildListener
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.ProjectBuildStatus
@@ -25,9 +27,14 @@ abstract class BaseProjectRunner {
         }
 
         fun runBuildListenersForTask(project: Project, context: KobaltContext, taskName: String, start: Boolean,
-                success: Boolean = false) {
+                success: Boolean = false, testResult: TestResult? = null) {
             context.pluginInfo.buildListeners.forEach {
-                if (start) it.taskStart(project, context, taskName) else it.taskEnd(project, context, taskName, success)
+                if (start) {
+                    it.taskStart(project, context, taskName)
+                } else {
+                    val info = IBuildListener.TaskEndInfo(success, testResult?.shortMessage, testResult?.longMessage)
+                    it.taskEnd(project, context, taskName, info)
+                }
             }
         }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BuildListeners.kt

@@ -11,7 +11,8 @@ import java.util.concurrent.ConcurrentHashMap
  */
 class BuildListeners : IBuildListener, IBuildReportContributor {
     class ProfilerInfo(val taskName: String, val durationMillis: Long)
-    class ProjectInfo(val projectName: String, var durationMillis: Long = 0)
+    class ProjectInfo(val projectName: String, var durationMillis: Long = 0,
+            var shortMessage: String? = null, var longMessage: String? = null)
 
     private val startTimes = ConcurrentHashMap<String, Long>()
     private val timings = arrayListOf<ProfilerInfo>()
@@ -29,18 +30,21 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
     }
 
     // IBuildListener
-    override fun taskEnd(project: Project, context: KobaltContext, taskName: String, success: Boolean) {
+    override fun taskEnd(project: Project, context: KobaltContext, taskName: String, info: IBuildListener.TaskEndInfo) {
+        val success = info.success
         if (! success) hasFailures = true
         startTimes[taskName]?.let {
             val taskTime = System.currentTimeMillis() - it
             timings.add(ProfilerInfo(taskName, taskTime))
             projectInfos[project.name]?.let {
-                it.durationMillis += taskTime.toLong()
+                it.durationMillis += taskTime
+                if (info.shortMessage != null && it.shortMessage == null) it.shortMessage = info.shortMessage
+                if (info.longMessage != null && it.longMessage == null) it.longMessage = info.longMessage
             }
         }
     }
 
-    private val projectStatuses = arrayListOf<Pair<Project, ProjectBuildStatus>>()
+    private val projectStatuses = arrayListOf<Pair<Project, String>>()
 
     // IBuildListener
     override fun projectStart(project: Project, context: KobaltContext) {
@@ -49,7 +53,9 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
 
     // IBuildListener
     override fun projectEnd(project: Project, context: KobaltContext, status: ProjectBuildStatus) {
-        projectStatuses.add(Pair(project, status))
+        val shortMessage = projectInfos[project.name]?.shortMessage
+        val statusText = status.toString() + (if (shortMessage != null) " ($shortMessage)" else "")
+        projectStatuses.add(Pair(project, statusText))
     }
 
     // IBuildReportContributor
@@ -70,10 +76,15 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
 
         }
 
+        // Calculate the longest short message so we can create a column long enough to contain it
+        val width = 12 + (projectInfos.values.map { it.shortMessage?.length ?: 0 }.maxBy { it } ?: 0)
+
         fun col1(s: String) = String.format(" %1\$-30s", s)
-        fun col2(s: String) = String.format(" %1\$-13s", s)
+        fun col2(s: String) = String.format(" %1\$-${width}s", s)
         fun col3(s: String) = String.format(" %1\$-8s", s)
 
+
+
         // Only print the build report if there is more than one project and at least one of them failed
         if (timings.any()) {
 //        if (timings.size > 1 && hasFailures) {
@@ -83,7 +94,7 @@ class BuildListeners : IBuildListener, IBuildReportContributor {
             table.append(AsciiArt.logBox(listOf(line), AsciiArt.bottomLeft2, AsciiArt.bottomRight2, indent = 10) + "\n")
             projectStatuses.forEach { pair ->
                 val projectName = pair.first.name
-                val cl = listOf(col1(projectName), col2(pair.second.toString()),
+                val cl = listOf(col1(projectName), col2(pair.second),
                         col3(formatMillisLeft(projectInfos[projectName]!!.durationMillis, 8)))
                         .joinToString(AsciiArt.verticalBar)
                 table.append("          " + AsciiArt.verticalBar + " " + cl + " " + AsciiArt.verticalBar + "\n")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt

@@ -70,7 +70,12 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
         copyResources(project, context, SourceSet.of(isTest))
 
         val fullClasspath = dependencyManager.calculateDependencies(project, context,
-                scopes = if (isTest) listOf(Scope.COMPILE, Scope.TEST) else listOf(Scope.COMPILE))
+                scopes = if (isTest) {
+                    listOf(Scope.COMPILE, Scope.COMPILEONLY, Scope.TEST)
+                } else {
+                    listOf(Scope.COMPILE, Scope.COMPILEONLY)
+                })
+
 
         File(project.directory, buildDirectory.path).mkdirs()
 
@@ -196,7 +201,7 @@ class CompilerUtils @Inject constructor(val files: KFiles, val dependencyManager
                 .filter(File::exists)
                 .forEach {
                     context.logger.log(project.name, 2, "Copying from $it to $absOutputDir")
-                        KFiles.copyRecursively(it, absOutputDir, deleteFirst = false)
+                        KFiles.copyRecursively(it, absOutputDir, replaceExisting = true)
                 }
         } else {
             context.logger.log(project.name, 2, "No resources to copy for $sourceSet")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt

@@ -2,7 +2,7 @@ package com.beust.kobalt.internal
 
 class DocUrl {
     companion object {
-        private const val HOST = "http://beust.com/kobalt/"
+        private const val HOST = "https://beust.com/kobalt/"
         private fun url(path: String) = HOST + path
 
         val PUBLISH_PLUGIN_URL = url("plug-ins/index.html#publishing")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt

@@ -7,7 +7,8 @@ import java.lang.reflect.InvocationTargetException
 import java.util.*
 import java.util.concurrent.*
 
-open class TaskResult2<T>(success: Boolean, errorMessage: String?, val value: T) : TaskResult(success, errorMessage) {
+open class TaskResult2<T>(success: Boolean, testResult: TestResult? = null,
+        errorMessage: String? = null, val value: T) : TaskResult(success, testResult, errorMessage) {
     override fun toString() = com.beust.kobalt.misc.toString("TaskResult", "value", value, "success", success)
 }
 
@@ -393,7 +394,7 @@ fun main(argv: Array<String>) {
                 object: IWorker<String> {
                     override fun call(): TaskResult2<String>? {
                         kobaltLog(1, "  Running worker $it")
-                        return TaskResult2(true, null, it)
+                        return TaskResult2(true, value = it)
                     }
 
                     override val priority: Int get() = 0

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt

@@ -4,6 +4,7 @@ import com.beust.kobalt.*
 import com.beust.kobalt.api.*
 import com.beust.kobalt.misc.KFiles
 import com.google.common.annotations.VisibleForTesting
+import com.google.inject.Inject
 import java.io.File
 import java.util.*
 
@@ -15,14 +16,27 @@ abstract class GenericTestRunner: ITestRunnerContributor {
     abstract val dependencyName : String
     abstract val mainClass: String
     abstract val annotationPackage: String
+    abstract val runnerName: String
+    open var shortMessage: String? = null
+    open var longMessage: String? = null
+
+    @Inject
+    private lateinit var jvm: Jvm
+
     abstract fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) : List<String>
 
-    open fun filterTestClasses(classes: List<String>) : List<String> = classes
+    open fun onFinish(project: Project) {}
+
+    open val extraClasspath: List<String> = emptyList()
+
+    open fun filterTestClasses(project: Project, context: KobaltContext, classes: List<String>) : List<String> = classes
 
     override fun run(project: Project, context: KobaltContext, configName: String,
-            classpath: List<IClasspathDependency>)
-        = TaskResult(runTests(project, context, classpath, configName))
+            classpath: List<IClasspathDependency>) : TaskResult {
+        val tr = runTests(project, context, classpath, configName)
+        return TaskResult(tr.success, testResult = tr)
+    }
 
     override fun affinity(project: Project, context: KobaltContext) : Int {
         val result =
@@ -55,7 +69,7 @@ abstract class GenericTestRunner: ITestRunnerContributor {
 //            }
 
         context.logger.log(project.name, 2, "Found ${result.size} test classes")
-        return filterTestClasses(result.map { it.second })
+        return filterTestClasses(project, context, result.map { it.second })
     }
 
     /**
@@ -95,18 +109,19 @@ abstract class GenericTestRunner: ITestRunnerContributor {
      * @return true if all the tests passed
      */
     open fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
-            configName: String) : Boolean {
+            configName: String) : TestResult {
         var result = false
 
-        context.logger.log(project.name, 1, "Running default TestNG runner")
+        context.logger.log(project.name, 1, "Running tests with $runnerName")
 
         val testConfig = project.testConfigs.firstOrNull { it.name == configName }
 
+        var errorCode = -1
         if (testConfig != null) {
             val args = args(project, context, classpath, testConfig)
             if (args.size > 0) {
 
-                val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable
+                val java = jvm.javaExecutable
                 val jvmArgs = calculateAllJvmArgs(project, context, testConfig, classpath,
                         Kobalt.INJECTOR.getInstance (PluginInfo::class.java))
                 val allArgs = arrayListOf<String>().apply {
@@ -122,12 +137,7 @@ abstract class GenericTestRunner: ITestRunnerContributor {
                 context.logger.log(project.name, 2, "Running tests with classpath size ${classpath.size}")
                 context.logger.log(project.name, 2, "Launching " + allArgs.joinToString(" "))
                 val process = pb.start()
-                val errorCode = process.waitFor()
-                if (errorCode == 0) {
-                    context.logger.log(project.name, 1, "All tests passed")
-                } else {
-                    context.logger.log(project.name, 1, "Test failures")
-                }
+                errorCode = process.waitFor()
                 result = result || errorCode == 0
             } else {
                 context.logger.log(project.name, 1, "  No tests to run")
@@ -136,7 +146,16 @@ abstract class GenericTestRunner: ITestRunnerContributor {
         } else {
             throw KobaltException("Couldn't find a test configuration named \"$configName\"")
         }
-        return result
+
+        onFinish(project)
+
+        if (errorCode == 0) {
+            context.logger.log(project.name, 1, "All tests passed")
+        } else {
+            context.logger.log(project.name, 1, longMessage!!)
+        }
+
+        return TestResult(result, shortMessage, longMessage)
     }
 
     /*
@@ -144,13 +163,14 @@ abstract class GenericTestRunner: ITestRunnerContributor {
      */
     @VisibleForTesting
     fun calculateAllJvmArgs(project: Project, context: KobaltContext,
-                            testConfig: TestConfig, classpath: List<IClasspathDependency>, pluginInfo: IPluginInfo) : List<String> {
+            testConfig: TestConfig, classpath: List<IClasspathDependency>, pluginInfo: IPluginInfo) : List<String> {
+        val fullClasspath = classpath.map { it.jarFile.get().absolutePath } + extraClasspath
         // Default JVM args
         val jvmFlags = arrayListOf<String>().apply {
             addAll(testConfig.jvmArgs)
             add("-ea")
             add("-classpath")
-            add(classpath.map { it.jarFile.get().absolutePath }.joinToString(File.pathSeparator))
+            add(fullClasspath.joinToString(File.pathSeparator))
         }
 
         // JVM flags from the contributors

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JUnit5Runner.kt

@@ -0,0 +1,152 @@
+package com.beust.kobalt.internal
+
+import com.beust.jcommander.JCommander
+import com.beust.jcommander.Parameter
+import com.beust.kobalt.TestConfig
+import com.beust.kobalt.api.IAffinity
+import com.beust.kobalt.api.IClasspathDependency
+import com.beust.kobalt.api.KobaltContext
+import com.beust.kobalt.api.Project
+import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.KobaltLogger
+import com.google.inject.Inject
+import org.junit.platform.engine.TestExecutionResult
+import org.junit.platform.engine.discovery.DiscoverySelectors
+import org.junit.platform.engine.reporting.ReportEntry
+import org.junit.platform.engine.support.descriptor.MethodSource
+import org.junit.platform.launcher.LauncherDiscoveryRequest
+import org.junit.platform.launcher.TestExecutionListener
+import org.junit.platform.launcher.TestIdentifier
+import org.junit.platform.launcher.TestPlan
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
+import org.junit.platform.launcher.core.LauncherFactory
+import java.io.File
+import java.nio.file.Paths
+
+/**
+ * Runner for JUnit 5 tests. This class also contains a main() entry point since JUnit 5 no longer supplies one.
+ */
+class JUnit5Runner @Inject constructor(kFiles: KFiles) : GenericTestRunner() {
+
+    override val dependencyName = "jupiter"
+    override val annotationPackage = "org.junit.jupiter.api"
+    override val mainClass = "com.beust.kobalt.internal.JUnit5RunnerKt"
+    override val runnerName = "JUnit 5"
+
+    override fun affinity(project: Project, context: KobaltContext) : Int {
+        val result =
+                if (project.testDependencies.any { it.id.contains("junit5") || it.id.contains("jupiter") })
+                    IAffinity.DEFAULT_POSITIVE_AFFINITY + 100
+                else 0
+        return result
+
+    }
+
+    override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>, testConfig: TestConfig): List<String> {
+        val testClassDir = KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
+        val classDir = KFiles.joinDir(project.buildDirectory, KFiles.CLASSES_DIR)
+        val args = listOf("--testClassDir", testClassDir,
+                "--classDir", classDir,
+                "--log", KobaltLogger.LOG_LEVEL.toString())
+        return args
+    }
+
+    override val extraClasspath = kFiles.kobaltJar
+}
+
+private class Args {
+    @Parameter(names = arrayOf("--log"))
+    var log: Int = 1
+
+    @Parameter(names = arrayOf("--testClassDir"))
+    var testClassDir: String = "kobaltBuild/test-classes"
+
+    @Parameter(names = arrayOf("--classDir"))
+    var classDir: String = "kobaltBuild/classes"
+}
+
+fun main(argv: Array<String>) {
+    val args = Args()
+    val jc = JCommander(args)
+    jc.parse(*argv)
+
+    val testClassDir = File(args.testClassDir).absolutePath
+    val classDir = File(args.classDir).absolutePath
+    val request : LauncherDiscoveryRequest = LauncherDiscoveryRequestBuilder()
+            .selectors(DiscoverySelectors.selectClasspathRoots(setOf(
+                    Paths.get(testClassDir),
+                    Paths.get(classDir)
+            )))
+            .selectors(DiscoverySelectors.selectDirectory(testClassDir))
+            .build()
+
+    fun testName(id: TestIdentifier) : String? {
+        val result =
+                if (id.source.isPresent) {
+                    val source = id.source.get()
+                    if (source is MethodSource) {
+                        source.className + "." + source.methodName
+                    } else {
+                        null
+                    }
+                } else {
+                    null
+                }
+        return result
+    }
+
+    var passed = 0
+    var failed = 0
+    var skipped = 0
+    var aborted = 0
+
+    fun log(level: Int, s: String) {
+        if (level <= args.log) println(s)
+    }
+
+    val listener = object: TestExecutionListener {
+        override fun executionFinished(testIdentifier: TestIdentifier, testExecutionResult: TestExecutionResult) {
+            val testName = testName(testIdentifier)
+            if (testName != null) {
+                when(testExecutionResult.status) {
+                    TestExecutionResult.Status.FAILED -> {
+                        log(1, "FAILED: $testName, reason: " + testExecutionResult.throwable.get().toString())
+                        failed++
+                    }
+                    TestExecutionResult.Status.ABORTED -> {
+                        log(1, "ABORTED: $testName, reason: " + testExecutionResult.throwable.get().toString())
+                        aborted++
+                    }
+                    TestExecutionResult.Status.SUCCESSFUL -> {
+                        log(2, "PASSED: $testName")
+                        passed++
+                    } else -> {
+
+                    }
+                }
+            }
+        }
+
+        override fun executionSkipped(testIdentifier: TestIdentifier, reason: String) {
+            testName(testIdentifier)?.let {
+                log(1, "Skipping $it because $reason")
+                skipped++
+            }
+        }
+
+        override fun executionStarted(testIdentifier: TestIdentifier) {
+            testName(testIdentifier)?.let {
+                log(2, "Starting $it")
+            }
+        }
+
+        override fun testPlanExecutionStarted(testPlan: TestPlan?) {}
+        override fun dynamicTestRegistered(testIdentifier: TestIdentifier?) {}
+        override fun reportingEntryPublished(testIdentifier: TestIdentifier?, entry: ReportEntry?) {}
+        override fun testPlanExecutionFinished(testPlan: TestPlan?) {}
+    }
+
+    LauncherFactory.create().execute(request, listener)
+
+    log(1, "TEST RESULTS: $passed PASSED, $failed FAILED, $skipped SKIPPED, $aborted ABORTED")
+}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt

@@ -4,16 +4,29 @@ import com.beust.kobalt.TestConfig
 import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
+import com.beust.kobalt.maven.DependencyManager
+import com.google.inject.Inject
+import java.lang.reflect.Modifier
+import java.net.URLClassLoader
 
 open class JUnitRunner() : GenericTestRunner() {
 
     override val mainClass = "org.junit.runner.JUnitCore"
-
     override val annotationPackage = "org.junit"
-
     override val dependencyName = "junit"
+    override val runnerName = "JUnit 4"
 
     override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) = findTestClasses(project, context, testConfig)
+
+    @Inject
+    lateinit var dependencyManager: DependencyManager
+
+    override fun filterTestClasses(project: Project, context: KobaltContext, classes: List<String>) : List<String> {
+        val deps = dependencyManager.testDependencies(project, context)
+        val cl = URLClassLoader(deps.map { it.jarFile.get().toURI().toURL() }.toTypedArray())
+        return classes.filter { !Modifier.isAbstract(cl.loadClass(it).modifiers) }
+    }
+
 }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt

@@ -28,7 +28,6 @@ class JvmCompiler @Inject constructor(val dependencyManager: DependencyManager)
             .distinct()
 
         // Plugins that add flags to the compiler
-        val currentFlags = arrayListOf<String>().apply { addAll(info.compilerArgs) }
         val contributorFlags : List<String> = if (project != null) flags else emptyList()
 
         val addedFlags = contributorFlags + ArrayList(info.compilerArgs)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt

@@ -9,7 +9,6 @@ import com.beust.kobalt.api.annotation.ExportedProjectProperty
 import com.beust.kobalt.api.annotation.IncrementalTask
 import com.beust.kobalt.api.annotation.Task
 import com.beust.kobalt.maven.DependencyManager
-import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.maven.Md5
 import com.beust.kobalt.maven.aether.Scope
 import com.beust.kobalt.misc.KFiles
@@ -27,7 +26,6 @@ import javax.inject.Singleton
  */
 @Singleton
 open class JvmCompilerPlugin @Inject constructor(
-        open val localRepo: LocalRepo,
         open val files: KFiles,
         open val dependencyManager: DependencyManager,
         open val executors: KobaltExecutors,
@@ -91,7 +89,7 @@ open class JvmCompilerPlugin @Inject constructor(
                     dependencyFilter = dependencyManager.createDependencyFilter(project, project.testDependencies),
                     scopes = listOf(Scope.TEST))
             val compileDependencies = dependencyManager.calculateDependencies(project, context,
-                    scopes = listOf(Scope.COMPILE))
+                    scopes = listOf(Scope.COMPILE, Scope.COMPILEONLY))
             val allDependencies = (testDependencies + compileDependencies).distinct()
             return testContributor.run(project, context, configName, allDependencies.toList())
         } else {
@@ -159,6 +157,10 @@ open class JvmCompilerPlugin @Inject constructor(
         if (compilerContributors.isEmpty()) {
             throw KobaltException("Couldn't find any compiler for project ${project.name}")
         } else {
+
+            // Generate BuildConfig if applicable
+            context.variant.maybeGenerateBuildConfig(project, context)
+
             val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context)}.sorted()
 
             /**
@@ -172,7 +174,10 @@ open class JvmCompilerPlugin @Inject constructor(
                     if (wi.value.sourceSuffixes.contains("java")) ij = wi.index
                     if (wi.value.sourceSuffixes.contains("kt")) ik = wi.index
                 }
-                Collections.swap(result, ik, ij)
+
+                if (ik >= 0 && ij >= 0) {
+                    Collections.swap(result, ik, ij)
+                }
                 return result
             }
 
@@ -182,8 +187,8 @@ open class JvmCompilerPlugin @Inject constructor(
             var done = false
             // The directory where the classes get compiled
             val buildDirectory =
-                    if (isTest) File(project.buildDirectory, KFiles.TEST_CLASSES_DIR)
-                    else File(project.classesDir(context))
+                    if (isTest) File(KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR))
+                    else File(KFiles.joinDir(project.classesDir(context)))
 
             allCompilersSorted.doWhile({ ! done }) { compiler ->
                 val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
@@ -221,7 +226,7 @@ open class JvmCompilerPlugin @Inject constructor(
     }
 
     @Task(name = "doc", description = "Generate the documentation for the project", group = GROUP_DOCUMENTATION,
-            runBefore = arrayOf("assemble"))
+            runBefore = arrayOf("assemble"), runAfter = arrayOf("clean"))
     fun taskJavadoc(project: Project): TaskResult {
         val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors)
         if (docGenerator != null) {

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt

@@ -78,7 +78,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
     val compilerInterceptors = arrayListOf<ICompilerInterceptor>()
     val sourceDirectoriesInterceptors = arrayListOf<ISourceDirectoryInterceptor>()
     val buildDirectoryInterceptors = arrayListOf<IBuildDirectoryInterceptor>()
-    val runnerContributors = arrayListOf<IRunnerContributor>()
+//    val runnerContributors = arrayListOf<IRunnerContributor>()
     val testRunnerContributors = arrayListOf<ITestRunnerContributor>()
     val classpathInterceptors = arrayListOf<IClasspathInterceptor>()
     val compilerContributors = arrayListOf<ICompilerContributor>()
@@ -197,7 +197,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
                 if (this is IPlugin) plugins.add(this)
                 if (this is IProjectContributor) projectContributors.add(this)
                 if (this is IRepoContributor) repoContributors.add(this)
-                if (this is IRunnerContributor) runnerContributors.add(this)
+//                if (this is IRunnerContributor) runnerContributors.add(this)
                 if (this is ISourceDirectoryContributor) sourceDirContributors.add(this)
                 if (this is ISourceDirectoryInterceptor) sourceDirectoriesInterceptors.add(this)
                 if (this is ITaskContributor) taskContributors.add(this)
@@ -225,7 +225,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
         listOf(projectContributors, classpathContributors, templateContributors,
                 repoContributors, compilerFlagContributors, compilerInterceptors,
                 sourceDirectoriesInterceptors, buildDirectoryInterceptors,
-                runnerContributors, testRunnerContributors, classpathInterceptors,
+                /* runnerContributors, */ testRunnerContributors, classpathInterceptors,
                 compilerContributors, docContributors, sourceDirContributors,
                 testSourceDirContributors, buildConfigFieldContributors,
                 taskContributors, incrementalTaskContributors, assemblyContributors,
@@ -252,7 +252,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
         compilerInterceptors.addAll(pluginInfo.compilerInterceptors)
         sourceDirectoriesInterceptors.addAll(pluginInfo.sourceDirectoriesInterceptors)
         buildDirectoryInterceptors.addAll(pluginInfo.buildDirectoryInterceptors)
-        runnerContributors.addAll(pluginInfo.runnerContributors)
+//        runnerContributors.addAll(pluginInfo.runnerContributors)
         testRunnerContributors.addAll(pluginInfo.testRunnerContributors)
         classpathInterceptors.addAll(pluginInfo.classpathInterceptors)
         compilerContributors.addAll(pluginInfo.compilerContributors)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltSettingsXml.kt

@@ -25,7 +25,7 @@ class KobaltSettingsXml {
     @XmlElement(name = "localMavenRepo") @JvmField
     var localMavenRepo: String = homeDir(KFiles.KOBALT_DOT_DIR, "localMavenRepo")
 
-    @XmlElement(name = "defaulRepos") @JvmField
+    @XmlElement(name = "defaultRepos") @JvmField
     var defaultRepos: DefaultReposXml? = null
 
     @XmlElement(name = "proxies") @JvmField

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KotlinJarFiles.kt

@@ -16,6 +16,5 @@ class KotlinJarFiles @Inject constructor(val dependencyManager: DependencyManage
     }
 
     val stdlib: File get() = getKotlinCompilerJar("stdlib")
-    val runtime: File get() = getKotlinCompilerJar("runtime")
     val compiler: File get() = getKotlinCompilerJar("compiler-embeddable")
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KotlinTestRunner.kt

@@ -1,16 +1,21 @@
 package com.beust.kobalt.internal
 
+import com.beust.kobalt.api.KobaltContext
+import com.beust.kobalt.api.Project
+
 /**
  * KotlinTestRunner triggers if it finds a dependency on io.kotlintest but other than that, it just
  * uses the regular JUnitRunner.
  */
 class KotlinTestRunner : JUnitRunner() {
     override val dependencyName = "io.kotlintest"
+    override val runnerName = "Kotlin Test"
 
     /**
      * KotlinTestRunner runs tests in the init{} initializer, so ignore all the extra
      * classes generated by the Kotlin compiler.
      */
-    override fun filterTestClasses(classes: List<String>) = classes.filter { ! it.contains("$") }
+    override fun filterTestClasses(projet: Project, context: KobaltContext, classes: List<String>)
+            = classes.filter { !it.contains("$") }
 }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelProjectRunner.kt

@@ -54,12 +54,12 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
                             runBuildListenersForTask(project, context, task.name, start = true)
                             logger.log(project.name, 1,
                                     AsciiArt.taskColor(AsciiArt.horizontalSingleLine + " ${project.name}:${task.name}"))
-                            val thisResult = if (dryRun) TaskResult2(true, null, task) else task.call()
+                            val thisResult = if (dryRun) TaskResult2(true, value = task) else task.call()
                             if (lastResult.success) {
                                 lastResult = thisResult
                             }
                             runBuildListenersForTask(project, context, task.name, start = false,
-                                    success = thisResult.success)
+                                    success = thisResult.success, testResult = thisResult.testResult)
                         }
                     }
                     graph.freeNodes.forEach { graph.removeNode(it) }
@@ -69,7 +69,7 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
                 runBuildListenersForProject(project, context, false,
                         if (lastResult.success) ProjectBuildStatus.SUCCESS else ProjectBuildStatus.FAILED)
 
-                return TaskResult2(lastResult.success, lastResult.errorMessage, this)
+                return TaskResult2(lastResult.success, errorMessage = lastResult.errorMessage, value = this)
             }
 
         }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/SpekRunner.kt

@@ -6,5 +6,6 @@ package com.beust.kobalt.internal
  */
 class SpekRunner : JUnitRunner() {
     override val dependencyName = "org.jetbrains.spek"
+    override val runnerName = "Spek"
 }
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt

@@ -17,7 +17,7 @@ import javax.inject.Singleton
 @Singleton
 class TaskManager @Inject constructor(val args: Args,
         val incrementalManagerFactory: IncrementalManager.IFactory,
-        val pluginInfo: PluginInfo, val kobaltLog: ParallelLogger) {
+        val kobaltLog: ParallelLogger) {
     private val dependsOn = TreeMultimap.create<String, String>()
     private val reverseDependsOn = TreeMultimap.create<String, String>()
     private val runBefore = TreeMultimap.create<String, String>()
@@ -80,6 +80,9 @@ class TaskManager @Inject constructor(val args: Args,
         }
     }
 
+//    @Inject
+//    lateinit var pluginInfo: PluginInfo
+
     fun runTargets(passedTaskNames: List<String>, allProjects: List<Project>): RunTargetResult {
         // Check whether tasks passed at command line exist
         passedTaskNames.forEach {
@@ -87,6 +90,7 @@ class TaskManager @Inject constructor(val args: Args,
                 throw KobaltException("Unknown task: $it")
         }
 
+        val pluginInfo = Kobalt.INJECTOR.getInstance(PluginInfo::class.java)
         var taskInfos = calculateDependentTaskNames(passedTaskNames, allProjects)
 
         // Remove non existing tasks (e.g. dynamic task defined for a single project)
@@ -268,7 +272,8 @@ class TaskManager @Inject constructor(val args: Args,
                 object : BasePluginTask(plugin, name, description, group, project) {
                     override fun call(): TaskResult2<ITask> {
                         val taskResult = task(project)
-                        return TaskResult2(taskResult.success, taskResult.errorMessage, this)
+                        return TaskResult2(taskResult.success, errorMessage = taskResult.errorMessage, value = this,
+                            testResult = taskResult.testResult)
                     }
                 })
         dependsOn.forEach { dependsOn(it, name) }
@@ -315,9 +320,11 @@ class TaskWorker(val tasks: List<ITask>, val dryRun: Boolean, val pluginInfo: Pl
             val tr = if (dryRun) TaskResult() else it.call()
             BaseProjectRunner.runBuildListenersForTask(it.project, context, name, start = false, success = tr.success)
             success = success and tr.success
-            if (tr.errorMessage != null) errorMessages.add(tr.errorMessage)
+            tr.errorMessage?.let {
+                errorMessages.add(it)
+            }
         }
-        return TaskResult2(success, errorMessages.joinToString("\n"), tasks[0])
+        return TaskResult2(success, errorMessage = errorMessages.joinToString("\n"), value = tasks[0])
     }
 
 //    override val timeOut : Long = 10000

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt

@@ -2,23 +2,38 @@ package com.beust.kobalt.internal
 
 import com.beust.kobalt.AsciiArt
 import com.beust.kobalt.TestConfig
-import com.beust.kobalt.api.*
+import com.beust.kobalt.TestResult
+import com.beust.kobalt.api.IClasspathDependency
+import com.beust.kobalt.api.KobaltContext
+import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.aether.AetherDependency
 import com.beust.kobalt.misc.*
 import org.testng.remote.RemoteArgs
-import org.testng.remote.strprotocol.*
+import org.testng.remote.strprotocol.JsonMessageSender
+import org.testng.remote.strprotocol.MessageHelper
+import org.testng.remote.strprotocol.MessageHub
+import org.testng.remote.strprotocol.TestResultMessage
+import org.w3c.dom.Attr
+import org.w3c.dom.NodeList
+import org.xml.sax.InputSource
 import java.io.File
+import java.io.FileReader
 import java.io.IOException
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.xpath.XPathConstants
+import javax.xml.xpath.XPathFactory
 
 class TestNgRunner : GenericTestRunner() {
 
     override val mainClass = "org.testng.TestNG"
-
     override val dependencyName = "testng"
-
     override val annotationPackage = "org.testng"
+    override val runnerName = "TestNG"
 
-    fun defaultOutput(project: Project) = KFiles.joinDir(project.buildDirectory, "test-output")
+    private fun defaultOutputWithoutProjectDir(project: Project)
+            = KFiles.joinDir(project.buildDirectory, "test-output")
+    private fun defaultOutput(project: Project)
+            = KFiles.joinDir(project.directory, project.buildDirectory, "test-output")
 
     override fun args(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
             testConfig: TestConfig) = arrayListOf<String>().apply {
@@ -30,7 +45,9 @@ class TestNgRunner : GenericTestRunner() {
 
         if (testConfig.testArgs.none { it == "-d" }) {
             add("-d")
-            add(defaultOutput(project))
+            // Don't include the project directory here since the generic runner will cd to that directory before
+            // running the tests
+            add(defaultOutputWithoutProjectDir(project))
         }
 
         if (testConfig.testArgs.size == 0) {
@@ -56,11 +73,50 @@ class TestNgRunner : GenericTestRunner() {
         }
     }
 
+    /**
+     * Extract test results from testng-results.xml and initialize shortMessage.
+     */
+    override fun onFinish(project: Project) {
+        File(defaultOutput(project), "testng-results.xml").let { file ->
+            val ins = InputSource(FileReader(file))
+            val doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(ins)
+
+            val root = doc.documentElement
+            var failed = 0
+            var skipped = 0
+            var passed = 0
+            val xp = XPathFactory.newInstance().newXPath()
+            val testMethods = xp.compile("/testng-results/suite/test/class/test-method[@status='FAIL']")
+                    .evaluate(doc, XPathConstants.NODESET)
+                    as NodeList
+            val failedMethods = arrayListOf<String>()
+            repeat(testMethods.length) {
+                val tm = testMethods.item(it)
+                failedMethods.add(tm.attributes.getNamedItem("signature").textContent)
+            }
+            repeat(root.attributes.length) {
+                val attribute = root.attributes.item(it)
+                if (attribute is Attr) when (attribute.name) {
+                    "failed" -> failed = Integer.parseInt(attribute.value)
+                    "skipped" -> skipped = Integer.parseInt(attribute.value)
+                    "passed" -> passed = Integer.parseInt(attribute.value)
+                }
+            }
+
+            if (failed == 0) {
+                shortMessage = "$passed tests"
+            } else if (failed > 0) {
+                shortMessage = "$failed failed" + (if (skipped > 0) ", $skipped skipped" else "") + " tests"
+                longMessage = "Failed tests:\n  " + failedMethods.joinToString("\n  ")
+            }
+        }
+    }
+
     val VERSION_6_10 = StringVersion("6.10")
 
     fun _runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
 //    override fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
-            configName: String): Boolean {
+            configName: String): TestResult {
 
         val testConfig = project.testConfigs.firstOrNull { it.name == configName }
 
@@ -81,7 +137,7 @@ class TestNgRunner : GenericTestRunner() {
                 }
             return result
         } else {
-            return true
+            return TestResult(true)
         }
     }
 
@@ -98,7 +154,8 @@ class TestNgRunner : GenericTestRunner() {
     }
 
     private fun displayPrettyColors(project: Project, context: KobaltContext,
-            classpath: List<IClasspathDependency>, testConfig: TestConfig, versions: Pair<String, String>): Boolean {
+            classpath: List<IClasspathDependency>, testConfig: TestConfig, versions: Pair<String, String>)
+            : TestResult {
         val port = 2345
 //        launchRemoteServer(project, context, classpath, testConfig, versions, port)
 
@@ -147,7 +204,7 @@ class TestNgRunner : GenericTestRunner() {
             val top = it.stackTrace.substring(0, it.stackTrace.indexOf("\n"))
              kobaltLog(1, "  " + it.cls + "." + it.method + "\n    " + top)
         }
-        return failed.isEmpty() && skipped.isEmpty()
+        return TestResult(failed.isEmpty() && skipped.isEmpty())
     }
 
     fun launchRemoteServer(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt

@@ -106,6 +106,10 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
             val result = arrayListOf<IClasspathDependency>().apply {
                 if (scopes.contains(Scope.COMPILE)) {
                     addAll(project.compileDependencies)
+                    addAll(project.compileProvidedDependencies)
+                }
+                if (scopes.contains(Scope.COMPILEONLY)) {
+                    addAll(project.compileOnlyDependencies)
                 }
                 if (scopes.contains(Scope.RUNTIME)) {
                     addAll(project.compileRuntimeDependencies)
@@ -175,13 +179,13 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors,
      * TODO: This should be private, everyone should be calling calculateDependencies().
      */
     fun transitiveClosure(dependencies : List<IClasspathDependency>,
-            dependencyFilter: DependencyFilter? = null,
+            filter: DependencyFilter = Filters.EXCLUDE_OPTIONAL_FILTER,
             requiredBy: String? = null): List<IClasspathDependency> {
         val result = arrayListOf<IClasspathDependency>()
         dependencies.forEach { dependency ->
             result.add(dependency)
             if (dependency.isMaven) {
-                val resolved = resolver.resolveToIds(dependency.id, null, dependencyFilter).map { create(it) }
+                val resolved = resolver.resolveToIds(dependency.id, null, filter).map { create(it) }
                 result.addAll(resolved)
             }
         }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Gpg.kt

@@ -1,16 +1,18 @@
 package com.beust.kobalt.maven
 
 import com.beust.kobalt.OperatingSystem
+import com.beust.kobalt.misc.LocalProperties
 import com.beust.kobalt.misc.error
 import com.beust.kobalt.misc.kobaltLog
 import com.beust.kobalt.misc.warn
+import com.google.inject.Inject
 import com.google.inject.Singleton
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
 
 @Singleton
-class Gpg {
+class Gpg @Inject constructor(val localProperties: LocalProperties) {
     val COMMANDS = listOf("gpg", "gpg2")
 
      fun findGpgCommand() : String? {
@@ -42,6 +44,21 @@ class Gpg {
                 ascFile.delete()
                 val allArgs = arrayListOf<String>()
                 allArgs.add(gpg)
+
+                fun maybeAdd(prop: String, f: (String) -> Unit) = localProperties.getNoThrows(prop)?.let {
+                    f(it)
+                }
+
+                maybeAdd("gpg.password") {
+                    allArgs.addAll(listOf("--passphrase", it, "--batch", "--yes"))
+                }
+                maybeAdd("gpg.keyId") {
+                    allArgs.addAll(listOf("--local-user", it))
+                }
+                maybeAdd("gpg.secretKeyRingFile") {
+                    allArgs.addAll(listOf("--secret-keyring", "\"$it\""))
+                }
+
                 allArgs.add("-ab")
                 allArgs.add(file.absolutePath)
 

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt

@@ -1,9 +1,8 @@
 package com.beust.kobalt.maven
 
 import com.beust.kobalt.HostConfig
-import com.beust.kobalt.KobaltException
+import com.beust.kobalt.maven.aether.KobaltMavenResolver
 import com.beust.kobalt.maven.dependency.FileDependency
-import com.beust.kobalt.misc.LocalProperties
 import java.io.*
 import java.net.HttpURLConnection
 import java.net.URL
@@ -21,27 +20,7 @@ class Kurl(val hostInfo: HostConfig) {
     }
 
     init {
-        // See if the URL needs to be authenticated. Look in local.properties for keys
-        // of the format authUrl.<host>.user=xxx and authUrl.<host>.password=xxx
-        val properties = LocalProperties().localProperties
-        val host = java.net.URL(hostInfo.url).host
-        properties.entries.forEach {
-            val key = it.key.toString()
-            if (key == "$KEY.$host.$VALUE_USER") {
-                hostInfo.username = properties.getProperty(key)
-            } else if (key == "$KEY.$host.$VALUE_PASSWORD") {
-                hostInfo.password = properties.getProperty(key)
-            }
-        }
-        fun error(s1: String, s2: String) {
-            throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for $KEY.$host",
-                    docUrl = "http://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
-        }
-        if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) {
-            error("username", "password")
-        } else if(hostInfo.username.isNullOrBlank() && ! hostInfo.password.isNullOrBlank()) {
-            error("password", "username")
-        }
+        KobaltMavenResolver.initAuthentication(hostInfo)
     }
 
     override fun toString() = hostInfo.toString()

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt

@@ -1,5 +1,6 @@
 package com.beust.kobalt.maven.aether
 
+import com.beust.kobalt.Args
 import com.beust.kobalt.api.Dependencies
 import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.Kobalt
@@ -7,10 +8,12 @@ import com.beust.kobalt.maven.CompletedFuture
 import com.beust.kobalt.misc.StringVersion
 import com.beust.kobalt.misc.warn
 import org.eclipse.aether.artifact.Artifact
+import org.eclipse.aether.artifact.DefaultArtifact
+import org.eclipse.aether.resolution.DependencyResolutionException
 import java.io.File
 import java.util.concurrent.Future
 
-class AetherDependency(val artifact: Artifact, override val optional: Boolean = false)
+class AetherDependency(val artifact: Artifact, override val optional: Boolean = false, val args: Args? = null)
         : IClasspathDependency, Comparable<AetherDependency> {
     val aether: KobaltMavenResolver get() = Kobalt.INJECTOR.getInstance(KobaltMavenResolver::class.java)
 
@@ -23,13 +26,29 @@ class AetherDependency(val artifact: Artifact, override val optional: Boolean =
     private fun toId(a: Artifact) = a.toString()
 
     override val jarFile: Future<File>
-        get() =
-            if (artifact.file != null) {
-                CompletedFuture(artifact.file)
-            } else {
-                val td = aether.resolve(artifact, null)
-                CompletedFuture(td.root.artifact.file)
+        get() {
+            resolveSourcesIfNeeded()
+            return if (artifact.file != null) {
+                    CompletedFuture(artifact.file)
+                } else {
+                    val td = aether.resolve(artifact)
+                    CompletedFuture(td.root.artifact.file)
+                }
+        }
+
+    private fun resolveSourcesIfNeeded() {
+        if (args?.downloadSources ?: false) {
+            listOf(artifact.toSourcesArtifact(), artifact.toJavaDocArtifact()).forEach { artifact ->
+                if (artifact.file == null) {
+                    try {
+                        aether.resolve(artifact)
+                    } catch(e: DependencyResolutionException) {
+                        // Ignore
+                    }
+                }
             }
+        }
+    }
 
     override fun toMavenDependencies(scope: String?) : org.apache.maven.model.Dependency {
         val passedScope = scope
@@ -69,4 +88,7 @@ class AetherDependency(val artifact: Artifact, override val optional: Boolean =
     override fun equals(other: Any?) = if (other is AetherDependency) other.id == id else false
 
     override fun toString() = id
+
+    fun Artifact.toSourcesArtifact() = DefaultArtifact(groupId, artifactId, "sources", extension, version)
+    fun Artifact.toJavaDocArtifact() = DefaultArtifact(groupId, artifactId, "javadoc", extension, version)
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Booter.kt

@@ -2,6 +2,7 @@ package com.beust.kobalt.maven.aether
 
 import com.beust.kobalt.internal.KobaltSettings
 import com.google.common.eventbus.EventBus
+import com.beust.kobalt.Args
 import org.eclipse.aether.DefaultRepositorySystemSession
 import org.eclipse.aether.RepositorySystem
 import org.eclipse.aether.repository.LocalRepository
@@ -32,8 +33,9 @@ object Booter {
 //    }
 
     fun newRepositorySystemSession(system: RepositorySystem, repo: File, settings: KobaltSettings,
-            eventBus: EventBus): DefaultRepositorySystemSession {
+            args: Args, eventBus: EventBus): DefaultRepositorySystemSession {
         val session = MavenRepositorySystemUtils.newSession(settings)
+        session.isOffline = args.offline
 
         val localRepo = LocalRepository(repo.absolutePath)
         session.localRepositoryManager = system.newLocalRepositoryManager(session, localRepo)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/ConsoleRepositoryListener.kt

@@ -16,12 +16,6 @@ class ConsoleRepositoryListener @JvmOverloads constructor(out: PrintStream? = nu
         val LOG_LEVEL = 4
     }
 
-    private val out: PrintStream
-
-    init {
-        this.out = out ?: System.out
-    }
-
     override fun artifactDeployed(event: RepositoryEvent?) {
         kobaltLog(LOG_LEVEL, "Deployed " + event!!.artifact + " to " + event.repository)
     }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Filters.kt

@@ -1,6 +1,8 @@
 package com.beust.kobalt.maven.aether
 
+import com.beust.kobalt.misc.kobaltLog
 import org.eclipse.aether.graph.DependencyFilter
+import org.eclipse.aether.graph.DependencyNode
 import org.eclipse.aether.util.artifact.JavaScopes
 
 object Filters {
@@ -9,7 +11,15 @@ object Filters {
     }
     val TEST_FILTER = DependencyFilter { p0, p1 -> p0.dependency.scope == JavaScopes.TEST }
 
-    val EXCLUDE_OPTIONAL_FILTER = DependencyFilter { p0, p1 ->
-        p0.dependency != null && ! p0.dependency.optional
+    val EXCLUDE_OPTIONAL_FILTER = object: DependencyFilter {
+        override fun accept(p0: DependencyNode, p1: MutableList<DependencyNode>): Boolean {
+            val result = p0.dependency != null && ! p0.dependency.optional
+            if (! result) {
+                kobaltLog(3, "Excluding from optional filter: $p0")
+            }
+            return result
+        }
+
+        override fun toString() = "EXCLUDE_OPTIONAL_FILTER"
     }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt

@@ -1,11 +1,15 @@
 package com.beust.kobalt.maven.aether
 
 import com.beust.kobalt.Args
+import com.beust.kobalt.HostConfig
+import com.beust.kobalt.KobaltException
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.internal.KobaltSettings
 import com.beust.kobalt.internal.getProxy
+import com.beust.kobalt.maven.Kurl
 import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.maven.MavenId
+import com.beust.kobalt.misc.LocalProperties
 import com.google.common.eventbus.EventBus
 import com.google.inject.Inject
 import org.eclipse.aether.artifact.Artifact
@@ -20,6 +24,7 @@ import org.eclipse.aether.resolution.DependencyRequest
 import org.eclipse.aether.resolution.DependencyResult
 import org.eclipse.aether.resolution.VersionRangeRequest
 import org.eclipse.aether.resolution.VersionRangeResult
+import org.eclipse.aether.util.repository.AuthenticationBuilder
 import java.util.*
 
 class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
@@ -31,30 +36,76 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
             MavenId.toId(it.groupId, it.artifactId, it.extension, it.classifier, it.version)
         }
         fun isRangeVersion(id: String) = id.contains(",")
+
+        fun initAuthentication(hostInfo: HostConfig) {
+            // See if the URL needs to be authenticated. Look in local.properties for keys
+            // of the format authUrl.<host>.user=xxx and authUrl.<host>.password=xxx
+            val properties = LocalProperties().localProperties
+            val host = java.net.URL(hostInfo.url).host
+            properties.entries.forEach {
+                val key = it.key.toString()
+                if (key == "${Kurl.KEY}.$host.${Kurl.VALUE_USER}") {
+                    hostInfo.username = properties.getProperty(key)
+                } else if (key == "${Kurl.KEY}.$host.${Kurl.VALUE_PASSWORD}") {
+                    hostInfo.password = properties.getProperty(key)
+                }
+            }
+            fun error(s1: String, s2: String) {
+                throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for ${Kurl.KEY}.$host",
+                        docUrl = "https://beust.com/kobalt/documentation/index.html#maven-repos-authenticated")
+            }
+            if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) {
+                error("username", "password")
+            } else if(hostInfo.username.isNullOrBlank() && ! hostInfo.password.isNullOrBlank()) {
+                error("password", "username")
+            }
+
+        }
     }
 
-    fun resolveToArtifact(id: String, scope: Scope? = null, filter: DependencyFilter? = null) : Artifact
+    fun resolveToArtifact(id: String, scope: Scope? = null,
+            filter: DependencyFilter = Filters.EXCLUDE_OPTIONAL_FILTER) : Artifact
         = resolve(id, scope, filter).root.artifact
 
-    fun resolve(id: String, scope: Scope? = null, filter: DependencyFilter? = null,
+    fun resolve(passedId: String, scope: Scope? = null,
+            filter: DependencyFilter = Filters.EXCLUDE_OPTIONAL_FILTER,
             repos: List<String> = emptyList()): DependencyResult {
-        val dependencyRequest = DependencyRequest(createCollectRequest(id, scope, repos), filter)
-        val result = system.resolveDependencies(session, dependencyRequest)
+        val mavenId = MavenId.toMavenId(passedId)
+        val id =
+            if (isRangeVersion(mavenId)) {
+                val artifact = DefaultArtifact(mavenId)
+                val request = VersionRangeRequest(artifact, createRepos(repos), null)
+                val rr = system.resolveVersionRange(session, request)
+                if (rr.highestVersion != null) {
+                    val newArtifact = DefaultArtifact(artifact.groupId, artifact.artifactId, artifact.classifier,
+                            artifact.extension, rr.highestVersion.toString())
+                    artifactToId(newArtifact)
+                } else {
+                    throw KobaltException("Couldn't resolve $passedId")
+                }
+            } else {
+                passedId
+            }
 
-//        GraphUtil.displayGraph(listOf(result.root), { it -> it.children },
-//                { it: DependencyNode, indent: String -> println(indent + it.toString()) })
+        val collectRequest = createCollectRequest(id, scope, repos)
+        val dependencyRequest = DependencyRequest(collectRequest, filter)
+        val result = system.resolveDependencies(session, dependencyRequest)
+        //        GraphUtil.displayGraph(listOf(result.root), { it -> it.children },
+        //                { it: DependencyNode, indent: String -> println(indent + it.toString()) })
         return result
     }
 
-    fun resolve(artifact: Artifact, scope: Scope? = null, filter: DependencyFilter? = null)
+    fun resolve(artifact: Artifact, scope: Scope? = null,
+            filter: DependencyFilter = Filters.EXCLUDE_OPTIONAL_FILTER)
         = resolve(artifactToId(artifact), scope, filter)
 
-    fun resolveToIds(id: String, scope: Scope? = null, filter: DependencyFilter? = null,
+    fun resolveToIds(id: String, scope: Scope? = null,
+            filter: DependencyFilter = Filters.EXCLUDE_OPTIONAL_FILTER,
             seen: HashSet<String> = hashSetOf<String>()) : List<String> {
         val rr = resolve(id, scope, filter)
         val children =
             rr.root.children.filter {
-                filter == null || filter.accept(DefaultDependencyNode(it.dependency), emptyList())
+                filter.accept(DefaultDependencyNode(it.dependency), emptyList())
             }.filter {
                 it.dependency.scope != Scope.SYSTEM.scope
             }
@@ -87,17 +138,26 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
     /**
      * Create an IClasspathDependency from a Kobalt id.
      */
-    fun create(id: String, optional: Boolean) = AetherDependency(DefaultArtifact(id), optional)
+    fun create(id: String, optional: Boolean) = AetherDependency(DefaultArtifact(id), optional, args)
 
     private val system = Booter.newRepositorySystem()
-    private val session = Booter.newRepositorySystemSession(system, localRepo.localRepo, settings, eventBus)
+    private val session = Booter.newRepositorySystemSession(system, localRepo.localRepo, settings, args, eventBus)
 
-    private fun createRepo(url: String) = RemoteRepository.Builder(Random().nextInt().toString(), "default", url)
-            .build()
+    private fun createRepo(hostConfig: HostConfig) : RemoteRepository {
+        val builder = RemoteRepository.Builder(hostConfig.name, "default", hostConfig.url)
+        if (hostConfig.hasAuth()) {
+            val auth = AuthenticationBuilder()
+                    .addUsername(hostConfig.username)
+                    .addPassword(hostConfig.password)
+                .build()
+            builder.setAuthentication(auth)
+        }
+        return builder.build()
+    }
 
     private val kobaltRepositories: List<RemoteRepository>
         get() = Kobalt.repos.map {
-            createRepo(it.url).let { repository ->
+            createRepo(it).let { repository ->
                 val proxyConfigs = settings.proxyConfigs ?: return@map repository
                 RemoteRepository.Builder(repository).apply {
                     setProxy(proxyConfigs.getProxy(repository.protocol)?.toAetherProxy())
@@ -105,19 +165,16 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
             }
         }
 
+    private fun createRepos(repos: List<String>) : List<RemoteRepository>
+            = kobaltRepositories + repos.map { createRepo(HostConfig(it)) }
+
     private fun createCollectRequest(id: String, scope: Scope? = null, repos: List<String> = emptyList())
             = CollectRequest().apply {
         val allIds = arrayListOf(MavenId.toMavenId(id))
-        if (args.downloadSources) {
-            listOf("sources", "javadoc").forEach {
-                val artifact = DefaultArtifact(id)
-                val sourceArtifact = DefaultArtifact(artifact.groupId, artifact.artifactId, it, artifact.extension,
-                        artifact.version)
-                allIds.add(sourceArtifact.toString())
-            }
-        }
+
+        dependencies = allIds.map { Dependency(DefaultArtifact(it), scope?.scope) }
 
         root = Dependency(DefaultArtifact(MavenId.toMavenId(id)), scope?.scope)
-        repositories = kobaltRepositories + repos.map { createRepo(it) }
+        repositories = createRepos(repos)
     }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Scope.kt

@@ -12,6 +12,7 @@ sealed class Scope(val scope: String, val dependencyLambda: (Project) -> List<IC
 
     object COMPILE : Scope(JavaScopes.COMPILE, Project::compileDependencies)
     object PROVIDED : Scope(JavaScopes.PROVIDED, Project::compileProvidedDependencies)
+    object COMPILEONLY : Scope("compileOnly", Project::compileOnlyDependencies)
     object SYSTEM : Scope(JavaScopes.SYSTEM, { project -> emptyList() })
     object RUNTIME : Scope(JavaScopes.RUNTIME, Project::compileRuntimeDependencies)
     object TEST : Scope(JavaScopes.TEST, Project::testDependencies)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt

@@ -6,12 +6,13 @@ import com.google.inject.Inject
 import java.io.File
 
 class Git @Inject constructor() {
-    fun maybeTagRelease(project: Project, uploadResult: TaskResult, enabled: Boolean, annotated: Boolean, tag: String, message: String) : TaskResult {
+    fun maybeTagRelease(project: Project, uploadResult: TaskResult, enabled: Boolean, annotated: Boolean,
+                        push: Boolean, tag: String, message: String) : TaskResult {
         val result =
                 if (uploadResult.success && enabled) {
-                    val tagSuccess = tagRelease(project, annotated, tag, message)
+                    val tagSuccess = tagRelease(project, annotated, push, tag, message)
                     if (! tagSuccess) {
-                        TaskResult(false, "Couldn't tag the project")
+                        TaskResult(false, errorMessage  = "Couldn't tag the project")
                     } else {
                         TaskResult()
                     }
@@ -21,7 +22,7 @@ class Git @Inject constructor() {
         return result
     }
 
-    private fun tagRelease(project: Project, annotated: Boolean, tag: String, message: String) : Boolean {
+    private fun tagRelease(project: Project, annotated: Boolean, push: Boolean, tag: String, message: String) : Boolean {
         val version = if (tag.isNullOrBlank()) project.version else tag
         val success = try {
             log(2, "Tagging this release as \"$version\"")
@@ -37,7 +38,9 @@ class Git @Inject constructor() {
             } else {
                 git.tag().setName(version).setMessage(message).call()
             }
-            git.push().setPushTags().call()
+            if (push) {
+                git.push().setPushTags().call()
+            }
             true
         } catch(ex: Exception) {
             warn("Couldn't create tag ${version}: ${ex.message}", ex)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt

@@ -86,12 +86,12 @@ class GithubApi2 @Inject constructor(
                 .execute()
         val code = response.code()
         if (code != Http.CREATED) {
-            val error = Gson().fromJson(response.errorBody().string(), RetrofitError::class.java)
+            val error = Gson().fromJson(response.errorBody()?.string(), RetrofitError::class.java)
             throw KobaltException("Couldn't upload release, ${error.message}: " + error.errors[0].code)
         } else {
             val body = response.body()
 
-            uploadAsset(accessToken, body.uploadUrl!!, Http.TypedFile("application/zip", zipFile), tagName)
+            uploadAsset(accessToken, body?.uploadUrl!!, Http.TypedFile("application/zip", zipFile), tagName)
                     .toBlocking()
                 .forEach { action ->
                     kobaltLog(1, "\n${zipFile.name} successfully uploaded")
@@ -120,8 +120,8 @@ class GithubApi2 @Inject constructor(
                         Duration.between(VersionCheckTimestampFile.timestamp, Instant.now())) {
                     kobaltLog(2, "Skipping GitHub latest release check, too soon.")
                 } else {
-                    val username = localProperties.getNoThrows(PROPERTY_USERNAME, DOC_URL)
-                    val accessToken = localProperties.getNoThrows(PROPERTY_ACCESS_TOKEN, DOC_URL)
+                    val username = localProperties.getNoThrows(PROPERTY_USERNAME)
+                    val accessToken = localProperties.getNoThrows(PROPERTY_ACCESS_TOKEN)
                     try {
                         val req =
                                 if (username != null && accessToken != null) {
@@ -138,8 +138,8 @@ class GithubApi2 @Inject constructor(
                             val releases = ex.body()
                             if (releases != null) {
                                 releases.firstOrNull()?.let {
-                                    try {
-                                        result = listOf(it.name, it.tagName).filterNotNull().first { !it.isBlank() }
+                                    result = try {
+                                        listOf(it.name, it.tagName).filterNotNull().first { !it.isBlank() }
                                     } catch(ex: NoSuchElementException) {
                                         throw KobaltException("Couldn't find the latest release")
                                     }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt

@@ -1,16 +1,16 @@
 package com.beust.kobalt.misc
 
-import com.beust.kobalt.Glob
+import com.beust.kobalt.From
 import com.beust.kobalt.IFileSpec
+import com.beust.kobalt.IncludedFile
+import com.beust.kobalt.To
+import com.beust.kobalt.archive.MetaArchive
 import com.google.common.io.CharStreams
-import java.io.*
-import java.nio.file.Paths
-import java.util.jar.JarEntry
+import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStreamReader
 import java.util.jar.JarFile
-import java.util.jar.JarInputStream
-import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
-import java.util.zip.ZipOutputStream
 
 class JarUtils {
     companion object {
@@ -21,18 +21,15 @@ class JarUtils {
             }
         }
 
-        fun addFiles(directory: String, files: List<IncludedFile>, target: ZipOutputStream,
+        fun addFiles(directory: String, files: List<IncludedFile>, metaArchive: MetaArchive,
                 expandJarFiles: Boolean,
                 onError: (Exception) -> Unit = DEFAULT_HANDLER) {
             files.forEach {
-                addSingleFile(directory, it, target, expandJarFiles, onError)
+                addSingleFile(directory, it, metaArchive, expandJarFiles, onError)
             }
         }
 
-        private val DEFAULT_JAR_EXCLUDES =
-                Glob("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
-
-        fun addSingleFile(directory: String, file: IncludedFile, outputStream: ZipOutputStream,
+        fun addSingleFile(directory: String, file: IncludedFile, metaArchive: MetaArchive,
                 expandJarFiles: Boolean, onError: (Exception) -> Unit = DEFAULT_HANDLER) {
             val foundFiles = file.allFromFiles(directory)
             foundFiles.forEach { foundFile ->
@@ -51,50 +48,24 @@ class JarUtils {
 
                     // Directory
                     val includedFile = IncludedFile(From(""), To(""), listOf(IFileSpec.GlobSpec("**")))
-                    addSingleFile(localFile.path, includedFile, outputStream, expandJarFiles)
+                    addSingleFile(localFile.path, includedFile, metaArchive, expandJarFiles)
                 } else {
-                    if (file.expandJarFiles && foundFile.name.endsWith(".jar") && ! file.from.contains("resources")) {
-                        kobaltLog(2, "  Writing contents of jar file $foundFile")
-                        val stream = JarInputStream(FileInputStream(localFile))
-                        var entry = stream.nextEntry
-                        while (entry != null) {
-                            if (!entry.isDirectory && !KFiles.isExcluded(entry.name, DEFAULT_JAR_EXCLUDES)) {
-                                val ins = JarFile(localFile).getInputStream(entry)
-                                addEntry(ins, JarEntry(entry), outputStream, onError)
-                            }
-                            entry = stream.nextEntry
+                    try {
+                        if (file.expandJarFiles && foundFile.name.endsWith(".jar") && !file.from.contains("resources")) {
+                            kobaltLog(2, "  Writing contents of jar file $foundFile")
+                            metaArchive.addArchive(foundFile)
+                        } else {
+                            val toPath = File(file.to).normalize().path
+                            val finalPath = if (toPath.isEmpty()) null else (toPath + "/")
+                            metaArchive.addFile(File(directory, fromFile.path), foundFile, finalPath)
                         }
-                    } else {
-                        val entryFileName = KFiles.fixSlashes(file.to(foundFile.path))
-                        val entry = JarEntry(entryFileName)
-                        entry.time = localFile.lastModified()
-                        addEntry(FileInputStream(localFile), entry, outputStream, onError)
+                    } catch(ex: Exception) {
+                        onError(ex)
                     }
                 }
             }
         }
 
-        private fun addEntry(inputStream: InputStream, entry: ZipEntry, outputStream: ZipOutputStream,
-                onError: (Exception) -> Unit = DEFAULT_HANDLER) {
-            var bis: BufferedInputStream? = null
-            try {
-                outputStream.putNextEntry(entry)
-                bis = BufferedInputStream(inputStream)
-
-                val buffer = ByteArray(50 * 1024)
-                while (true) {
-                    val count = bis.read(buffer)
-                    if (count == -1) break
-                    outputStream.write(buffer, 0, count)
-                }
-                outputStream.closeEntry()
-            } catch(ex: Exception) {
-                onError(ex)
-            } finally {
-                bis?.close()
-            }
-        }
-
         fun extractTextFile(zip : ZipFile, fileName: String) : String? {
             val enumEntries = zip.entries()
             while (enumEntries.hasMoreElements()) {
@@ -134,39 +105,3 @@ class JarUtils {
     }
 }
 
-open class Direction(open val p: String) {
-    override fun toString() = path
-    fun isCurrentDir() = path == "./"
-    val path: String get() =
-        if (p.isEmpty()) "./"
-        else if (p.startsWith("/") || p.endsWith("/")) p
-        else p + "/"
-}
-
-class IncludedFile(val fromOriginal: From, val toOriginal: To, val specs: List<IFileSpec>,
-        val expandJarFiles: Boolean = false) {
-    constructor(specs: List<IFileSpec>, expandJarFiles: Boolean = false) : this(From(""), To(""), specs, expandJarFiles)
-    fun from(s: String) = File(if (fromOriginal.isCurrentDir()) s else KFiles.joinDir(from, s))
-    val from: String get() = fromOriginal.path.replace("\\", "/")
-    fun to(s: String) = File(if (toOriginal.isCurrentDir()) s else KFiles.joinDir(to, s))
-    val to: String get() = toOriginal.path.replace("\\", "/")
-    override fun toString() = toString("IncludedFile",
-            "files - ", specs.map { it.toString() },
-            "from", from,
-            "to", to)
-
-    fun allFromFiles(directory: String? = null): List<File> {
-        val result = arrayListOf<File>()
-        specs.forEach { spec ->
-//            val fullDir = if (directory == null) from else KFiles.joinDir(directory, from)
-            spec.toFiles(directory, from).forEach { source ->
-                result.add(if (source.isAbsolute) source else File(source.path))
-            }
-        }
-        return result.map { Paths.get(it.path).normalize().toFile()}
-    }
-}
-
-class From(override val p: String) : Direction(p)
-
-class To(override val p: String) : Direction(p)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt

@@ -4,20 +4,38 @@ import com.beust.kobalt.*
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.Md5
+import org.apache.commons.io.FileUtils
 import java.io.*
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
+import java.util.*
 import java.util.jar.JarInputStream
+import java.util.regex.Pattern
+
 
 class KFiles {
     /**
      * This actually returns a list of strings because in development mode, we are not pointing to a single
-     * jar file but to a set of /classes directories.
+     * jar file but to a set of classes/directories.
      */
     val kobaltJar : List<String>
         get() {
+            val PATTERN = Pattern.compile("kobalt-([-.0-9]+)")
+
+            fun latestInstalledVersion() : StringVersion {
+                val versions = File(distributionsDir).listFiles().map { it.name }.map {
+                    val matcher = PATTERN.matcher(it)
+                    val result =
+                        if (matcher.matches()) matcher.group(1)
+                        else null
+                    result
+                }.filterNotNull().map(::StringVersion)
+                Collections.sort(versions, reverseOrder())
+                return versions[0]
+            }
+
             val envJar = System.getenv("KOBALT_JAR")
             if (envJar != null) {
                 debug("Using kobalt jar $envJar")
@@ -29,19 +47,21 @@ class KFiles {
                 if (jarFile.exists()) {
                     return listOf(jarFile.absolutePath)
                 } else {
-                    // In development mode, keep your kobalt.properties version one above kobalt-wrapper.properties:
+                    // In development mode, keep your kobalt.properties version to a nonexistent version
                     // kobalt.properties:  kobalt.version=0.828
                     // kobalt-wrapper.properties: kobalt.version=0.827
                     // When Kobalt can't find the newest jar file, it will instead use the classes produced by IDEA
                     // in the directories specified here:
-                    val leftSuffix = Kobalt.version.substring(0, Kobalt.version.lastIndexOf(".") + 1)
-                    val previousVersion = leftSuffix +
-                            (Kobalt.version.split(".").let { it[it.size - 1] }.toInt() - 1).toString()
+                    val previousVersion = latestInstalledVersion().version
                     val previousJar = joinDir(distributionsDir, "kobalt-" + previousVersion,
                             "kobalt/wrapper/kobalt-$previousVersion.jar")
+                    latestInstalledVersion()
                     val result = listOf("", "modules/kobalt-plugin-api", "modules/wrapper").map {
-                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes")))
-                            .absolutePath
+                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes"))) //kobalt build dirs
+                                .absolutePath
+                    } + listOf("modules/kobalt", "modules/kobalt-plugin-api", "modules/wrapper").map {
+                        File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "target", "classes"))) //maven build dirs
+                                .absolutePath
                     } + listOf(previousJar)
                     debug("Couldn't find ${jarFile.absolutePath}, using\n  " + result.joinToString(" "))
                     return result.filter { File(it).exists() }
@@ -91,10 +111,12 @@ class KFiles {
          */
         fun joinDir(vararg ts: String): String = ts.toMutableList().joinToString(File.separator)
 
+        val LIBS_DIR = "libs"
+
         /**
          * Where assemblies get generated ("kobaltBuild/libs")
          */
-        fun libsDir(project: Project): String = KFiles.makeDir(KFiles.buildDir(project).path, "libs").path
+        fun libsDir(project: Project): String = KFiles.makeDir(KFiles.buildDir(project).path, LIBS_DIR).path
 
         /**
          * The paths elements are expected to be a directory. Make that directory and join the
@@ -115,7 +137,7 @@ class KFiles {
         fun joinFileAndMakeDir(vararg ts: String) = joinDir(joinAndMakeDir(ts.slice(0..ts.size - 2)), ts[ts.size - 1])
 
         fun fixSlashes(f: File) = f.normalize().path.replace('\\', '/')
-        fun fixSlashes(s: String) = fixSlashes(File(s))
+        fun fixSlashes(s: String) = s.replace('\\', '/')
 
         fun makeDir(dir: String, s: String? = null) =
                 (if (s != null) File(dir, s) else File(dir)).apply { mkdirs() }
@@ -194,69 +216,6 @@ class KFiles {
             }
         }
 
-        fun copyRecursively(from: File, to: File, replaceExisting: Boolean = true, deleteFirst: Boolean = false,
-                onError: (File, IOException) -> OnErrorAction = { _, exception -> throw exception }) {
-            // Need to wait until copyRecursively supports an overwrite: Boolean = false parameter
-            // Until then, wipe everything first
-            if (deleteFirst) to.deleteRecursively()
-//            to.mkdirs()
-            hackCopyRecursively(from, to, replaceExisting = replaceExisting, onError = onError)
-        }
-
-        /** Private exception class, used to terminate recursive copying */
-        private class TerminateException(file: File) : FileSystemException(file) {}
-
-        /**
-         * Copy/pasted from kotlin/io/Utils.kt to add support for overwriting.
-         */
-        private fun hackCopyRecursively(from: File, dst: File,
-                replaceExisting: Boolean,
-                onError: (File, IOException) -> OnErrorAction =
-                { _, exception -> throw exception }
-        ): Boolean {
-            if (!from.exists()) {
-                return onError(from, NoSuchFileException(file = from, reason = "The source file doesn't exist")) !=
-                        OnErrorAction.TERMINATE
-            }
-            try {
-                // We cannot break for loop from inside a lambda, so we have to use an exception here
-                for (src in from.walkTopDown().onFail { f, e ->
-                    if (onError(f, e) == OnErrorAction.TERMINATE) throw TerminateException(f)
-                }) {
-                    if (!src.exists()) {
-                        if (onError(src, NoSuchFileException(file = src, reason = "The source file doesn't exist")) ==
-                                OnErrorAction.TERMINATE)
-                            return false
-                    } else {
-                        val relPath = src.relativeTo(from)
-                        val dstFile = File(KFiles.joinDir(dst.path, relPath.path))
-                        if (dstFile.exists() && !replaceExisting && !(src.isDirectory && dstFile.isDirectory)) {
-                            if (onError(dstFile, FileAlreadyExistsException(file = src,
-                                    other = dstFile,
-                                    reason = "The destination file already exists")) == OnErrorAction.TERMINATE)
-                                return false
-                        } else if (src.isDirectory) {
-                            dstFile.mkdirs()
-                        } else {
-                            if (Features.USE_TIMESTAMPS && dstFile.exists() && Md5.toMd5(src) == Md5.toMd5(dstFile)) {
-                                kobaltLog(3, "  Identical files, not copying $src to $dstFile")
-                            } else {
-                                val target = src.copyTo(dstFile, true)
-                                if (target.length() != src.length()) {
-                                    if (onError(src,
-                                            IOException("src.length() != dst.length()")) == OnErrorAction.TERMINATE)
-                                        return false
-                                }
-                            }
-                        }
-                    }
-                }
-                return true
-            } catch (e: TerminateException) {
-                return false
-            }
-        }
-
         /**
          * The build location for build scripts is .kobalt/build
          */
@@ -286,22 +245,18 @@ class KFiles {
         private fun isWindows() = System.getProperty("os.name").contains("Windows")
 
         fun copy(from: Path?, to: Path?, option: StandardCopyOption = StandardCopyOption.REPLACE_EXISTING) {
-            if (isWindows() && to!!.toFile().exists()) {
-                kobaltLog(2, "Windows detected, not overwriting $to")
-            } else {
-                try {
-                    if (from != null && to != null) {
-                        if (!Files.exists(to) || Md5.toMd5(from.toFile()) != Md5.toMd5(to.toFile())) {
-                            kobaltLog(3, "Copy from $from to $to")
-                            Files.copy(from, to, option)
-                        } else {
-                            kobaltLog(3, "  Not copying, indentical files: $from $to")
-                        }
+            try {
+                if (from != null && to != null) {
+                    if (!Files.exists(to) || Md5.toMd5(from.toFile()) != Md5.toMd5(to.toFile())) {
+                        kobaltLog(3, "Copy from $from to $to")
+                        Files.copy(from, to, option)
+                    } else {
+                        kobaltLog(3, "  Not copying, indentical files: $from $to")
                     }
-                } catch(ex: IOException) {
-                    // Windows is anal about this
-                    kobaltLog(1, "Couldn't copy $from to $to: ${ex.message}")
                 }
+            } catch(ex: IOException) {
+                // Windows is anal about this
+                kobaltLog(1, "Couldn't copy $from to $to: ${ex.message}")
             }
         }
 
@@ -386,6 +341,35 @@ class KFiles {
         }
 
         val dotKobaltDir = File(KFiles.joinAndMakeDir(KFiles.KOBALT_DOT_DIR))
+
+        /**
+         * Turn the IncludedFiles into actual Files
+         */
+        fun materializeIncludedFiles(project: Project, includedFiles: List<IncludedFile>) : List<File> {
+            val result = includedFiles.fold(arrayListOf<File>()) { files, includedFile: IncludedFile ->
+                val foundFiles = includedFile.allFromFiles(project.directory)
+                val absFiles = foundFiles.map {
+                    if (it.isAbsolute) {
+                        it
+                    } else if (File(includedFile.from).isAbsolute) {
+                        File(includedFile.from, it.path)
+                    } else {
+                        File(KFiles.joinDir(project.directory, includedFile.from, it.path))
+                    }
+                }
+                files.addAll(absFiles)
+                files
+            }
+            return result
+        }
+
+        fun copyRecursively(from: File, to: File, replaceExisting: Boolean = true, deleteFirst: Boolean = false) {
+// fun copy(relativePath: String, sourceDir: File, targetDir: File) =
+//            sourceDir.resolve(relativePath).copyRecursively(targetDir.resolve(relativePath), overwrite = true)
+            if (from.isFile) FileUtils.copyFileToDirectory(from, to)
+            else FileUtils.copyDirectory(from, to)
+        }
+
     }
 
     fun findRecursively(directory: File, function: Function1<String, Boolean>): List<String> {

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt

@@ -1,6 +1,9 @@
 package com.beust.kobalt.misc
 
-import com.beust.kobalt.*
+import com.beust.kobalt.Args
+import com.beust.kobalt.AsciiArt
+import com.beust.kobalt.Constants
+import com.beust.kobalt.KobaltException
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.maven.aether.Exceptions
 import java.lang.Exception
@@ -48,7 +51,7 @@ fun Any.error(text: CharSequence, e: Throwable? = null) {
 
 object KobaltLogger {
     var LOG_LEVEL: Int = 1
-    
+
     val isQuiet: Boolean get() = (LOG_LEVEL == Constants.LOG_QUIET_LEVEL)
 
     val logger: Logger get() =
@@ -57,6 +60,14 @@ object KobaltLogger {
         } else {
             Logger(false)
         }
+
+    fun setLogLevel(args: Args) {
+        LOG_LEVEL = when {
+            args.log < Constants.LOG_QUIET_LEVEL -> Constants.LOG_DEFAULT_LEVEL
+            args.log > Constants.LOG_MAX_LEVEL -> Constants.LOG_MAX_LEVEL
+            else -> args.log
+        }
+    }
 }
 
 class Logger(val dev: Boolean) {
@@ -75,7 +86,8 @@ class Logger(val dev: Boolean) {
 
     fun error(tag: String, message: CharSequence, e: Throwable? = null) {
         val docUrl = if (e is KobaltException && e.docUrl != null) e.docUrl else null
-        val text = if (! message.isBlank()) message
+        val text =
+            if (message.isNotBlank()) message
             else if (e != null && (! e.message.isNullOrBlank())) e.message
             else { e?.toString() }
         val shortMessage = "***** E $text " + if (docUrl != null) " Documentation: $docUrl" else ""
@@ -88,7 +100,10 @@ class Logger(val dev: Boolean) {
     }
 
     fun warn(tag: String, message: CharSequence, e: Throwable? = null) {
-        val fullMessage = "***** WARNING " + (e?.message ?: message)
+        val fullMessage = "***** WARNING " +
+                if (message.isNotBlank()) message
+                else if (e != null && (!e.message.isNullOrBlank())) e.message
+                else e?.toString()
         println(AsciiArt.Companion.warnColor(getPattern("W", fullMessage, fullMessage, tag)))
         if (KobaltLogger.LOG_LEVEL > 1 && e != null) {
             Exceptions.printStackTrace(e)

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt

@@ -24,7 +24,7 @@ class KobaltWrapperProperties @Inject constructor() {
     }
 
     private fun defaultUrlFor(version: String) =
-            "http://beust.com/kobalt/kobalt-$version.zip"
+            "https://beust.com/kobalt/kobalt-$version.zip"
 
     private val file: File
             get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES")

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/LocalProperties.kt

@@ -6,6 +6,9 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.*
 
+/**
+ * Encapsulate read access to local.properties.
+ */
 @Singleton
 class LocalProperties {
     val localProperties: Properties by lazy {
@@ -22,11 +25,11 @@ class LocalProperties {
         result
     }
 
-    fun getNoThrows(name: String, docUrl: String? = null) = localProperties.getProperty(name)
+    fun getNoThrows(name: String): String? = localProperties.getProperty(name)
 
     fun get(name: String, docUrl: String? = null) : String {
-        val result = getNoThrows(name, docUrl)
+        val result = getNoThrows(name)
                 ?: throw KobaltException("Couldn't find $name in local.properties", docUrl = docUrl)
-        return result as String
+        return result
     }
 }

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/NewRunCommand.kt

@@ -19,6 +19,7 @@ class RunCommandInfo {
      */
     var useErrorStreamAsErrorIndicator : Boolean = true
     var useInputStreamAsErrorIndicator : Boolean = false
+    var ignoreExitValue : Boolean = false
 
     var errorCallback: Function1<List<String>, Unit> = NewRunCommand.DEFAULT_ERROR
     var successCallback: Function1<List<String>, Unit> = NewRunCommand.DEFAULT_SUCCESS
@@ -78,19 +79,31 @@ open class NewRunCommand(val info: RunCommandInfo) {
         val process = pb.start()
 
         // Run the command and collect the return code and streams
-        val returnCode = process.waitFor(30, TimeUnit.SECONDS)
-        val input = if (process.inputStream.available() > 0) fromStream(process.inputStream)
-        else listOf()
-        val error = if (process.errorStream.available() > 0) fromStream(process.errorStream)
-        else listOf()
+        val processFinished = process.waitFor(120, TimeUnit.SECONDS)
+
+        if (!processFinished)
+            kobaltError("process timed out!")
+
+        val input =
+                if (process.inputStream.available() > 0) fromStream(process.inputStream)
+                else listOf()
+        val error =
+                if (process.errorStream.available() > 0) fromStream(process.errorStream)
+                else listOf()
+
+        kobaltLog(3, "info contains errors: " + (info.containsErrors != null))
 
         // Check to see if the command succeeded
         val isSuccess =
                 if (info.containsErrors != null) ! info.containsErrors!!(error)
-                else isSuccess(returnCode, input, error)
+                else isSuccess(if (info.ignoreExitValue) true else processFinished, input, error)
 
         if (isSuccess) {
-            info.successCallback(input)
+            if (!info.useErrorStreamAsErrorIndicator) {
+                info.successCallback(error + input)
+            } else {
+                info.successCallback(input)
+            }
         } else {
             info.errorCallback(error + input)
         }
@@ -103,12 +116,12 @@ open class NewRunCommand(val info: RunCommandInfo) {
      * have various ways to signal errors.
      */
     open protected fun isSuccess(isSuccess: Boolean, input: List<String>, error: List<String>) : Boolean {
-        var hasErrors = ! isSuccess
+        var hasErrors: Boolean = ! isSuccess
         if (info.useErrorStreamAsErrorIndicator && ! hasErrors) {
-            hasErrors = hasErrors || error.size > 0
+            hasErrors = hasErrors || error.isNotEmpty()
         }
         if (info.useInputStreamAsErrorIndicator && ! hasErrors) {
-            hasErrors = hasErrors || input.size > 0
+            hasErrors = hasErrors || input.isNotEmpty()
         }
 
         return ! hasErrors

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/RunCommand.kt

@@ -1,90 +0,0 @@
-package com.beust.kobalt.misc
-
-import java.io.BufferedReader
-import java.io.File
-import java.io.InputStream
-import java.io.InputStreamReader
-import java.util.concurrent.TimeUnit
-
-open class RunCommand(val command: String) {
-    val DEFAULT_SUCCESS = { output: List<String> -> }
-//    val DEFAULT_SUCCESS_VERBOSE = { output: List<String> -> kobaltLog(2, "Success:\n " + output.joinToString("\n"))}
-    val defaultSuccess = DEFAULT_SUCCESS
-    val DEFAULT_ERROR = {
-        output: List<String> -> error(output.joinToString("\n       "))
-    }
-
-    var directory = File(".")
-    var env = hashMapOf<String, String>()
-
-    /**
-     * Some commands fail but return 0, so the only way to find out if they failed is to look
-     * at the error stream. However, some commands succeed but output text on the error stream.
-     * This field is used to specify how errors are caught.
-     */
-    var useErrorStreamAsErrorIndicator = true
-    var useInputStreamAsErrorIndicator = false
-
-    fun useErrorStreamAsErrorIndicator(f: Boolean) : RunCommand {
-        useErrorStreamAsErrorIndicator = f
-        return this
-    }
-
-    open fun run(args: List<String>,
-            errorCallback: Function1<List<String>, Unit> = DEFAULT_ERROR,
-            successCallback: Function1<List<String>, Unit> = defaultSuccess) : Int {
-        val allArgs = arrayListOf<String>()
-        allArgs.add(command)
-        allArgs.addAll(args)
-
-        val pb = ProcessBuilder(allArgs)
-        pb.directory(directory)
-        kobaltLog(2, "Running command in directory ${directory.absolutePath}" +
-            "\n  " + allArgs.joinToString(" "))
-        val process = pb.start()
-        pb.environment().let { pbEnv ->
-            env.forEach {it ->
-                pbEnv.put(it.key, it.value)
-            }
-        }
-        val callSucceeded = process.waitFor(30, TimeUnit.SECONDS)
-        val input = if (process.inputStream.available() > 0) fromStream(process.inputStream) else emptyList()
-        val error = if (process.errorStream.available() > 0) fromStream(process.errorStream) else emptyList()
-        val isSuccess = isSuccess(callSucceeded, input, error)
-
-        if (isSuccess) {
-            successCallback(input)
-        } else {
-            errorCallback(error + input)
-        }
-
-        return if (isSuccess) 0 else 1
-    }
-
-    open protected fun isSuccess(callSucceeded: Boolean, input: List<String>, error: List<String>) : Boolean {
-        var hasErrors = ! callSucceeded
-        if (useErrorStreamAsErrorIndicator && ! hasErrors) {
-            hasErrors = hasErrors || error.size > 0
-        }
-        if (useInputStreamAsErrorIndicator && ! hasErrors) {
-            hasErrors = hasErrors || input.size > 0
-        }
-
-        return ! hasErrors
-    }
-
-    private fun fromStream(ins: InputStream) : List<String> {
-        val result = arrayListOf<String>()
-        val br = BufferedReader(InputStreamReader(ins))
-        var line = br.readLine()
-
-        while (line != null) {
-            result.add(line)
-            line = br.readLine()
-        }
-        return result
-
-//        val result = CharStreams.toString(InputStreamReader(ins, Charset.defaultCharset()))
-//        return result.split("\n")
-    }
-}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/StringVersion.kt

@@ -29,8 +29,12 @@ class StringVersion(val version: String) : Comparable<StringVersion> {
                 if (v1 < v2) return -1
                 else if (v1 > v2) return 1
             } catch(ex: NumberFormatException) {
-                warn("Couldn't parse version $version or $other")
-                return -1
+                if (version == other.toString()) {
+                    return 0
+                } else {
+                    log(2, "Couldn't parse version $version or $other")
+                    return -1
+                }
             }
         }
         return 0

modules/kobalt/build.gradle

@@ -0,0 +1,79 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.2.71'
+    id 'com.github.johnrengelman.shadow' version '5.0.0'
+}
+
+dependencies {
+    implementation project(':wrapper')
+    implementation project(':kobalt-plugin-api')
+    implementation "biz.aQute.bnd:biz.aQute.bndlib:$bndlib"
+    implementation 'com.github.spullara.mustache.java:compiler:0.9.5'
+    implementation "com.google.code.findbugs:jsr305:$findbugs"
+    implementation "com.sparkjava:spark-core:$spark"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp"
+    implementation 'com.sun.activation:javax.activation:1.2.0'
+    implementation "com.sun.xml.bind:jaxb-core:$jaxb"
+    implementation "com.sun.xml.bind:jaxb-impl:$jaxb"
+    implementation "javax.inject:javax.inject:$inject"
+    implementation "javax.xml.bind:jaxb-api:$jaxb"
+    implementation "org.apache.maven.resolver:maven-resolver-spi:$mavenResolver"
+    implementation "org.codehaus.groovy:groovy:$groovy"
+    implementation "com.beust:jcommander:$jcommander"
+    implementation "com.google.code.gson:gson:$gson"
+    implementation "com.google.inject:guice:$guice"
+    implementation "com.google.inject.extensions:guice-assistedinject:$guice"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit"
+    implementation "org.apache.maven:maven-model:$maven"
+    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin"
+    testImplementation 'org.assertj:assertj-core:3.8.0'
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin"
+    testImplementation "org.testng:testng:$testng"
+}
+
+sourceSets {
+    main.kotlin.srcDirs += "${rootProject.projectDir}../../src/main/kotlin"
+    test.kotlin.srcDirs += "${rootProject.projectDir}../../src/test/kotlin"
+}
+
+shadowJar {
+    classifier = null
+}
+
+test {
+    useTestNG()
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = project.name
+                description = 'A build system in Kotlin'
+                url = 'https://beust.com/kobalt'
+                licenses {
+                    license {
+                        name = 'Apache-2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'Cedric Beust'
+                        email = 'cedric@beust.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:https://github.com/cbeust/kobalt.git'
+                    developerConnection = 'scm:git@github.com:cbeust/kobalt.git'
+                    url = 'https://github.com/cbeust/kobalt'
+                }
+            }
+        }
+    }
+}

modules/kobalt/pom.xml

@@ -0,0 +1,231 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.beust</groupId>
+        <artifactId>kobalt-pom</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>kobalt</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>kobalt-plugin-api</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>wrapper</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-compiler-embeddable</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.spullara.mustache.java</groupId>
+            <artifactId>compiler</artifactId>
+            <version>0.9.5</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>1.72</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>retrofit</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.retrofit2</groupId>
+            <artifactId>converter-gson</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>2.4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>maven-resolver-spi</artifactId>
+            <version>${mavenresolver.version}</version>
+        </dependency>
+        <!-- java 9 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>javax.activation</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.8.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals> <goal>compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}../../src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals> <goal>test-compile</goal> </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}../../src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals> <goal>compile</goal> </goals>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>testCompile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <configuration>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>com.beust.kobalt.MainKt</mainClass>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/wrapper/build.gradle

@@ -0,0 +1,38 @@
+jar {
+    manifest {
+        attributes 'Main-Class': 'com.beust.kobalt.wrapper.Main'
+    }
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                name = project.name
+                description = 'Wrapper for Kobalt'
+                url = 'https://beust.com/kobalt'
+                licenses {
+                    license {
+                        name = 'Apache-2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+                developers {
+                    developer {
+                        name = 'Cedric Beust'
+                        email = 'cedric@beust.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:https://github.com/cbeust/kobalt.git'
+                    developerConnection = 'scm:git@github.com:cbeust/kobalt.git'
+                    url = 'https://github.com/cbeust/kobalt'
+                }
+            }
+        }
+    }
+}

modules/wrapper/pom.xml

@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.beust</groupId>
+        <artifactId>kobalt-pom</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>wrapper</artifactId>
+    <packaging>jar</packaging>
+    <version>1.1.0</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java

@@ -47,7 +47,6 @@ public class Main {
 
     private int installAndLaunchMain(String[] argv) throws IOException, InterruptedException {
         String version = getVersion();
-        initWrapperFile(version);
 
         List<String> kobaltArgv = new ArrayList<>();
         boolean noLaunch = false;
@@ -78,6 +77,7 @@ public class Main {
         }
         int result = 0;
         if (! exit) {
+            initWrapperFile(version);
             Path kobaltJarFile = installDistribution();
             if (!noLaunch) {
                 result = launchMain(kobaltJarFile, kobaltArgv);
@@ -118,7 +118,7 @@ public class Main {
     }
 
     private static String downloadUrl(String version) {
-        return "http://beust.com/kobalt/kobalt-" + version + ".zip";
+        return "https://beust.com/kobalt/kobalt-" + version + ".zip";
     }
 
     private void initWrapperFile(String version) throws IOException {
@@ -133,7 +133,7 @@ public class Main {
     }
 
     private String getWrapperVersion() {
-        return wrapperProperties.getProperty(PROPERTY_VERSION);
+        return wrapperProperties.getProperty(PROPERTY_VERSION, "N/A");
     }
 
     private String getWrapperDownloadUrl(String version) {
@@ -345,6 +345,11 @@ public class Main {
                     try {
                         Files.createDirectories(entryPath.getParent());
                         Files.copy(zipFile.getInputStream(entry), entryPath, StandardCopyOption.REPLACE_EXISTING);
+                        if (!isWindows() && entry.getName().endsWith(KOBALTW)) {
+                           if (!entryPath.toFile().setExecutable(true)) {
+                               log(1, "Couldn't make distribution " + KOBALTW + " executable");
+                           }
+                        }
                     } catch (FileSystemException ex) {
                         log(2, "Couldn't copy to " + entryPath);
                     }

pom.xml

@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.beust</groupId>
+    <artifactId>kobalt-pom</artifactId>
+    <packaging>pom</packaging>
+    <version>1.1.0</version>
+
+    <modules>
+        <module>modules/kobalt-plugin-api</module>
+        <module>modules/wrapper</module>
+        <module>modules/kobalt</module>
+    </modules>
+
+    <repositories>
+        <repository>
+            <id>testng</id>
+            <url>https://dl.bintray.com/cbeust/maven</url>
+        </repository>
+    </repositories>
+
+    <properties>
+        <kotlin.version>1.2.71</kotlin.version>
+        <okio.version>1.13.0</okio.version>
+        <okhttp3.version>3.9.1</okhttp3.version>
+        <mavenresolver.version>1.1.0</mavenresolver.version>
+        <junit.version>1.1.0</junit.version>
+        <junitJupiter.version>5.1.0</junitJupiter.version>
+        <testng.version>6.12</testng.version>
+        <slf4j.version>1.7.3</slf4j.version>
+    </properties>
+
+</project>

settings.gradle

@@ -0,0 +1,5 @@
+rootProject.name = 'kobalt-pom'
+include(':kobalt-plugin-api', ':wrapper', ':kobalt')
+project(':kobalt-plugin-api').projectDir = file('modules/kobalt-plugin-api')
+project(':wrapper').projectDir = file('modules/wrapper')
+project(':kobalt').projectDir = file('modules/kobalt')

src/main/kotlin/com/beust/kobalt/Main.kt

@@ -17,37 +17,13 @@ import java.net.URLClassLoader
 import javax.inject.Inject
 
 fun main(argv: Array<String>) {
-    val result = mainNoExit(argv)
+    val result = Main.mainNoExit(argv)
     if (result != 0) {
         System.exit(result)
     }
 }
 
-private fun parseArgs(argv: Array<String>): Main.RunInfo {
-    val args = Args()
-    val result = JCommander(args)
-    result.parse(*argv)
-    KobaltLogger.LOG_LEVEL = if (args.log < Constants.LOG_QUIET_LEVEL) {
-            Constants.LOG_DEFAULT_LEVEL
-        } else if (args.log > Constants.LOG_MAX_LEVEL) {
-            Constants.LOG_MAX_LEVEL
-        } else args.log
-    return Main.RunInfo(result, args)
-}
-
-fun mainNoExit(argv: Array<String>): Int {
-    val (jc, args) = parseArgs(argv)
-    Kobalt.init(MainModule(args, KobaltSettings.readSettingsXml()))
-    val result = Kobalt.INJECTOR.getInstance(Main::class.java).run {
-        val runResult = run(jc, args, argv)
-        pluginInfo.cleanUp()
-        executors.shutdown()
-        runResult
-    }
-    return result
-}
-
-private class Main @Inject constructor(
+class Main @Inject constructor(
         val plugins: Plugins,
         val http: Http,
         val files: KFiles,
@@ -59,6 +35,43 @@ private class Main @Inject constructor(
         val pluginInfo: PluginInfo,
         val options: Options) {
 
+    companion object {
+        fun mainNoExit(argv: Array<String>): Int {
+            val (jc, args) = parseArgs(argv)
+            if (args.usage) {
+                jc.usage()
+                return 0
+            }
+            if (args.version) {
+                println("Kobalt ${Kobalt.version}")
+                return 0
+            }
+            Kobalt.init(MainModule(args, KobaltSettings.readSettingsXml()))
+            val result = launchMain(Kobalt.INJECTOR.getInstance(Main::class.java), jc, args, argv)
+            return result
+        }
+
+        private fun parseArgs(argv: Array<String>): Main.RunInfo {
+            val args = Args()
+            val result = JCommander(args)
+            result.parse(*argv)
+            KobaltLogger.setLogLevel(args)
+            return Main.RunInfo(result, args)
+        }
+
+        /**
+         * Entry point for tests, which can instantiate their main object with their own module and injector.
+         */
+        fun launchMain(main: Main, jc: JCommander, args: Args, argv: Array<String>) : Int {
+            return main.run {
+                val runResult = run(jc, args, argv)
+                pluginInfo.cleanUp()
+                executors.shutdown()
+                runResult
+            }
+        }
+    }
+
     data class RunInfo(val jc: JCommander, val args: Args)
 
     private fun installCommandLinePlugins(args: Args): ClassLoader {

src/main/kotlin/com/beust/kobalt/Options.kt

@@ -1,8 +1,10 @@
 package com.beust.kobalt
 
 import com.beust.jcommander.JCommander
+import com.beust.kobalt.api.ITask
 import com.beust.kobalt.api.Kobalt
-import com.beust.kobalt.api.PluginTask
+import com.beust.kobalt.api.KobaltContext
+import com.beust.kobalt.api.Project
 import com.beust.kobalt.app.ProjectFinder
 import com.beust.kobalt.app.ProjectGenerator
 import com.beust.kobalt.app.Templates
@@ -44,10 +46,26 @@ class Options @Inject constructor(
         val p = if (args.buildFile != null) File(args.buildFile) else File(".")
 //        val buildFile = BuildFile(Paths.get(p.absolutePath), p.name)
         val buildSources = if (p.isDirectory) BuildSources(p.absoluteFile) else SingleFileBuildSources(p)
-        var pluginClassLoader = javaClass.classLoader
+        val pluginClassLoader = javaClass.classLoader
 
-        val allProjectResult = projectFinder.initForBuildFile(buildSources, args)
-        val allProjects = allProjectResult.projects
+        //
+        // Attempt to parse the build file in order to correctly set up repos, plug-ins, etc...
+        // If the build file can't be parsed, don't give up just yet since some options don't need
+        // a correct build file to work.
+        //
+        var buildError: Throwable? = null
+        val allProjects =
+                try {
+                    projectFinder.initForBuildFile(buildSources, args).projects
+                } catch(ex: Exception) {
+                    buildError = ex
+                    listOf<Project>()
+                }
+
+        fun runIfSuccessfulBuild(buildError: Throwable?, action: () -> Unit) {
+            buildError?.let { throw it }
+            action()
+        }
 
         // Modify `args` with options found in buildScript { kobaltOptions(...) }, if any
         addOptionsFromBuild(args, Kobalt.optionsFromBuild)
@@ -77,9 +95,11 @@ class Options @Inject constructor(
                 }),
                 Option( { -> args.projectInfo }, {
                     // --projectInfo
-                    allProjects.forEach {
-                        it.compileDependencies.filter { it.isMaven }.forEach {
-                            resolveDependency.run(it.id)
+                    runIfSuccessfulBuild(buildError) {
+                        allProjects.forEach {
+                            it.compileDependencies.filter { it.isMaven }.forEach {
+                                resolveDependency.run(it.id)
+                            }
                         }
                     }
                 }),
@@ -89,11 +109,15 @@ class Options @Inject constructor(
                 }),
                 Option( { args.tasks }, {
                     // --tasks
-                    displayTasks()
+                    runIfSuccessfulBuild(buildError) {
+                        displayTasks(allProjects, Kobalt.context!!)
+                    }
                 }),
                 Option( { args.checkVersions }, {
                     // --checkVersions
-                    checkVersions.run(allProjects)
+                    runIfSuccessfulBuild(buildError) {
+                        checkVersions.run(allProjects)
+                    }
                 }),
                 Option( { args.download }, {
                     // --download
@@ -121,17 +145,19 @@ class Options @Inject constructor(
             if (! buildSources.exists()) {
                 throw KobaltException("Could not find build file: " + buildSources)
             }
-            val runTargetResult = taskManager.runTargets(args.targets, allProjects)
-            if (result == 0) {
-                result = if (runTargetResult.taskResult.success) 0 else 1
-            }
+            runIfSuccessfulBuild(buildError) {
+                val runTargetResult = taskManager.runTargets(args.targets, allProjects)
+                if (result == 0) {
+                    result = if (runTargetResult.taskResult.success) 0 else 1
+                }
 
-            // Shutdown all plug-ins
-            plugins.shutdownPlugins()
+                // Shutdown all plug-ins
+                plugins.shutdownPlugins()
 
-            // Run the build report contributors
-            pluginInfo.buildReportContributors.forEach {
-                it.generateReport(Kobalt.context!!)
+                // Run the build report contributors
+                pluginInfo.buildReportContributors.forEach {
+                    it.generateReport(Kobalt.context!!)
+                }
             }
         }
         return result
@@ -152,19 +178,29 @@ class Options @Inject constructor(
         }
     }
 
-    private fun displayTasks() {
+    private fun displayTasks(projects: List<Project>, context: KobaltContext) {
         //
         // List of tasks, --tasks
         //
-        val tasksByPlugins = HashMultimap.create<String, PluginTask>()
-        taskManager.annotationTasks.forEach {
-            tasksByPlugins.put(it.plugin.name, it)
+        val tasksByPlugins = HashMultimap.create<String, ITask>()
+        projects.forEach { project ->
+            pluginInfo.taskContributors.forEach {
+                val tasks = it.tasksFor(project, context)
+                tasks.forEach {
+                    tasksByPlugins.put(it.plugin.name, it)
+                }
+            }
+        }
+        listOf(taskManager.annotationTasks, taskManager.dynamicTasks).forEach { tasks ->
+            tasks.forEach {
+                tasksByPlugins.put(it.plugin.name, it)
+            }
         }
         val sb = StringBuffer("List of tasks\n")
         tasksByPlugins.keySet().forEach { name ->
             sb.append("\n  " + AsciiArt.horizontalDoubleLine + " $name "
                     + AsciiArt.horizontalDoubleLine + "\n")
-            tasksByPlugins[name].distinctBy(PluginTask::name).sortedBy(PluginTask::name).forEach { task ->
+            tasksByPlugins[name].distinctBy(ITask::name).sortedBy(ITask::name).forEach { task ->
                 sb.append("    ${task.name}\t\t${task.doc}\n")
             }
         }

src/main/kotlin/com/beust/kobalt/app/BuildFiles.kt

@@ -119,7 +119,7 @@ class BuildFiles @Inject constructor(val factory: BuildFileCompiler.IFactory,
             parentFile.mkdirs()
             val imp = arrayListOf<String>().apply {
                 addAll(imports)
-            }.distinct()
+            }.toMutableSet().toMutableList()
             Collections.sort(imp)
             writeText(imp.joinToString("\n"))
             appendText(code.joinToString("\n"))

src/main/kotlin/com/beust/kobalt/app/LanguageTemplateGenerator.kt

@@ -20,6 +20,8 @@ abstract class LanguageTemplateGenerator : ITemplate {
 
     abstract val defaultSourceDirectories : HashSet<String>
     abstract val defaultTestDirectories : HashSet<String>
+    abstract val mainDependencies : ArrayList<Pom.Dependency>
+    abstract val testDependencies : ArrayList<Pom.Dependency>
     abstract val directive : String
     abstract val fileMatch : (String) -> Boolean
     abstract val fileMap: List<FileInfo>
@@ -131,20 +133,19 @@ abstract class LanguageTemplateGenerator : ITemplate {
                 put("directory", currentDir.absolutePath)
                 put("sourceDirectories", defaultSourceDirectories)
                 put("sourceDirectoriesTest", defaultTestDirectories)
+                put("mainDependencies", mainDependencies)
+                put("testDependencies", testDependencies)
                 put("imports", "import com.beust.kobalt.plugin.$templateName.*")
                 put("directive", "project")
             }
 
-            var mainDeps = arrayListOf<Pom.Dependency>()
-            var testDeps = arrayListOf<Pom.Dependency>()
-            map.put("mainDependencies", mainDeps)
-            map.put("testDependencies", testDeps)
             File("pom.xml").let {
                 if (it.absoluteFile.exists()) {
-                    importPom(it, mainDeps, testDeps, map)
+                    importPom(it, mainDependencies, testDependencies, map)
                 }
             }
 
+
             val fileInputStream = javaClass.classLoader
                     .getResource(ITemplateContributor.DIRECTORY_NAME + "/build.mustache").openStream()
             val sw = StringWriter()

src/main/kotlin/com/beust/kobalt/app/MainModule.kt

@@ -1,6 +1,8 @@
 package com.beust.kobalt.app
 
 import com.beust.kobalt.Args
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.Jvm
 import com.beust.kobalt.app.remote.KobaltServer
 import com.beust.kobalt.internal.IncrementalManager
 import com.beust.kobalt.internal.KobaltSettings
@@ -17,6 +19,7 @@ import com.google.inject.Provider
 import com.google.inject.Singleton
 import com.google.inject.TypeLiteral
 import com.google.inject.assistedinject.FactoryModuleBuilder
+import java.io.File
 import java.util.concurrent.ExecutorService
 
 open class MainModule(val args: Args, val settings: KobaltSettings) : AbstractModule() {
@@ -49,15 +52,14 @@ open class MainModule(val args: Args, val settings: KobaltSettings) : AbstractMo
         bind(Args::class.java).toProvider(Provider<Args> {
             args
         })
-        EventBus().let { eventBus ->
-            bind(EventBus::class.java).toInstance(eventBus)
-        }
+        bind(EventBus::class.java).toInstance(EventBus())
         bind(PluginInfo::class.java).toProvider(Provider<PluginInfo> {
             PluginInfo.readKobaltPluginXml()
         }).`in`(Singleton::class.java)
         bind(KobaltSettings::class.java).toProvider(Provider<KobaltSettings> {
             settings
         }).`in`(Singleton::class.java)
+        bind(Jvm::class.java).toInstance(JavaInfo.create(File(com.beust.kobalt.SystemProperties.javaBase)))
 
 //        bindListener(Matchers.any(), object: TypeListener {
 //            override fun <I> hear(typeLiteral: TypeLiteral<I>?, typeEncounter: TypeEncounter<I>?) {

src/main/kotlin/com/beust/kobalt/app/Profiles.kt

@@ -56,7 +56,7 @@ class Profiles(val context: KobaltContext) {
                     val variable = if (match.first) match.second else oldMatch.second
 
                     if (oldMatch.first) {
-                        warn("Old profile syntax detected for \"$line\"," +
+                        warn("Old profile syntax detected for \"${line.trim()}\"," +
                                 " please update to \"val $variable by profile()\"")
                     }
 

src/main/kotlin/com/beust/kobalt/app/java/JavaTemplateGenerator.kt

@@ -1,11 +1,14 @@
 package com.beust.kobalt.app.java
 
 import com.beust.kobalt.app.LanguageTemplateGenerator
+import com.beust.kobalt.maven.Pom
 
 /**
  * Template for the "java" generator.
  */
 class JavaTemplateGenerator : LanguageTemplateGenerator() {
+    override val mainDependencies = arrayListOf<Pom.Dependency>()
+    override val testDependencies = arrayListOf<Pom.Dependency>()
     override val defaultSourceDirectories = hashSetOf("src/main/java")
     override val defaultTestDirectories = hashSetOf("src/test/java")
     override val directive = "project"

src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinTemplateGenerator.kt

@@ -1,10 +1,16 @@
 package com.beust.kobalt.app.kotlin
 
+import com.beust.kobalt.Constants
 import com.beust.kobalt.app.LanguageTemplateGenerator
+import com.beust.kobalt.maven.Pom
 
 class KotlinTemplateGenerator : LanguageTemplateGenerator() {
     override val defaultSourceDirectories = hashSetOf("src/main/kotlin")
     override val defaultTestDirectories = hashSetOf("src/test/kotlin")
+    override val mainDependencies = arrayListOf(
+            Pom.Dependency("org.jetbrains.kotlin", "kotlin-stdlib", null, Constants.KOTLIN_COMPILER_VERSION)
+    )
+    override val testDependencies = arrayListOf<Pom.Dependency>()
     override val directive = "project"
     override val templateName = "kotlin"
     override val templateDescription = "Generate a simple Kotlin project"

src/main/kotlin/com/beust/kobalt/app/remote/GetDependencyGraphHandler.kt

@@ -22,11 +22,6 @@ class GetDependencyGraphHandler : WebSocketListener {
     // so I have to do dependency injections manually :-(
     val projectFinder = Kobalt.INJECTOR.getInstance(ProjectFinder::class.java)
 
-    // URL parameters sent by the client
-    val PARAMETER_PROJECT_ROOT = "projectRoot"
-    val PARAMETER_BUILD_FILE = "buildFile"  // Deprecated
-    val PARAMETER_PROFILES = "profiles"
-
     var session: Session? = null
 
     override fun onWebSocketClose(code: Int, reason: String?) {
@@ -40,32 +35,45 @@ class GetDependencyGraphHandler : WebSocketListener {
 
     fun <T> sendWebsocketCommand(endpoint: RemoteEndpoint, commandName: String, payload: T,
             errorMessage: String? = null) {
+        SparkServer.watchDog.rearm()
         val json = Gson().toJson(WebSocketCommand(commandName, payload = Gson().toJson(payload),
                 errorMessage = errorMessage))
         endpoint.sendString(json)
     }
 
-    private fun findProfiles(map: Map<String, List<String>>) = map[PARAMETER_PROFILES]?.getOrNull(0)
+    /**
+     * Convenience class to extract the parameters from the WebSocket connection.
+     */
+    class ParameterExtractor(val map: Map<String, List<String>>) {
+        // URL parameters sent by the client
+        private val PARAMETER_PROJECT_ROOT = "projectRoot"
+        private val PARAMETER_BUILD_FILE = "buildFile"  // Deprecated
+        private val PARAMETER_PROFILES = "profiles"
+        private val PARAMETER_DOWNLOAD_SOURCES = "downloadSources"
 
-    private fun findBuildFile(map: Map<String, List<String>>) : BuildSources? {
+        val profiles = map[PARAMETER_PROFILES]?.getOrNull(0)
+        val downloadSources = map[PARAMETER_DOWNLOAD_SOURCES]?.getOrNull(0)?.toBoolean() ?: false
         val projectRoot = map[PARAMETER_PROJECT_ROOT]
-        val buildFile = map[PARAMETER_BUILD_FILE]
-        val result =
-            if (projectRoot != null) {
-                BuildSources(File(projectRoot[0]))
-            } else if (buildFile != null) {
-                BuildSources(File(buildFile[0]))
-            } else {
-                null
+        val buildFile: BuildSources?
+            get() {
+                val bf = map[PARAMETER_BUILD_FILE]
+                return if (projectRoot != null) {
+                    BuildSources(File(projectRoot[0]))
+                } else if (bf != null) {
+                    BuildSources(File(bf[0]))
+                } else {
+                    null
+                }
             }
-        return result
     }
 
     override fun onWebSocketConnect(s: Session) {
         session = s
         val parameterMap = s.upgradeRequest.parameterMap
-        val buildSources = findBuildFile(parameterMap)
-        val profiles = findProfiles(parameterMap)
+        val parameters = ParameterExtractor(parameterMap)
+        val buildSources = parameters.buildFile
+        val profiles = parameters.profiles
+        val downloadSources = parameters.downloadSources
 
         fun <T> getInstance(cls: Class<T>) : T = Kobalt.INJECTOR.getInstance(cls)
 
@@ -91,6 +99,7 @@ class GetDependencyGraphHandler : WebSocketListener {
                     val args = getInstance(Args::class.java)
                     args.buildFile = buildSources.root.absolutePath
                     args.profiles = profiles
+                    args.downloadSources = downloadSources
 
                     val projectResults = projectFinder.initForBuildFile(buildSources, args)
 
@@ -114,7 +123,6 @@ class GetDependencyGraphHandler : WebSocketListener {
         // Respond to the request
         sendWebsocketCommand(s.remote, RemoteDependencyData.GetDependenciesData.NAME, result,
                 errorMessage = result.errorMessage)
-        s.close()
     }
 
     override fun onWebSocketText(message: String?) {

src/main/kotlin/com/beust/kobalt/app/remote/KobaltClient.kt

@@ -12,15 +12,7 @@ import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.warn
 import com.google.gson.Gson
 import com.google.inject.Guice
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import okhttp3.ResponseBody
-import okhttp3.ws.WebSocket
-import okhttp3.ws.WebSocketCall
-import okhttp3.ws.WebSocketListener
-import okio.Buffer
-import java.io.IOException
+import okhttp3.*
 
 fun main(argv: Array<String>) {
     Kobalt.INJECTOR = Guice.createInjector(MainModule(Args(), KobaltSettings.readSettingsXml()))
@@ -39,26 +31,22 @@ class KobaltClient : Runnable {
             .url("$url?projectRoot=$projectRoot&buildFile=$buildFile")
                 .build()
         var webSocket: WebSocket? = null
-        val ws = WebSocketCall.create(client, request).enqueue(object: WebSocketListener {
-            override fun onOpen(ws: WebSocket, response: Response) {
-                webSocket = ws
-            }
-
-            override fun onPong(p0: Buffer?) {
-                println("WebSocket pong")
-            }
-
-            override fun onClose(p0: Int, p1: String?) {
-                println("WebSocket closed")
-            }
-
-            override fun onFailure(ex: IOException, response: Response?) {
+        val socketListener = object: WebSocketListener() {
+            override fun onFailure(webSocket: WebSocket, ex: Throwable, response: Response?) {
                 Exceptions.printStackTrace(ex)
                 error("WebSocket failure: ${ex.message} response: $response")
             }
 
-            override fun onMessage(body: ResponseBody) {
-                val json = body.string()
+            override fun onOpen(ws: WebSocket, response: Response) {
+                webSocket = ws
+            }
+
+            override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                println("Closing socket")
+            }
+
+            override fun onMessage(webSocket: WebSocket, text: String) {
+                val json = text
                 val wsCommand = Gson().fromJson(json, WebSocketCommand::class.java)
                 if (wsCommand.errorMessage != null) {
                     warn("Received error message from server: " + wsCommand.errorMessage)
@@ -87,7 +75,10 @@ class KobaltClient : Runnable {
                     }
                 }
             }
-        })
+        }
+
+        val ws = client.newWebSocket(request, socketListener)
+        ws.close(1000, "All good")
     }
 }
 

src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt

@@ -1,6 +1,5 @@
 package com.beust.kobalt.app.remote
 
-import com.beust.kobalt.api.Project
 import com.beust.kobalt.homeDir
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.maven.aether.Exceptions
@@ -74,15 +73,12 @@ class KobaltServer @Inject constructor(@Assisted val force: Boolean, @Assisted @
         try {
             if (createServerFile(port, force)) {
                 kobaltLog(1, "KobaltServer listening on port $port")
-//                OldServer(initCallback, cleanUpCallback).run(port)
-//                JerseyServer(initCallback, cleanUpCallback).run(port)
                 SparkServer(cleanUpCallback, pluginInfo).run(port)
-//                WasabiServer(initCallback, cleanUpCallback).run(port)
             }
         } catch(ex: Exception) {
             Exceptions.printStackTrace(ex)
         } finally {
-//            deleteServerFile()
+            deleteServerFile()
         }
         return port
     }

src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt

@@ -2,6 +2,7 @@ package com.beust.kobalt.app.remote
 
 import com.beust.kobalt.Args
 import com.beust.kobalt.api.IClasspathDependency
+import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.app.BuildFileCompiler
 import com.beust.kobalt.internal.DynamicGraph
@@ -29,7 +30,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
         val taskManager: TaskManager) {
 
     fun dependenciesDataFor(buildSources: BuildSources, args: Args,
-            findProjectResult: BuildFileCompiler.FindProjectResult,
+            projectResult: BuildFileCompiler.FindProjectResult,
             progressListener: IProgressListener? = null,
             useGraph : Boolean = false): GetDependenciesData {
         val projectDatas = arrayListOf<ProjectData>()
@@ -42,9 +43,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
         fun allDeps(l: List<IClasspathDependency>, name: String) = dependencyManager.transitiveClosure(l,
                 requiredBy = name)
 
-//        val buildFile = BuildFile(Paths.get(buildFilePath), "GetDependenciesCommand")
-        val buildFileCompiler = buildFileCompilerFactory.create(buildSources, pluginInfo)
-        val projectResult = buildFileCompiler.compileBuildFiles(args)
+        val buildFileDependencies = Kobalt.buildFileClasspath.map {toDependencyData(it, "compile")}
 
         val pluginDependencies = projectResult.pluginUrls.map { File(it.toURI()) }.map {
             DependencyData(it.name, "compile", it.absolutePath)
@@ -176,8 +175,8 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
                     })
         }
 
-        return GetDependenciesData(projectDatas, allTasks, pluginDependencies, findProjectResult.buildContentRoots,
-                projectResult.taskResult.errorMessage)
+        return GetDependenciesData(projectDatas, allTasks, pluginDependencies, buildFileDependencies,
+                projectResult.buildContentRoots, projectResult.taskResult.errorMessage)
     }
 
     /////
@@ -202,6 +201,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
     class GetDependenciesData(val projects: List<ProjectData> = emptyList(),
             val allTasks: Collection<TaskData> = emptySet(),
             val pluginDependencies: List<DependencyData> = emptyList(),
+            val buildFileDependencies: List<DependencyData> = emptyList(),
             val buildContentRoots: List<String> = emptyList(),
             val errorMessage: String?) {
         companion object {

src/main/kotlin/com/beust/kobalt/app/remote/SparkServer.kt

@@ -5,6 +5,7 @@ import com.beust.kobalt.app.Templates
 import com.beust.kobalt.internal.PluginInfo
 import com.google.common.collect.ListMultimap
 import com.google.gson.Gson
+import org.slf4j.Logger
 import spark.ResponseTransformer
 import spark.Route
 import spark.Spark
@@ -14,6 +15,8 @@ class SparkServer(val cleanUpCallback: () -> Unit, val pluginInfo : PluginInfo)
 
     companion object {
         lateinit var cleanUpCallback: () -> Unit
+        val URL_QUIT = "/quit"
+        lateinit var watchDog: WatchDog
     }
 
     init {
@@ -28,19 +31,25 @@ class SparkServer(val cleanUpCallback: () -> Unit, val pluginInfo : PluginInfo)
     private fun jsonRoute(path: String, route: Route)
         = Spark.get(path, "application/json", route, JsonTransformer())
 
-    val log = org.slf4j.LoggerFactory.getLogger("SparkServer")
+    val log: Logger = org.slf4j.LoggerFactory.getLogger("SparkServer")
 
     override fun run(port: Int) {
+        val threadPool = Executors.newFixedThreadPool(2)
+        watchDog = WatchDog(port, 60 * 10 /* 10 minutes */, log)
+        threadPool.submit {
+            watchDog.run()
+        }
         log.debug("Server running")
         Spark.port(port)
         Spark.webSocket("/v1/getDependencyGraph", GetDependencyGraphHandler::class.java)
         Spark.get("/ping") { req, res ->
+            watchDog.rearm()
             log.debug("  Received ping")
             """ { "result" : "ok" } """
         }
-        Spark.get("/quit", { req, res ->
+        Spark.get(URL_QUIT, { req, res ->
             log.debug("  Received quit")
-            Executors.newFixedThreadPool(1).let { executor ->
+            threadPool.let { executor ->
                 executor.submit {
                     Thread.sleep(1000)
                     Spark.stop()

src/main/kotlin/com/beust/kobalt/app/remote/WatchDog.kt

@@ -0,0 +1,71 @@
+package com.beust.kobalt.app.remote
+
+import com.beust.kobalt.misc.warn
+import org.slf4j.Logger
+import java.net.HttpURLConnection
+import java.net.URL
+import java.time.Duration
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+/**
+ * Wakes up every `WAKE_UP_INTERVAL` and check if a certain period of time (`checkPeriod`) has elapsed
+ * without being rearmed. If that time has elapsed, send a QUIT command to the Kobalt server. If the WatchDog
+ * gets rearmed, the expiration period is reset.
+ */
+class WatchDog(val port: Int, val checkPeriodSeconds: Long, val log: Logger) {
+    private val WAKE_UP_INTERVAL: Duration = Duration.ofSeconds(60)
+    private val FORMAT: DateTimeFormatter = DateTimeFormatter.ofPattern("MM/d/y HH:mm:ss")
+
+    private var nextWakeUpMillis: Long = arm()
+    private var stop: Boolean = false
+
+    /**
+     * Rearm for another `checkPeriod`.
+     */
+    fun rearm() {
+        nextWakeUpMillis = arm()
+        log.info("Watchdog rearmed for " + format(nextWakeUpMillis))
+    }
+
+    /**
+     * Start the watch dog.
+     */
+    fun run() {
+        val wakeUpSeconds = WAKE_UP_INTERVAL.toMillis()
+        log.info("Server dying at " + format(nextWakeUpMillis) + ", next wake up in "
+                + (wakeUpSeconds / 1000) + " seconds")
+        while (! stop) {
+            Thread.sleep(wakeUpSeconds)
+            val diffSeconds = (nextWakeUpMillis - System.currentTimeMillis()) / 1000
+            if (diffSeconds <= 0) {
+                log.info("Time to die")
+                stop = true
+            } else {
+                log.info("Dying in $diffSeconds seconds")
+            }
+        }
+
+        try {
+            val connection = (URL("http://localhost:$port" + SparkServer.URL_QUIT)
+                    .openConnection() as HttpURLConnection).apply {
+                requestMethod = "GET"
+            }
+            val code = connection.responseCode
+            if (code == 200) {
+                log.info("Successfully stopped the server")
+            } else {
+                warn("Couldn't stop the server, response: " + code)
+            }
+        } catch(ex: Exception) {
+            warn("Couldn't stop the server: " + ex.message, ex)
+        }
+    }
+
+    private fun arm() = System.currentTimeMillis() + (checkPeriodSeconds * 1000)
+
+    private fun toLocalDate(millis: Long) = LocalDateTime.ofEpochSecond(millis / 1000, 0, OffsetDateTime.now().offset)
+
+    private fun format(millis: Long) = FORMAT.format(toLocalDate(millis))
+}

src/main/kotlin/com/beust/kobalt/plugin/KobaltPlugin.kt

@@ -27,11 +27,4 @@ class KobaltPlugin @Inject constructor(val checkVersions: CheckVersions, val upd
         checkVersions.run(project)
         return TaskResult()
     }
-
-    @Task(name = "update", description = "Update Kobalt to the latest version")
-    fun taskUpdate(project: Project) : TaskResult {
-        updateKobalt.updateKobalt()
-        return TaskResult()
-    }
-
 }

src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt

@@ -1,17 +1,18 @@
 package com.beust.kobalt.plugin.application
 
-import com.beust.kobalt.*
+import com.beust.kobalt.Jvm
+import com.beust.kobalt.KobaltException
+import com.beust.kobalt.Plugins
+import com.beust.kobalt.TaskResult
 import com.beust.kobalt.api.*
 import com.beust.kobalt.api.annotation.Directive
-import com.beust.kobalt.api.annotation.Task
 import com.beust.kobalt.archive.Archives
-import com.beust.kobalt.internal.ActorUtils
 import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.aether.Scope
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
-import com.beust.kobalt.misc.RunCommand
 import com.beust.kobalt.misc.kobaltLog
+import com.beust.kobalt.misc.runCommand
 import com.beust.kobalt.plugin.packaging.PackageConfig
 import com.beust.kobalt.plugin.packaging.PackagingPlugin
 import com.google.inject.Inject
@@ -19,6 +20,9 @@ import com.google.inject.Singleton
 import java.io.File
 
 class ApplicationConfig {
+    @Directive
+    var taskName: String = "run"
+
     @Directive
     var mainClass: String? = null
 
@@ -29,6 +33,15 @@ class ApplicationConfig {
     @Directive
     fun args(vararg argv: String) = argv.forEach { args.add(it) }
     val args = arrayListOf<String>()
+
+    @Directive
+    var ignoreErrorStream: Boolean = false
+
+    @Directive
+    var ignoreInputStream: Boolean = true
+
+    @Directive
+    var ignoreExitValue: Boolean = false
 }
 
 @Directive
@@ -40,10 +53,10 @@ fun Project.application(init: ApplicationConfig.() -> Unit): ApplicationConfig {
 }
 
 @Singleton
-class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<ApplicationConfig>,
+class ApplicationPlugin @Inject constructor(val configActor: ConfigsActor<ApplicationConfig>,
         val executors: KobaltExecutors, val nativeManager: NativeManager,
-        val dependencyManager: DependencyManager, val taskContributor : TaskContributor)
-            : BasePlugin(), IRunnerContributor, ITaskContributor, IConfigActor<ApplicationConfig> by configActor {
+        val dependencyManager: DependencyManager, val taskContributor : TaskContributor, val jvm: Jvm)
+            : BasePlugin(), ITaskContributor, IConfigsActor<ApplicationConfig> by configActor {
 
     companion object {
         const val PLUGIN_NAME = "Application"
@@ -53,64 +66,66 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
 
     override fun apply(project: Project, context: KobaltContext) {
         super.apply(project, context)
-        taskContributor.addVariantTasks(this, project, context, "run", group = "run", dependsOn = listOf("install"),
-                runTask = { taskRun(project) })
-    }
 
-    @Task(name = "run", description = "Run the main class", group = "run", dependsOn = arrayOf("install"))
-    fun taskRun(project: Project): TaskResult {
-        val runContributor = ActorUtils.selectAffinityActor(project, context,
-                context.pluginInfo.runnerContributors)
-        if (runContributor != null && runContributor.affinity(project, context) > 0) {
-            return runContributor.run(project, context,
-                    dependencyManager.dependencies(project, context, listOf(Scope.RUNTIME)))
-        } else {
-            context.logger.log(project.name, 1,
-                    "Couldn't find a runner for project ${project.name}. Please make sure" +
-                    " your build file contains " +
-                    "an application{} directive with a mainClass=... in it")
-            return TaskResult()
+        configurationFor(project)?.let { configs ->
+            configs.forEach { config ->
+                taskContributor.addTask(this, project, config.taskName,
+                        description = "Run the class " + config.mainClass,
+                        group = "run",
+                        dependsOn = listOf("assemble"),
+                        runTask = { run(project, context, config) })
+            }
         }
     }
 
+//    fun taskRun(project: Project, config: ApplicationConfig): TaskResult {
+//        val runContributor = ActorUtils.selectAffinityActor(project, context,
+//                context.pluginInfo.runnerContributors)
+//        if (runContributor != null && runContributor.affinity(project, context) > 0) {
+//            return runContributor.run(project, context,
+//                    dependencyManager.dependencies(project, context, listOf(Scope.RUNTIME)))
+//        } else {
+//            context.logger.log(project.name, 1,
+//                    "Couldn't find a runner for project ${project.name}. Please make sure" +
+//                    " your build file contains " +
+//                    "an application{} directive with a mainClass=... in it")
+//            return TaskResult()
+//        }
+//    }
+
     private fun isFatJar(packages: List<PackageConfig>, jarName: String): Boolean {
         val foundJar = packages.flatMap { it.jars }.filter { jarName.endsWith(it.name) }
         return foundJar.size == 1 && foundJar[0].fatJar
     }
 
-    // IRunContributor
-
-    override fun affinity(project: Project, context: KobaltContext): Int {
-        return if (configurationFor(project) != null) IAffinity.DEFAULT_POSITIVE_AFFINITY else 0
-    }
-
-    override fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>): TaskResult {
-        var result = TaskResult()
+    private fun run(project: Project, context: KobaltContext, config: ApplicationConfig): TaskResult {
         if (project.nativeDependencies.any()) {
             nativeManager.installLibraries(project)
         }
-        configurationFor(project)?.let { config ->
+
+        val result =
             if (config.mainClass != null) {
-                result = runJarFile(project, context, config)
+                runJarFile(project, context, config)
             } else {
                 throw KobaltException("No \"mainClass\" specified in the application{} part of project ${project.name}")
             }
-        }
+
         return result
     }
 
     private fun runJarFile(project: Project, context: KobaltContext, config: ApplicationConfig) : TaskResult {
+        // If the user specified a Main-Class attribute when creating their jar file manifest, use that. Otherwise,
+        // use the default jar file name and hope there's a main class in it
         val fileName = project.projectProperties.get(Archives.JAR_NAME_WITH_MAIN_CLASS)?.toString()
+            ?: project.projectProperties.get(Archives.JAR_NAME)?.toString()
             ?: throw KobaltException("Couldn't find any jar file with a main class in it")
 
-        val jarFileName = KFiles.joinDir(KFiles.libsDir(project), fileName)
-        val jarName = (jarFileName ?: KFiles.joinDir(KFiles.libsDir(project),
-                context.variant.archiveName(project, null, ".jar")))
-            as String
+        // The application will run in the project's directory, so we don't need to add project.directory here
+        val jarName = KFiles.joinDir(project.buildDirectory, KFiles.LIBS_DIR, fileName)
         @Suppress("UNCHECKED_CAST")
         val packages = project.projectProperties.get(PackagingPlugin.PACKAGES) as List<PackageConfig>
         val allDeps = arrayListOf(jarName)
-        val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable!!
+        val java = jvm.javaExecutable!!
         if (! isFatJar(packages, jarName)) {
             @Suppress("UNCHECKED_CAST")
             // If the jar file is not fat, we need to add the transitive closure of all dependencies
@@ -128,20 +143,38 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
         val contributorFlags = context.pluginInfo.jvmFlagContributors.flatMap {
             it.jvmFlagsFor(project, context, initialArgs)
         }
-        val args = contributorFlags + initialArgs + config.args
-        val exitCode = RunCommand(java.absolutePath).run(args,
-                successCallback = { output: List<String> ->
-                    kobaltLog(1, output.joinToString("\n"))
-                },
-                errorCallback =  { output: List<String> ->
-                    kobaltLog(1, "ERROR")
-                    kobaltLog(1, output.joinToString("\n"))
-                }
-        )
+        val allArgs = contributorFlags + initialArgs + config.args
+        val exitCode = runCommand {
+            command = "java"
+            args = allArgs
+            useErrorStreamAsErrorIndicator = false
+            directory = File(project.directory)
+            successCallback = { output: List<String> ->
+                kobaltLog(1, output.joinToString("\n"))
+            }
+            errorCallback =  { output: List<String> ->
+                kobaltLog(1, "ERROR")
+                kobaltLog(1, output.joinToString("\n"))
+            }
+            useErrorStreamAsErrorIndicator = !config.ignoreErrorStream
+            useInputStreamAsErrorIndicator = !config.ignoreInputStream
+            ignoreExitValue = config.ignoreExitValue
+        }
         return TaskResult(exitCode == 0)
     }
 
     //ITaskContributor
-    override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> = taskContributor.dynamicTasks
+    override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> {
+        val result = arrayListOf<DynamicTask>()
+        configurationFor(project)?.let { configs ->
+            configs.forEach { config ->
+                result.add(DynamicTask(this, config.taskName, "Run the class " + config.mainClass, "run", project,
+                        dependsOn = listOf("assemble"),
+                        closure = { run(project, context, config) }))
+            }
+        }
+
+        return result
+    }
 }