From ce684ddae14d1927a3111f43b537a22cb3168ebf Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 22 Jun 2018 13:33:23 +0200 Subject: [PATCH] create module sonar-ce-task --- .../build.gradle | 2 + server/sonar-ce-task/build.gradle | 66 +++++++++++++++++++ .../org/sonar/server/computation/CeTask.java | 0 .../server/computation/CeTaskResult.java | 0 .../server/computation/log/CeTaskLogging.java | 0 .../server/computation/log/package-info.java | 0 .../server/computation/package-info.java | 0 .../task/container/EagerStart.java | 0 .../task/container/TaskContainer.java | 0 .../task/container/TaskContainerImpl.java | 0 .../task/container/package-info.java | 0 .../task/step/ComputationStep.java | 0 .../task/step/ComputationStepExecutor.java | 0 .../task/step/ComputationSteps.java | 0 .../ExecuteStatelessInitExtensionsStep.java | 0 .../task/step/StatelessInitExtension.java | 0 .../computation/task/step/TypedException.java | 0 .../computation/task/step/package-info.java | 0 .../MutableTaskResultHolder.java | 0 .../MutableTaskResultHolderImpl.java | 0 .../taskprocessor/TaskResultHolder.java | 0 .../computation/util/InitializedProperty.java | 0 .../server/computation/util/package-info.java | 0 .../sonar/server/computation/CeTaskTest.java | 0 .../computation/log/CeTaskLoggingTest.java | 0 .../computation/task/ChangeLogLevel.java | 0 .../task/container/TaskContainerImplTest.java | 0 .../step/ComputationStepExecutorTest.java | 0 ...xecuteStatelessInitExtensionsStepTest.java | 0 .../computation/task/step/StepsExplorer.java | 0 .../MutableTaskResultHolderImplTest.java | 0 .../src/test/resources/logback-test.xml | 26 ++++++++ server/sonar-ce/build.gradle | 1 + server/sonar-server/build.gradle | 2 +- settings.gradle | 1 + 35 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 server/sonar-ce-task/build.gradle rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/CeTask.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/CeTaskResult.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/log/package-info.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/package-info.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/container/EagerStart.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/container/package-info.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStep.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/StatelessInitExtension.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/TypedException.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/task/step/package-info.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/util/InitializedProperty.java (100%) rename server/{sonar-server => sonar-ce-task}/src/main/java/org/sonar/server/computation/util/package-info.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/CeTaskTest.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStepTest.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java (100%) rename server/{sonar-server => sonar-ce-task}/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java (100%) create mode 100644 server/sonar-ce-task/src/test/resources/logback-test.xml 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeTask.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/CeTaskResult.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/log/CeTaskLogging.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/log/package-info.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/package-info.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/container/EagerStart.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainer.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/container/TaskContainerImpl.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/container/package-info.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStep.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationStepExecutor.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ComputationSteps.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStep.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/StatelessInitExtension.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/TypedException.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/task/step/package-info.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolder.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImpl.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/taskprocessor/TaskResultHolder.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/util/InitializedProperty.java rename to 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 similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/computation/util/package-info.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/CeTaskTest.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/log/CeTaskLoggingTest.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/task/ChangeLogLevel.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/task/container/TaskContainerImplTest.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ComputationStepExecutorTest.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/task/step/ExecuteStatelessInitExtensionsStepTest.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/task/step/StepsExplorer.java rename to 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 similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/computation/taskprocessor/MutableTaskResultHolderImplTest.java rename to 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 @@ + + + + + + + + %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n + + + + + + + + + + + + + + + + + + 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') } diff --git a/settings.gradle b/settings.gradle index 0a5d241e0b2..7ca50832a31 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ include 'plugins:sonar-xoo-plugin' include 'server:sonar-bitbucketcloud' include 'server:sonar-ce' +include 'server:sonar-ce-task' include 'server:sonar-ce-task-projectanalysis' include 'server:sonar-db-testing' include 'server:sonar-db-core' -- 2.39.5