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-webserver | |
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-webserver')
-rw-r--r-- | server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java index f3acfaccdcb..89ffe5944ec 100644 --- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java @@ -23,7 +23,6 @@ import java.time.Clock; import java.util.Properties; import org.sonar.api.SonarEdition; import org.sonar.api.SonarQubeSide; -import org.sonar.api.SonarQubeVersion; import org.sonar.api.internal.MetadataLoader; import org.sonar.api.internal.SonarRuntimeImpl; import org.sonar.api.utils.System2; @@ -88,11 +87,13 @@ public class PlatformLevel1 extends PlatformLevel { public void configureLevel() { add(platform, properties); addExtraRootComponents(); - Version apiVersion = MetadataLoader.loadVersion(System2.INSTANCE); + Version apiVersion = MetadataLoader.loadApiVersion(System2.INSTANCE); + Version sqVersion = MetadataLoader.loadSQVersion(System2.INSTANCE); SonarEdition edition = MetadataLoader.loadEdition(System2.INSTANCE); add( - new SonarQubeVersion(apiVersion), + new org.sonar.api.SonarQubeVersion(sqVersion), + new org.sonar.core.platform.SonarQubeVersion(sqVersion), SonarRuntimeImpl.forSonarQube(apiVersion, SonarQubeSide.SERVER, edition), ThreadLocalSettings.class, ConfigurationProvider.class, |