Merge pull request #59 from salesforce/remove-jakarta-annotation-api

use checkerframework instead of jakarta annoation-api
salesforce · Jun 11, 2024 · cc2fe96 · cc2fe96
2 parents 674c0dd + ce18b80
commit cc2fe96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -267,12 +267,6 @@
 
 
   <dependencies>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-      <version>3.0.0</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/src/main/java/com/force/i18n/LabelUtils.java b/src/main/java/com/force/i18n/LabelUtils.java
@@ -22,6 +22,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import com.force.i18n.commons.text.GenericTrieMatcher;
 import com.force.i18n.commons.text.GenericTrieMatcher.GenericTrieMatch;
 import com.force.i18n.commons.text.TextUtil;
@@ -44,7 +46,6 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 
-import jakarta.annotation.Nullable;
 
 /**
  * Set of routines to simplify access to LabelUtils