34 files changed, 96 insertions, 1 deletions
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle
index 5644d921ad0..90ca771974e 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -37,6 +37,7 @@ dependencies {
 
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly project(':sonar-core')
+  compileOnly project(':server:sonar-ce-task')
   compileOnly project(':server:sonar-db-dao')
   compileOnly project(':server:sonar-process')
   compileOnly project(':server:sonar-server-common')
@@ -54,6 +55,7 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.reflections:reflections'
   testCompile project(':server:sonar-db-testing')
+  testCompile project(path: ":server:sonar-ce-task", configuration: "tests")
   testCompile project(path: ":server:sonar-server", configuration: "tests")
 }
 
diff --git a/server/sonar-ce-task/build.gradle b/server/sonar-ce-task/build.gradle
new file mode 100644
index 00000000000..66ad1d81185
--- /dev/null
+++ b/server/sonar-ce-task/build.gradle
@@ -0,0 +1,66 @@
+description = 'Definition of a Compute Engine task and utility "framework" and classes to code one'
+
+sonarqube {
+  properties {
+    property 'sonar.projectName', "${projectTitle} :: Compute Engine :: Task"
+  }
+}
+
+sourceSets {
+  test {
+    resources {
+      srcDirs += ['src/test/projects']
+    }
+  }
+}
+
+
+import org.apache.tools.ant.filters.ReplaceTokens
+processResources {
+  filesMatching('build.properties') {
+    filter ReplaceTokens, tokens: [
+      'buildNumber': release ? 'git rev-parse HEAD'.execute().text.trim() : 'N/A'
+    ]
+  }
+}
+
+dependencies {
+  // please keep the list grouped by configuration and ordered by name
+
+  compile 'org.picocontainer:picocontainer'
+  compile 'org.slf4j:jul-to-slf4j'
+  compile 'org.slf4j:slf4j-api'
+
+  compile project(':server:sonar-process')
+  compile project(':sonar-core')
+  compileOnly project(path: ':sonar-plugin-api')
+
+  compileOnly 'com.google.code.findbugs:jsr305'
+
+  testCompile 'ch.qos.logback:logback-access'
+  testCompile 'ch.qos.logback:logback-classic'
+  testCompile 'ch.qos.logback:logback-core'
+  testCompile 'com.google.code.findbugs:jsr305'
+  testCompile 'com.h2database:h2'
+  testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'junit:junit'
+  testCompile 'org.apache.logging.log4j:log4j-api'
+  testCompile 'org.apache.logging.log4j:log4j-core'
+  testCompile 'org.assertj:assertj-core'
+  testCompile 'org.assertj:assertj-guava'
+  testCompile 'org.mockito:mockito-core'
+  testCompile 'org.reflections:reflections'
+}
+
+task testJar(type: Jar) {
+  classifier = 'tests'
+  from sourceSets.test.output
+}
+
+configurations {
+  tests
+}
+
+artifacts {
+ tests testJar
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/CeTask.java
index f0d4f06ddcf..f0d4f06ddcf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/CeTask.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskResult.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/CeTaskResult.java
index 73dcb927513..73dcb927513 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskResult.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/CeTaskResult.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java
index 8f1dbba3ced..8f1dbba3ced 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/log/package-info.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/log/package-info.java
index 1088bac9be7..1088bac9be7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/log/package-info.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/log/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/package-info.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/package-info.java
index 2b97ccbf4fc..2b97ccbf4fc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/package-info.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/EagerStart.java
index 10ab10abf01..10ab10abf01 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/EagerStart.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java
index ba9a14b28c0..ba9a14b28c0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java
index 3902a1b9709..3902a1b9709 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/package-info.java
index f01956fbb38..f01956fbb38 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/container/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java
index f8fd66fe961..f8fd66fe961 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java
index 536121f29ca..536121f29ca 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java
index c35ca8f6a38..c35ca8f6a38 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStep.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStep.java
index b587083d88b..b587083d88b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStep.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStep.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/StatelessInitExtension.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/StatelessInitExtension.java
index aedc81e8347..aedc81e8347 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/StatelessInitExtension.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/StatelessInitExtension.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/TypedException.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/TypedException.java
index b600f90f7e3..b600f90f7e3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/TypedException.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/TypedException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/package-info.java
index 5868b7cccc4..5868b7cccc4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/task/step/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java
index 5e4409b1b73..5e4409b1b73 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java
index 6fe1e53913e..6fe1e53913e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java
index b4c3e978150..b4c3e978150 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/util/InitializedProperty.java
index 01170eb9fde..01170eb9fde 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/util/InitializedProperty.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/util/package-info.java
index 415bc7b76f9..415bc7b76f9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java
+++ b/server/sonar-ce-task/src/main/java/org/sonar/server/computation/util/package-info.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/CeTaskTest.java
index b42261f5eb7..b42261f5eb7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/CeTaskTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java
index 5193eb1efd8..5193eb1efd8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java
index 3260b7263cd..3260b7263cd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java
index debaac8a916..debaac8a916 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java
index 19050a279bf..19050a279bf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStepTest.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStepTest.java
index fdf4049bf35..fdf4049bf35 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStepTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStepTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java
index 1f836dee41c..1f836dee41c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java
index f81de440ad6..f81de440ad6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java
diff --git a/server/sonar-ce-task/src/test/resources/logback-test.xml b/server/sonar-ce-task/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..3e34b0f9fc8
--- /dev/null
+++ b/server/sonar-ce-task/src/test/resources/logback-test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="okhttp3.mockwebserver">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>
diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle
index 9befb0e3a06..a98c2448250 100644
--- a/server/sonar-ce/build.gradle
+++ b/server/sonar-ce/build.gradle
@@ -11,6 +11,7 @@ dependencies {
 
   compile 'com.google.protobuf:protobuf-java'
   compile 'org.nanohttpd:nanohttpd'
+  compile project(':server:sonar-ce-task')
   compile project(':server:sonar-ce-task-projectanalysis')
   compile project(':server:sonar-server')
 
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index c62666ca78b..ee6ae5f52b2 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -47,6 +47,7 @@ dependencies {
   compile 'org.sonarsource.update-center:sonar-update-center-common'
   compile 'org.mindrot:jbcrypt'
 
+  compile project(':server:sonar-ce-task')
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-plugin-bridge')
@@ -80,7 +81,6 @@ dependencies {
   testCompile 'org.eclipse.jetty:jetty-servlet'
   testCompile 'org.hamcrest:hamcrest-all'
   testCompile 'org.mockito:mockito-core'
-  testCompile 'org.reflections:reflections'
   testCompile 'org.subethamail:subethasmtp'
   testCompile project(':server:sonar-db-testing')
 }