diff options
Diffstat (limited to 'server/sonar-webserver-webapi-v2')
| -rw-r--r-- | server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/analysis/service/JresHandlerImpl.java | 2 | ||||
| -rw-r--r-- | server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/PlatformLevel4WebConfig.java | 12 | ||||
| -rw-r--r-- | server/sonar-webserver-webapi-v2/src/main/resources/META-INF/services/jakarta.validation.valueextraction.ValueExtractor (renamed from server/sonar-webserver-webapi-v2/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor) | 0 |
3 files changed, 1 insertions, 13 deletions
diff --git a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/analysis/service/JresHandlerImpl.java b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/analysis/service/JresHandlerImpl.java index 53a06aaf4e0..8f000219200 100644 --- a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/analysis/service/JresHandlerImpl.java +++ b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/analysis/service/JresHandlerImpl.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nullable; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.v2.api.analysis.response.JreInfoRestResponse; diff --git a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/PlatformLevel4WebConfig.java b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/PlatformLevel4WebConfig.java index 2ae1170b7af..efa07eced0b 100644 --- a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/PlatformLevel4WebConfig.java +++ b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/PlatformLevel4WebConfig.java @@ -19,7 +19,6 @@ */ package org.sonar.server.v2.config; -import javax.annotation.Nullable; import org.sonar.api.platform.Server; import org.sonar.api.resources.Languages; import org.sonar.db.Database; @@ -29,13 +28,8 @@ import org.sonar.server.common.github.config.GithubConfigurationService; import org.sonar.server.common.gitlab.config.GitlabConfigurationService; import org.sonar.server.common.group.service.GroupMembershipService; import org.sonar.server.common.group.service.GroupService; -import org.sonar.server.common.health.CeStatusNodeCheck; -import org.sonar.server.common.health.DbConnectionNodeCheck; -import org.sonar.server.common.health.EsStatusNodeCheck; -import org.sonar.server.common.health.WebServerStatusNodeCheck; import org.sonar.server.common.management.ManagedInstanceChecker; import org.sonar.server.common.platform.LivenessChecker; -import org.sonar.server.common.platform.LivenessCheckerImpl; import org.sonar.server.common.project.ImportProjectService; import org.sonar.server.common.projectbindings.service.ProjectBindingsService; import org.sonar.server.common.rule.service.RuleService; @@ -107,12 +101,6 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl public class PlatformLevel4WebConfig { @Bean - public LivenessChecker livenessChecker(DbConnectionNodeCheck dbConnectionNodeCheck, WebServerStatusNodeCheck webServerStatusNodeCheck, CeStatusNodeCheck ceStatusNodeCheck, - @Nullable EsStatusNodeCheck esStatusNodeCheck) { - return new LivenessCheckerImpl(dbConnectionNodeCheck, webServerStatusNodeCheck, ceStatusNodeCheck, esStatusNodeCheck); - } - - @Bean public LivenessController livenessController(LivenessChecker livenessChecker, UserSession userSession, SystemPasscode systemPasscode) { return new DefaultLivenessController(livenessChecker, systemPasscode, userSession); } diff --git a/server/sonar-webserver-webapi-v2/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor b/server/sonar-webserver-webapi-v2/src/main/resources/META-INF/services/jakarta.validation.valueextraction.ValueExtractor index 8d8a32809f4..8d8a32809f4 100644 --- a/server/sonar-webserver-webapi-v2/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor +++ b/server/sonar-webserver-webapi-v2/src/main/resources/META-INF/services/jakarta.validation.valueextraction.ValueExtractor |