Replace JSR305 with JSpecify

Author: tbroyer

pom.xml

@@ -76,9 +76,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

src/main/java/net/ltgt/gwt/maven/CommandLine.java

@@ -4,8 +4,6 @@
 import java.nio.file.Paths;import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
@@ -17,6 +15,7 @@
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.jspecify.annotations.Nullable;
 
 class CommandLine {
   private final Log log;
@@ -91,8 +90,7 @@ private String getExecutable() {
     return Paths.get(System.getProperty("java.home"), "bin", "java").toString();
   }
 
-  @Nullable
-  private Toolchain getToolchain() {
+  private @Nullable Toolchain getToolchain() {
     Toolchain tc = null;
     if (toolchainRequirements != null && !toolchainRequirements.isEmpty()) {
       List<Toolchain> tcs = toolchainManager.getToolchains(session, "jdk", toolchainRequirements);

src/main/java/net/ltgt/gwt/maven/CompileMojo.java

@@ -8,8 +8,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -27,6 +25,7 @@
 import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
 import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping;
 import org.codehaus.plexus.util.StringUtils;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Invokes the GWT Compiler on the project's sources and resources.
@@ -320,21 +319,18 @@ private String getModuleShortName() {
     return moduleShortName;
   }
 
-  @Nullable
   @Override
-  public String getLogLevel() {
+  public @Nullable String getLogLevel() {
     return logLevel;
   }
 
-  @Nullable
   @Override
-  public String getStyle() {
+  public @Nullable String getStyle() {
     return style;
   }
 
-  @Nullable
   @Override
-  public Integer getOptimize() {
+  public @Nullable Integer getOptimize() {
     return optimize;
   }
 
@@ -353,9 +349,8 @@ public File getDeployDir() {
     return deploy;
   }
 
-  @Nullable
   @Override
-  public File getExtraDir() {
+  public @Nullable File getExtraDir() {
     return extra;
   }
 
@@ -364,15 +359,13 @@ public boolean isDraftCompile() {
     return draftCompile;
   }
 
-  @Nullable
   @Override
-  public String getLocalWorkers() {
+  public @Nullable String getLocalWorkers() {
     return localWorkers;
   }
 
-  @Nullable
   @Override
-  public String getSourceLevel() {
+  public @Nullable String getSourceLevel() {
     return sourceLevel;
   }
 }

src/main/java/net/ltgt/gwt/maven/GwtOptions.java

@@ -4,9 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import org.apache.maven.plugin.logging.Log;
+import org.jspecify.annotations.Nullable;
 
 public interface GwtOptions {
 

src/main/java/net/ltgt/gwt/maven/TestMojo.java

@@ -8,8 +8,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -24,6 +22,7 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.surefire.api.suite.RunResult;
 import org.apache.maven.surefire.extensions.ForkNodeFactory;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Runs the project's tests with the specific setup needed for {@code GWTTestCase} tests.
@@ -1004,21 +1003,18 @@ public void setEncoding(String encoding) {
 
   // GwtOptions
 
-  @Nullable
   @Override
-  public String getLogLevel() {
+  public @Nullable String getLogLevel() {
     return logLevel;
   }
 
-  @Nullable
   @Override
-  public String getStyle() {
+  public @Nullable String getStyle() {
     return style;
   }
 
-  @Nullable
   @Override
-  public Integer getOptimize() {
+  public @Nullable Integer getOptimize() {
     return optimize;
   }
 
@@ -1037,9 +1033,8 @@ public File getDeployDir() {
     return deploy;
   }
 
-  @Nullable
   @Override
-  public File getExtraDir() {
+  public @Nullable File getExtraDir() {
     return extra;
   }
 
@@ -1048,15 +1043,13 @@ public boolean isDraftCompile() {
     return draftCompile;
   }
 
-  @Nullable
   @Override
-  public String getLocalWorkers() {
+  public @Nullable String getLocalWorkers() {
     return localWorkers;
   }
 
-  @Nullable
   @Override
-  public String getSourceLevel() {
+  public @Nullable String getSourceLevel() {
     return sourceLevel;
   }
 }