aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core
diff options
context:
space:
mode:
authorJacek Poreda <jacek.poreda@sonarsource.com>2024-12-11 13:29:02 +0100
committersonartech <sonartech@sonarsource.com>2024-12-18 20:03:11 +0000
commit6a7f3bdf15eaa9ce456ddd482d063496be3ddaa3 (patch)
treee0d5ff7b7a84ba403d4ec9a27380cf2e2e71a50e /sonar-core
parent6a146e820674a08f14b03db7f48f3ec7d393d38b (diff)
downloadsonarqube-6a7f3bdf15eaa9ce456ddd482d063496be3ddaa3.tar.gz
sonarqube-6a7f3bdf15eaa9ce456ddd482d063496be3ddaa3.zip
SONAR-19122 Update annotations from javax to jakarta
Diffstat (limited to 'sonar-core')
-rw-r--r--sonar-core/build.gradle2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsLoader.java2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/sarif/SarifSerializerImpl.java2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java2
-rw-r--r--sonar-core/src/test/java/org/sonar/core/platform/PriorityBeanFactoryTest.java2
-rw-r--r--sonar-core/src/test/java/org/sonar/core/platform/SpringComponentContainerTest.java4
6 files changed, 7 insertions, 7 deletions
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index df6d5ddc907..df61f1b8825 100644
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -10,7 +10,7 @@ dependencies {
api 'commons-io:commons-io'
api 'org.apache.commons:commons-lang3'
api 'jakarta.annotation:jakarta.annotation-api'
- api 'javax.inject:javax.inject'
+ api 'jakarta.inject:jakarta.inject-api'
api 'org.slf4j:slf4j-api'
api 'org.sonarsource.api.plugin:sonar-plugin-api'
api 'org.sonarsource.update-center:sonar-update-center-common'
diff --git a/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsLoader.java b/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsLoader.java
index 5babef92fc9..1dfdcb96604 100644
--- a/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsLoader.java
+++ b/sonar-core/src/main/java/org/sonar/core/extension/CoreExtensionsLoader.java
@@ -22,7 +22,7 @@ package org.sonar.core.extension;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sonar-core/src/main/java/org/sonar/core/sarif/SarifSerializerImpl.java b/sonar-core/src/main/java/org/sonar/core/sarif/SarifSerializerImpl.java
index 61faf38cd70..1a06a8d7571 100644
--- a/sonar-core/src/main/java/org/sonar/core/sarif/SarifSerializerImpl.java
+++ b/sonar-core/src/main/java/org/sonar/core/sarif/SarifSerializerImpl.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.nio.file.Path;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.sonar.api.ce.ComputeEngineSide;
import org.sonar.api.scanner.ScannerSide;
import org.sonar.sarif.pojo.SarifSchema210;
diff --git a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
index 44383c93e7d..9e9b32bc967 100644
--- a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
import java.net.URI;
import java.nio.charset.Charset;
import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PriorityBeanFactoryTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PriorityBeanFactoryTest.java
index 750c87501fe..6e4e973f51f 100644
--- a/sonar-core/src/test/java/org/sonar/core/platform/PriorityBeanFactoryTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/platform/PriorityBeanFactoryTest.java
@@ -19,7 +19,7 @@
*/
package org.sonar.core.platform;
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
diff --git a/sonar-core/src/test/java/org/sonar/core/platform/SpringComponentContainerTest.java b/sonar-core/src/test/java/org/sonar/core/platform/SpringComponentContainerTest.java
index e859495171d..b1ff7ba83be 100644
--- a/sonar-core/src/test/java/org/sonar/core/platform/SpringComponentContainerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/platform/SpringComponentContainerTest.java
@@ -19,10 +19,10 @@
*/
package org.sonar.core.platform;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import java.util.Arrays;
import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import org.junit.Test;
import org.sonar.api.Property;
import org.sonar.api.Startable;