diff --git a/cpp-api/src/main/java/consulo/cpp/lang/CHeaderFileType.java b/cpp-api/src/main/java/consulo/cpp/lang/CHeaderFileType.java
index 284207a..dc37aa0 100644
--- a/cpp-api/src/main/java/consulo/cpp/lang/CHeaderFileType.java
+++ b/cpp-api/src/main/java/consulo/cpp/lang/CHeaderFileType.java
@@ -7,7 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/consulo/cpp/lang/CPPHeaderFileType.java b/cpp-api/src/main/java/consulo/cpp/lang/CPPHeaderFileType.java
index 3cd366e..72813d5 100644
--- a/cpp-api/src/main/java/consulo/cpp/lang/CPPHeaderFileType.java
+++ b/cpp-api/src/main/java/consulo/cpp/lang/CPPHeaderFileType.java
@@ -7,7 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/consulo/cpp/lang/CPPSourceFileType.java b/cpp-api/src/main/java/consulo/cpp/lang/CPPSourceFileType.java
index f56ddb9..fdc1cf3 100644
--- a/cpp-api/src/main/java/consulo/cpp/lang/CPPSourceFileType.java
+++ b/cpp-api/src/main/java/consulo/cpp/lang/CPPSourceFileType.java
@@ -6,7 +6,7 @@
 import consulo.ui.image.Image;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/consulo/cpp/lang/CSourceFileType.java b/cpp-api/src/main/java/consulo/cpp/lang/CSourceFileType.java
index 6b40325..e63d8fd 100644
--- a/cpp-api/src/main/java/consulo/cpp/lang/CSourceFileType.java
+++ b/cpp-api/src/main/java/consulo/cpp/lang/CSourceFileType.java
@@ -6,7 +6,7 @@
 import consulo.ui.image.Image;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/consulo/cpp/lang/editor/highlight/CHighlightVisitorFactory.java b/cpp-api/src/main/java/consulo/cpp/lang/editor/highlight/CHighlightVisitorFactory.java
index f3e9eca..26eb716 100644
--- a/cpp-api/src/main/java/consulo/cpp/lang/editor/highlight/CHighlightVisitorFactory.java
+++ b/cpp-api/src/main/java/consulo/cpp/lang/editor/highlight/CHighlightVisitorFactory.java
@@ -6,7 +6,7 @@
 import consulo.language.psi.PsiFile;
 import org.napile.cpp4idea.lang.psi.CPsiFile;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/consulo/cpp/preprocessor/fileProvider/CFileViewProviderFactory.java b/cpp-api/src/main/java/consulo/cpp/preprocessor/fileProvider/CFileViewProviderFactory.java
index cba7426..2ce2d4c 100644
--- a/cpp-api/src/main/java/consulo/cpp/preprocessor/fileProvider/CFileViewProviderFactory.java
+++ b/cpp-api/src/main/java/consulo/cpp/preprocessor/fileProvider/CFileViewProviderFactory.java
@@ -9,7 +9,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/consulo/cpp/preprocessor/parser/CPreprocessorParserDefinition.java b/cpp-api/src/main/java/consulo/cpp/preprocessor/parser/CPreprocessorParserDefinition.java
index 73a9a82..78f6495 100644
--- a/cpp-api/src/main/java/consulo/cpp/preprocessor/parser/CPreprocessorParserDefinition.java
+++ b/cpp-api/src/main/java/consulo/cpp/preprocessor/parser/CPreprocessorParserDefinition.java
@@ -19,7 +19,7 @@
 import consulo.language.psi.PsiFile;
 import consulo.language.version.LanguageVersion;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/org/napile/cpp4idea/CFileTypeFactory.java b/cpp-api/src/main/java/org/napile/cpp4idea/CFileTypeFactory.java
index 3ea406f..6856c09 100644
--- a/cpp-api/src/main/java/org/napile/cpp4idea/CFileTypeFactory.java
+++ b/cpp-api/src/main/java/org/napile/cpp4idea/CFileTypeFactory.java
@@ -24,7 +24,7 @@
 import consulo.cpp.lang.CPPSourceFileType;
 import consulo.cpp.lang.CSourceFileType;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/org/napile/cpp4idea/ide/highlight/CSyntaxHighlighterFactory.java b/cpp-api/src/main/java/org/napile/cpp4idea/ide/highlight/CSyntaxHighlighterFactory.java
