From 6a7f3bdf15eaa9ce456ddd482d063496be3ddaa3 Mon Sep 17 00:00:00 2001 From: Jacek Poreda Date: Wed, 11 Dec 2024 13:29:02 +0100 Subject: SONAR-19122 Update annotations from javax to jakarta --- .../src/main/java/org/sonar/scanner/scan/MutableModuleSettings.java | 2 +- .../src/main/java/org/sonar/scanner/scan/MutableProjectSettings.java | 2 +- .../main/java/org/sonar/scanner/scan/SpringModuleScanContainer.java | 2 +- .../main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java | 2 +- .../org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java | 4 ++-- .../org/sonar/scanner/scan/filesystem/DefaultProjectFileSystem.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sonar-scanner-engine/src/main/java/org/sonar/scanner/scan') diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableModuleSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableModuleSettings.java index e00a06a949b..fd830763965 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableModuleSettings.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableModuleSettings.java @@ -22,7 +22,7 @@ package org.sonar.scanner.scan; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.sonar.api.config.internal.Settings; import static java.util.Objects.requireNonNull; diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableProjectSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableProjectSettings.java index db3a1e93686..d6729d3f848 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableProjectSettings.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableProjectSettings.java @@ -25,7 +25,7 @@ import java.util.Optional; import org.sonar.api.config.internal.Settings; import org.sonar.scanner.bootstrap.GlobalConfiguration; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import static java.util.Objects.requireNonNull; diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringModuleScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringModuleScanContainer.java index c3d27df48af..6fbd13c25f9 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringModuleScanContainer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringModuleScanContainer.java @@ -19,7 +19,7 @@ */ package org.sonar.scanner.scan; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.sonar.api.batch.fs.internal.DefaultInputModule; import org.sonar.api.scan.filesystem.FileExclusions; import org.sonar.scanner.bootstrap.ExtensionInstaller; diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java index 1c6fc7fb20e..94e9e5647d6 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java @@ -21,7 +21,7 @@ package org.sonar.scanner.scan; import java.util.Collection; import java.util.Set; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.Plugin; diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java index b0ee4e24de0..716a8ff4439 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java @@ -22,8 +22,8 @@ package org.sonar.scanner.scan.filesystem; import org.sonar.api.batch.fs.internal.DefaultInputModule; import org.sonar.api.batch.fs.internal.predicates.DefaultFilePredicates; -import javax.annotation.Priority; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; @Priority(1) public class DefaultModuleFileSystem extends MutableFileSystem { diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultProjectFileSystem.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultProjectFileSystem.java index 12d73abc729..6ded075cd8f 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultProjectFileSystem.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultProjectFileSystem.java @@ -22,8 +22,8 @@ package org.sonar.scanner.scan.filesystem; import org.sonar.api.batch.fs.internal.DefaultInputProject; import org.sonar.api.batch.fs.internal.predicates.DefaultFilePredicates; -import javax.annotation.Priority; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; @Priority(2) public class DefaultProjectFileSystem extends MutableFileSystem { -- cgit v1.2.3