Fix regression for Maven 3.8.2 in v2.9.0

.github/workflows/build.yml

@@ -106,7 +106,7 @@ jobs:
 
       - name: Build and test
         shell: bash
-        run: ./mvnw -B -Dcheckstyle.skip -Dlicense.skip verify
+        run: ./mvnw -B -Dcheckstyle.skip -Dlicense.skip clean verify
 
       - name: Publish code coverage
         uses: codecov/codecov-action@v4

protobuf-maven-plugin/src/it/protoc-descriptor-file/pom.xml

@@ -28,8 +28,8 @@
     <relativePath>../setup/pom.xml</relativePath>
   </parent>
 
-  <groupId>path-protoc</groupId>
-  <artifactId>path-protoc</artifactId>
+  <groupId>protoc-descriptor-file</groupId>
+  <artifactId>protoc-descriptor-file</artifactId>
 
   <dependencies>
     <dependency>

protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java

@@ -517,10 +517,10 @@ public AbstractGenerateMojo() {
    * defined in descriptor.proto) containing all the input files in
    * {@code outputDescriptorFile}.</p>
    *
-   * @since 2.8.1
+   * @since 2.9.0
    */
   @Parameter
-  Path outputDescriptorFile;
+  @Nullable File outputDescriptorFile;
 
   /**
    * Override the directory to output generated code to.
@@ -816,12 +816,12 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         .isIgnoreProjectDependencies(ignoreProjectDependencies)
         .isLiteEnabled(liteOnly)
         .isRegisterAsCompilationRoot(registerAsCompilationRoot)
+        .outputDescriptorFile(outputDescriptorFile())
         .outputDirectory(outputDirectory())
         .protocVersion(protocVersion())
         .sourceDependencies(nonNullList(sourceDependencies))
         .sourceRootRegistrar(sourceRootRegistrar())
         .sourceRoots(sourceDirectories())
-        .outputDescriptorFile(outputDescriptorFile)
         .build();
 
     try {
@@ -841,6 +841,12 @@ private Set<String> dependencyScopes() {
         .orElseGet(this::defaultDependencyScopes);
   }
 
+  private @Nullable Path outputDescriptorFile() {
+    return Optional.ofNullable(outputDescriptorFile)
+        .map(File::toPath)
+        .orElse(null);
+  }
+
   private Path outputDirectory() {
     return Optional.ofNullable(outputDirectory)
         .map(File::toPath)

protobuf-maven-plugin/src/test/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojoTestTemplate.java

@@ -891,9 +891,9 @@ class DescriptorFileTest {
     void whenDescriptorFileProvidedExpectProvidedDirectoryToBeUsed(
         @TempDir Path tempDir
     ) throws Throwable {
-      Path expectedDescriptorFile = Files.createFile(tempDir.resolve("protobin.desc"));
+      var expectedDescriptorFile = Files.createFile(tempDir.resolve("protobin.desc"));
       // Given
-      mojo.outputDescriptorFile = expectedDescriptorFile;
+      mojo.outputDescriptorFile = expectedDescriptorFile.toFile();
 
       // When
       mojo.execute();
@@ -902,7 +902,8 @@ void whenDescriptorFileProvidedExpectProvidedDirectoryToBeUsed(
       var captor = ArgumentCaptor.forClass(GenerationRequest.class);
       verify(mojo.sourceCodeGenerator).generate(captor.capture());
       var actualRequest = captor.getValue();
-      assertThat(actualRequest.getOutputDescriptorFile()).isEqualTo(expectedDescriptorFile);
+      assertThat(actualRequest.getOutputDescriptorFile())
+          .isEqualTo(expectedDescriptorFile);
     }
   }