Merge pull request #442 from javalite/revert-441-gradle-daemon-fix

Revert "Fix the ubuntu build for the gradle plugin"

Author: Igor Polevoy

activejdbc-gradle-plugin/build.gradle

@@ -1,16 +1,12 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
 group 'org.javalite'
 version '1.4.12-SNAPSHOT'
 
 apply plugin: 'groovy'
-apply plugin: 'maven'
 
 sourceCompatibility = 1.7
 
 repositories {
     mavenCentral()
-    maven { url 'http://repo.javalite.io' }
 }
 
 configurations {
@@ -20,8 +16,8 @@ configurations {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile group: 'org.javalite', name: 'activejdbc', version: "${project.version}"
-    compile group: 'org.javalite', name: 'activejdbc-instrumentation', version: "${project.version}"
+    compile group: 'org.javalite', name: 'activejdbc', version: '1.4.11'
+    compile group: 'org.javalite', name: 'activejdbc-instrumentation', version: '1.4.11'
 
     deployerJars group: 'org.apache.maven.wagon', name: 'wagon-http', version: '2.2'
 }
@@ -50,6 +46,8 @@ task moveJars(type: Copy, dependsOn: ['docJar', 'sourceJar']) {
     exclude jar.archivePath.name
 }
 
+build.dependsOn << [moveJars, moveClasses]
+
 clean {
     delete 'target'
 }
@@ -59,35 +57,3 @@ artifacts {
     archives docJar
     archives sourceJar
 }
-
-build.dependsOn << ['testPluginSubproject', 'moveJars', 'moveClasses']
-
-task testDaemonBuild1(type: TestProjectBuild) { useDaemon = true }
-task testDaemonBuild2(type: TestProjectBuild) { useDaemon = true }
-task testNormalBuild1(type: TestProjectBuild) {}
-task testNormalBuild2(type: TestProjectBuild) {}
-
-task testPluginSubproject(dependsOn: ['test', 'install', 'testDaemonBuild1', 'testDaemonBuild2', 'testNormalBuild1', 'testNormalBuild2'])
-
-class TestProjectBuild extends Exec {
-
-    boolean useDaemon = false
-
-    @Override
-    protected void exec() {
-        workingDir('test-project')
-        def buildArgs = []
-        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            executable('cmd')
-            buildArgs += ['/c', '..\\gradlew.bat']
-        } else {
-            executable('../gradlew')
-        }
-
-        def daemonArg = (useDaemon) ? '--daemon' : '--no-daemon'
-        buildArgs += [daemonArg, '--stacktrace', "-Pactivejdbc.version=${project.version}", 'test']
-        args(buildArgs)
-
-        super.exec()
-    }
-}