+ re-aligned min maven version to 3.9.0

Author: q3769

pom.xml

@@ -30,7 +30,7 @@
 
     <groupId>io.github.q3769</groupId>
     <artifactId>semver-maven-plugin</artifactId>
-    <version>20240116.0.202507152048</version>
+    <version>20240116.0.202507152211</version>
     <packaging>maven-plugin</packaging>
 
     <name>semver-maven-plugin</name>
@@ -148,6 +148,13 @@
             <version>1.18.38</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -250,7 +257,7 @@
             <plugin>
                 <groupId>io.github.q3769</groupId>
                 <artifactId>semver-maven-plugin</artifactId>
-                <version>20240116.0.202507152048</version>
+                <version>20240116.0.202507152211</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/java/q3769/maven/plugins/semver/LabelUpdater.java

@@ -28,6 +28,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Abstract class for updating semantic version labels.
@@ -44,7 +45,7 @@ public abstract class LabelUpdater extends Updater {
    * instead of incremented.
    */
   @Parameter(property = "set")
-  protected String set;
+  protected @Nullable String set;
 
   /**
    * Increments the label of the given semantic version.
@@ -75,10 +76,10 @@ public abstract class LabelUpdater extends Updater {
   @Override
   protected Version update(Version original) throws MojoFailureException {
     if (StringUtils.isBlank(set)) {
-      logInfo("Incrementing label of version: %s", original);
+      getLog().info(String.format("Incrementing label of version: %s", original));
       return incrementLabel(original);
     } else {
-      logInfo("Setting label of version '%s' into '%s'...", original, set);
+      getLog().info(String.format("Setting label of version '%s' into '%s'...", original, set));
       return setLabel(original, set);
     }
   }

src/main/java/q3769/maven/plugins/semver/NormalVersion.java

@@ -25,8 +25,6 @@
 package q3769.maven.plugins.semver;
 
 import com.github.zafarkhaja.semver.Version;
-import javax.annotation.Nonnull;
-import lombok.NonNull;
 
 /**
  * Enum representing the normal version categories (MAJOR, MINOR, PATCH) of a semantic version.
@@ -140,7 +138,7 @@ public Version incrementTo(long target, Version semver) {
    * @param semver the original semantic version to be incremented
    * @return the exception to be thrown
    */
-  private static @NonNull IllegalArgumentException newIllegalIncrementError(
+  private static IllegalArgumentException newIllegalIncrementError(
       NormalVersion normalVersion, long target, Version semver) {
     String errorMessage = String.format(
         "%s version of %s is already higher than its increment target %d",
@@ -155,7 +153,7 @@ public Version incrementTo(long target, Version semver) {
    * @return the last incremented normal version category
    * @throws IllegalArgumentException if all version numbers are zero
    */
-  public static @Nonnull NormalVersion getLastIncrementedNormalVersion(@Nonnull Version version) {
+  public static NormalVersion getLastIncrementedNormalVersion(Version version) {
     final long major = version.majorVersion();
     final long minor = version.minorVersion();
     final long patch = version.patchVersion();

src/main/java/q3769/maven/plugins/semver/SemverMojo.java

@@ -23,15 +23,17 @@
  */
 package q3769.maven.plugins.semver;
 
+import static java.util.Objects.requireNonNull;
+
 import com.github.zafarkhaja.semver.Version;
-import lombok.NonNull;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Updates the POM file with a new SemVer version
@@ -43,27 +45,27 @@ public abstract class SemverMojo extends AbstractMojo {
 
   /** */
   @Parameter(defaultValue = "${mojoExecution}", readonly = true)
-  protected MojoExecution mojo;
+  protected @Nullable MojoExecution mojo;
 
   /** */
   @Parameter(property = "processModule", defaultValue = FALSE)
-  protected String processModule;
+  protected @Nullable String processModule;
 
   /** Current Maven POM */
   @Parameter(property = "project", defaultValue = "${project}", readonly = true, required = true)
-  protected MavenProject project;
+  protected @Nullable MavenProject project;
 
   /** Default session */
   @Parameter(property = "session", defaultValue = "${session}", readonly = true, required = true)
-  protected MavenSession session;
+  protected @Nullable MavenSession session;
 
   /**
    * @param version text that is supposed to be valid per SemVer spec
    * @return A valid SemVer
    */
-  public static @NonNull Version requireValidSemVer(String version) {
+  public static Version requireValidSemVer(@Nullable String version) {
     try {
-      return Version.parse(version);
+      return Version.parse(requireNonNull(version));
     } catch (Exception ex) {
       throw new IllegalArgumentException("Error parsing '" + version + "' as a SemVer", ex);
     }
@@ -83,53 +85,38 @@ public abstract class SemverMojo extends AbstractMojo {
    */
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
+    requireNonNull(project);
     String projectName = project.getName();
     String pomVersion = originalPomVersion();
-    logInfo(
-        "Goal '%s' processing project '%s' with POM version '%s'...",
-        this.mojo.getGoal(), projectName, pomVersion);
+    getLog()
+        .info(String.format(
+            "Goal '%s' processing project '%s' with POM version '%s'...",
+            requireNonNull(this.mojo).getGoal(), projectName, pomVersion));
     if (project.hasParent()) {
-      logInfo(
-          "current project %s is a module of %s",
-          projectName, project.getParent().getName());
+      getLog()
+          .info(String.format(
+              "current project %s is a module of %s",
+              projectName, project.getParent().getName()));
       if (FALSE.equalsIgnoreCase(processModule)) {
-        logWarn(
-            "Version of module '%s' will not be processed. By default, only parent project is processed; if otherwise desired, use the `-DprocessModule` CLI flag",
-            projectName);
+        getLog()
+            .warn(String.format(
+                "Version of module '%s' will not be processed. By default, only parent project is processed; if otherwise desired, use the `-DprocessModule` CLI flag",
+                projectName));
         return;
       }
       if (pomVersion == null) {
-        logWarn(
-            "Version of module '%s' is inherited to be the same as parent '%s', thus will not be processed independently",
-            projectName, project.getParent().getName());
+        getLog()
+            .warn(String.format(
+                "Version of module '%s' is inherited to be the same as parent '%s', thus will not be processed independently",
+                projectName, project.getParent().getName()));
         return;
       }
     }
     doExecute();
   }
 
   /** @return original version in pom.xml */
-  protected String originalPomVersion() {
-    return project.getModel().getVersion();
-  }
-
-  protected void logError(String message, Object... args) {
-    getLog().error(String.format(message, args));
-  }
-
-  protected void logError(Throwable t, String message, Object... args) {
-    getLog().error(String.format(message, args), t);
-  }
-
-  protected void logWarn(String message, Object... args) {
-    getLog().warn(String.format(message, args));
-  }
-
-  protected void logInfo(String message, Object... args) {
-    getLog().info(String.format(message, args));
-  }
-
-  protected void logDebug(String message, Object... args) {
-    getLog().debug(String.format(message, args));
+  protected @Nullable String originalPomVersion() {
+    return requireNonNull(project).getModel().getVersion();
   }
 }

src/main/java/q3769/maven/plugins/semver/Updater.java

@@ -23,15 +23,16 @@
  */
 package q3769.maven.plugins.semver;
 
+import static java.util.Objects.requireNonNull;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
 
 import com.github.zafarkhaja.semver.Version;
 import javax.inject.Inject;
-import lombok.NonNull;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Updates POM version, based on current value
@@ -50,13 +51,13 @@ public abstract class Updater extends SemverMojo {
 
   /** */
   @Inject
-  protected BuildPluginManager pluginManager;
+  protected @Nullable BuildPluginManager pluginManager;
 
-  private static boolean hasPreReleaseVersionOrBuildMetadata(@NonNull Version version) {
+  private static boolean hasPreReleaseVersionOrBuildMetadata(Version version) {
     return version.preReleaseVersion().isPresent() || version.buildMetadata().isPresent();
   }
 
-  private static Version addSnapshotLabel(@NonNull Version version) {
+  private static Version addSnapshotLabel(Version version) {
     return version.toBuilder().setPreReleaseVersion(SNAPSHOT).build();
   }
 
@@ -77,33 +78,36 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
    * @throws MojoFailureException if original version in POM is malformed
    */
   private Version getUpdatedVersion() throws MojoFailureException {
-    Version original = requireValidSemVer(project.getVersion());
+    Version original = requireValidSemVer(requireNonNull(project).getVersion());
     Version updatedVersion = update(original);
     if (!addingSnapshotLabel) {
       return updatedVersion;
     }
     if (hasPreReleaseVersionOrBuildMetadata(updatedVersion)) {
-      logError(
-          "SNAPSHOT labeling requested for POM version %s but not honored, because SNAPSHOT may collide with other labels in the updated version %s",
-          original, updatedVersion);
+      getLog()
+          .error(String.format(
+              "SNAPSHOT labeling requested for POM version %s but not honored, because SNAPSHOT may collide with other labels in the updated version %s",
+              original, updatedVersion));
       throw new MojoFailureException(
           String.format("SNAPSHOT may collide with other labels in %s", updatedVersion));
     }
-    logInfo("labeling version %s as a SNAPSHOT...", updatedVersion);
+    getLog().info(String.format("labeling version %s as a SNAPSHOT...", updatedVersion));
     return addSnapshotLabel(updatedVersion);
   }
 
   /**
    * @param newVersion New version to be set in the POM file
    * @throws MojoExecutionException if unexpected error occurred while updating the POM file
    */
-  private void updatePomFile(@NonNull String newVersion) throws MojoExecutionException {
+  private void updatePomFile(String newVersion) throws MojoExecutionException {
+    requireNonNull(project);
     String originalVersion = project.getVersion();
-    String executedGoal = mojo.getGoal();
+    String executedGoal = requireNonNull(mojo).getGoal();
     if (newVersion.equals(originalVersion)) {
-      logInfo(
-          "Original POM version: %s remains unchanged after executing goal: %s",
-          originalVersion, executedGoal);
+      getLog()
+          .info(String.format(
+              "Original POM version: %s remains unchanged after executing goal: %s",
+              originalVersion, executedGoal));
       return;
     }
     executeMojo(
@@ -112,9 +116,10 @@ private void updatePomFile(@NonNull String newVersion) throws MojoExecutionExcep
         goal("set"),
         configuration(
             element(name("generateBackupPoms"), "false"), element(name("newVersion"), newVersion)),
-        executionEnvironment(project, session, pluginManager));
-    logInfo(
-        "Updated original POM version: %s into: %s after executing goal: %s",
-        originalVersion, newVersion, executedGoal);
+        executionEnvironment(project, requireNonNull(session), requireNonNull(pluginManager)));
+    getLog()
+        .info(String.format(
+            "Updated original POM version: %s into: %s after executing goal: %s",
+            originalVersion, newVersion, executedGoal));
   }
 }

src/main/java/q3769/maven/plugins/semver/mojos/CalendarMajor.java

@@ -51,11 +51,12 @@ protected Version update(Version original) throws MojoFailureException {
     try {
       return CalendarNormalVersionIncrementer.calendarIncrement(original, NormalVersion.MAJOR);
     } catch (Exception e) {
-      logError(
-          e,
-          "Failed to calendar-increment the %s version of semver %s",
-          NormalVersion.MAJOR,
-          original);
+      getLog()
+          .error(
+              String.format(
+                  "Failed to calendar-increment the %s version of semver %s",
+                  NormalVersion.MAJOR, original),
+              e);
       throw new MojoFailureException(e);
     }
   }

src/main/java/q3769/maven/plugins/semver/mojos/CalendarMinor.java

@@ -44,11 +44,12 @@ protected Version update(Version original) throws MojoFailureException {
     try {
       return CalendarNormalVersionIncrementer.calendarIncrement(original, NormalVersion.MINOR);
     } catch (Exception e) {
-      logError(
-          e,
-          "Failed to calendar-increment the %s version of semver %s",
-          NormalVersion.MINOR,
-          original);
+      getLog()
+          .error(
+              String.format(
+                  "Failed to calendar-increment the %s version of semver %s",
+                  NormalVersion.MINOR, original),
+              e);
       throw new MojoFailureException(e);
     }
   }

src/main/java/q3769/maven/plugins/semver/mojos/CalendarNormalVersionIncrementer.java

@@ -28,8 +28,6 @@
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-import javax.annotation.Nonnull;
-import lombok.NonNull;
 import q3769.maven.plugins.semver.NormalVersion;
 
 enum CalendarNormalVersionIncrementer {
@@ -52,8 +50,7 @@ enum CalendarNormalVersionIncrementer {
    * @param selectedNormalVersion to increment
    * @return new instance incremented to current date in UTC zone
    */
-  public static Version calendarIncrement(
-      Version original, @Nonnull NormalVersion selectedNormalVersion) {
+  public static Version calendarIncrement(Version original, NormalVersion selectedNormalVersion) {
     long selectedNormalVersionNumber = selectedNormalVersion.getNumber(original);
     Instant now = Instant.now();
     for (CalendarNormalVersionIncrementer formatter : values()) {
@@ -62,12 +59,12 @@ public static Version calendarIncrement(
         return selectedNormalVersion.incrementTo(updatedNormalVersionNumber, original);
       }
     }
-    throw new UnsupportedOperationException(String.format(
+    throw new IllegalArgumentException(String.format(
         "%s version %s in POM semver %s is not supported for calendar style increment - it has to be older than current date in UTC zone",
         selectedNormalVersion, selectedNormalVersionNumber, original));
   }
 
-  long format(@NonNull Instant instant) {
+  long format(Instant instant) {
     return Long.parseLong(dateTimeFormatter.format(instant.atZone(ZoneOffset.UTC)));
   }
 }

src/main/java/q3769/maven/plugins/semver/mojos/CalendarPatch.java

@@ -44,11 +44,12 @@ protected Version update(Version original) throws MojoFailureException {
     try {
       return CalendarNormalVersionIncrementer.calendarIncrement(original, NormalVersion.PATCH);
     } catch (Exception e) {
-      logError(
-          e,
-          "Failed to calendar-increment the %s version of semver %s",
-          NormalVersion.PATCH,
-          original);
+      getLog()
+          .error(
+              String.format(
+                  "Failed to calendar-increment the %s version of semver %s",
+                  NormalVersion.PATCH, original),
+              e);
       throw new MojoFailureException(e);
     }
   }