index f29220f..0423b70 100644
--- a/cpp-api/src/main/java/org/napile/cpp4idea/ide/highlight/CSyntaxHighlighterFactory.java
+++ b/cpp-api/src/main/java/org/napile/cpp4idea/ide/highlight/CSyntaxHighlighterFactory.java
@@ -7,7 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/org/napile/cpp4idea/lang/CommenterImpl.java b/cpp-api/src/main/java/org/napile/cpp4idea/lang/CommenterImpl.java
index 948223b..f2b8b54 100644
--- a/cpp-api/src/main/java/org/napile/cpp4idea/lang/CommenterImpl.java
+++ b/cpp-api/src/main/java/org/napile/cpp4idea/lang/CommenterImpl.java
@@ -21,7 +21,7 @@
 import consulo.language.Language;
 import org.napile.cpp4idea.CLanguage;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/org/napile/cpp4idea/lang/FoldingBuilderImpl.java b/cpp-api/src/main/java/org/napile/cpp4idea/lang/FoldingBuilderImpl.java
index 8d642a9..fcb2d83 100644
--- a/cpp-api/src/main/java/org/napile/cpp4idea/lang/FoldingBuilderImpl.java
+++ b/cpp-api/src/main/java/org/napile/cpp4idea/lang/FoldingBuilderImpl.java
@@ -31,7 +31,7 @@
 import org.napile.cpp4idea.lang.psi.CPsiImplementingMethod;
 import org.napile.cpp4idea.lang.psi.visitors.CPsiRecursiveElementVisitor;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/cpp-api/src/main/java/org/napile/cpp4idea/lang/PairedBraceMatcherImpl.java b/cpp-api/src/main/java/org/napile/cpp4idea/lang/PairedBraceMatcherImpl.java
index 81d5b22..ecbeb5d 100644
--- a/cpp-api/src/main/java/org/napile/cpp4idea/lang/PairedBraceMatcherImpl.java
+++ b/cpp-api/src/main/java/org/napile/cpp4idea/lang/PairedBraceMatcherImpl.java
@@ -23,7 +23,7 @@
 import org.napile.cpp4idea.CLanguage;
 import org.napile.cpp4idea.lang.psi.CPsiTokens;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/cpp-api/src/main/java/org/napile/cpp4idea/lang/parser/CParserDefinitionImpl.java b/cpp-api/src/main/java/org/napile/cpp4idea/lang/parser/CParserDefinitionImpl.java
index 1481f34..e00ddb6 100644
--- a/cpp-api/src/main/java/org/napile/cpp4idea/lang/parser/CParserDefinitionImpl.java
+++ b/cpp-api/src/main/java/org/napile/cpp4idea/lang/parser/CParserDefinitionImpl.java
@@ -38,7 +38,7 @@
 import org.napile.cpp4idea.lang.psi.CPsiTokenImpl;
 import org.napile.cpp4idea.lang.psi.CPsiTokens;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL
diff --git a/plugin/src/main/java/consulo/cpp/impl/CppIconProvider.java b/plugin/src/main/java/consulo/cpp/impl/CppIconProvider.java
index 8b84eea..be5209e 100644
--- a/plugin/src/main/java/consulo/cpp/impl/CppIconProvider.java
+++ b/plugin/src/main/java/consulo/cpp/impl/CppIconProvider.java
@@ -9,7 +9,7 @@
 import org.napile.cpp4idea.lang.psi.CPsiClass;
 import org.napile.cpp4idea.lang.psi.CPsiDeclarationMethod;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 @ExtensionImpl
 public class CppIconProvider implements IconDescriptorUpdater
diff --git a/plugin/src/main/java/consulo/cpp/impl/DefaultAdditionalTextAttributesProvider.java b/plugin/src/main/java/consulo/cpp/impl/DefaultAdditionalTextAttributesProvider.java
index f2db752..1d620d5 100644
--- a/plugin/src/main/java/consulo/cpp/impl/DefaultAdditionalTextAttributesProvider.java
+++ b/plugin/src/main/java/consulo/cpp/impl/DefaultAdditionalTextAttributesProvider.java
@@ -4,7 +4,7 @@
 import consulo.colorScheme.AdditionalTextAttributesProvider;
 import consulo.colorScheme.EditorColorsScheme;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 /**
  * @author VISTALL