Fix regression for Maven 3.8.2 in v2.9.0

Fix regression for path parsing in Maven 3.8.2.
ascopes · Dec 22, 2024 · 6c52d43 · 6c52d43
1 parent 6305d1c
commit 6c52d43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java b/...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;
+  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.toPath())
         .outputDirectory(outputDirectory())
         .protocVersion(protocVersion())
         .sourceDependencies(nonNullList(sourceDependencies))
         .sourceRootRegistrar(sourceRootRegistrar())
         .sourceRoots(sourceDirectories())
-        .outputDescriptorFile(outputDescriptorFile)
         .build();
 
     try {

diff --git a/...est/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojoTestTemplate.java b/...est/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);
     }
   }