Clean up build.gradle after restructured unit- and integration tests

Author: ysb33r

base-plugin/build.gradle

@@ -74,12 +74,6 @@ dependencies {
     gradleTest 'org.bouncycastle:bcprov-jdk15on:1.50'
 }
 
-test {
-    if (gradle.startParameter.isOffline()) {
-        systemProperties 'TESTS_ARE_OFFLINE': '1'
-    }
-}
-
 generateTestConfig {
     testProperties mavenrepo: file('src/integTest/mavenrepo').absolutePath,
             flatrepo: flatRepoDir.absolutePath,

build.gradle

@@ -6,14 +6,13 @@ plugins {
 }
 
 buildScan {
-    termsOfServiceUrl   = 'https://gradle.com/terms-of-service'
+    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
     termsOfServiceAgree = 'yes'
 }
 
 allprojects {
     apply plugin: 'idea'
 
-    
 
     if (!releaseBuild) {
         version = "${version}-SNAPSHOT"
@@ -37,7 +36,7 @@ subprojects {
         maven { url torqueboxProxy }
     }
 
-    if(project.name != 'docs') {
+    if (project.name != 'docs') {
         apply plugin: TestConfigPlugin
         apply plugin: 'java-gradle-plugin'
         apply plugin: 'groovy'
@@ -77,6 +76,12 @@ subprojects {
         }
 
         install.dependsOn check
+
+        tasks.withType(Test) {
+            if (gradle.startParameter.isOffline()) {
+                systemProperties 'TESTS_ARE_OFFLINE': '1'
+            }
+        }
     }
 
 

jar-plugin/build.gradle

@@ -60,15 +60,6 @@ task prepareTestRepo( type : Copy ) {
 }
 
 test {
-
-    if(gradle.startParameter.isOffline()) {
-        systemProperties 'TESTS_ARE_OFFLINE' : '1'
-    }
-
-    systemProperties TESTROOT : new File(buildDir,'tmp/test/unittests').absolutePath
-    systemProperties TESTREPO_LOCATION : testRepoDir.absolutePath
-    systemProperties 'logback.configurationFile' : new File(projectDir,'src/test/resources/logback-test.xml').absolutePath
-
     dependsOn prepareTestRepo
 }
 
@@ -123,6 +114,5 @@ gradleTest {
 
 integrationTest {
     dependsOn prepareTestRepo
-    systemProperties TESTREPO_LOCATION : testRepoDir.absolutePath
 }
 // vim: ft=groovy