diff options
| author | Jacek <jacek.poreda@sonarsource.com> | 2022-05-30 18:50:42 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2022-05-31 20:02:50 +0000 |
| commit | 9097b10693f9c4fe2c7bde4bccdbca151ebfa452 (patch) | |
| tree | 10eb71dfd890e5725f4f085386812eeb65c53197 /server/sonar-ce | |
| parent | cdeca9bf6ccd0cb1a3b2d397efa8ace1ef4789c2 (diff) | |
| download | sonarqube-9097b10693f9c4fe2c7bde4bccdbca151ebfa452.tar.gz sonarqube-9097b10693f9c4fe2c7bde4bccdbca151ebfa452.zip | |
SONAR-16232 Use plugin api version for SonarRuntime impl
- introduce internal SonarQubeVersion
Diffstat (limited to 'server/sonar-ce')
| -rw-r--r-- | server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index 8193be28b65..3a30af5138a 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -25,7 +25,6 @@ import java.util.List; import javax.annotation.CheckForNull; import org.sonar.api.SonarEdition; import org.sonar.api.SonarQubeSide; -import org.sonar.api.SonarQubeVersion; import org.sonar.api.config.EmailSettings; import org.sonar.api.internal.MetadataLoader; import org.sonar.api.internal.SonarRuntimeImpl; @@ -270,13 +269,15 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { } private static void populateLevel1(Container container, Props props, ComputeEngineStatus computeEngineStatus) { - Version apiVersion = MetadataLoader.loadVersion(System2.INSTANCE); + Version apiVersion = MetadataLoader.loadApiVersion(System2.INSTANCE); + Version sqVersion = MetadataLoader.loadSQVersion(System2.INSTANCE); SonarEdition edition = MetadataLoader.loadEdition(System2.INSTANCE); container.add( props.rawProperties(), ThreadLocalSettings.class, new ConfigurationProvider(), - new SonarQubeVersion(apiVersion), + new org.sonar.api.SonarQubeVersion(sqVersion), + new org.sonar.core.platform.SonarQubeVersion(sqVersion), SonarRuntimeImpl.forSonarQube(apiVersion, SonarQubeSide.COMPUTE_ENGINE, edition), CeProcessLogging.class, UuidFactoryImpl.INSTANCE, |