From 41b5565d7a89650390386d7f5a87e4d2febebb88 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 20 Jul 2018 17:32:43 +0200 Subject: [PATCH] Fix package name of DefaultOrganizationLoader --- .../container/ProjectAnalysisTaskContainerPopulator.java | 2 +- .../projectanalysis/organization/DefaultOrganizationLoader.java | 2 +- .../organization/DefaultOrganizationLoaderTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java index 0682534defa..a9c82ce0d47 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java @@ -95,6 +95,7 @@ import org.sonar.ce.task.projectanalysis.measure.MeasureComputersVisitor; import org.sonar.ce.task.projectanalysis.measure.MeasureRepositoryImpl; import org.sonar.ce.task.projectanalysis.measure.MeasureToMeasureDto; import org.sonar.ce.task.projectanalysis.metric.MetricModule; +import org.sonar.ce.task.projectanalysis.organization.DefaultOrganizationLoader; import org.sonar.ce.task.projectanalysis.period.PeriodHolderImpl; import org.sonar.ce.task.projectanalysis.qualitygate.EvaluationResultTextConverterImpl; import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolderImpl; @@ -125,7 +126,6 @@ import org.sonar.ce.task.step.ComputationSteps; import org.sonar.ce.taskprocessor.MutableTaskResultHolderImpl; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.platform.ContainerPopulator; -import org.sonar.server.computation.organization.DefaultOrganizationLoader; import org.sonar.server.view.index.ViewIndex; public final class ProjectAnalysisTaskContainerPopulator implements ContainerPopulator { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoader.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoader.java index 6ec301fc39e..2c7c4f5caaa 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoader.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.organization; +package org.sonar.ce.task.projectanalysis.organization; import org.picocontainer.Startable; import org.sonar.api.ce.ComputeEngineSide; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoaderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoaderTest.java index 1cdd4fa8b57..413394326c4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoaderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/organization/DefaultOrganizationLoaderTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.organization; +package org.sonar.ce.task.projectanalysis.organization; import org.junit.Test; import org.sonar.server.organization.DefaultOrganizationCache; -- 2.39.5