Fix baseDir pathing in site converter

asciidoctor · Oct 6, 2024 · a8dca2d · a8dca2d
1 parent b8bb3d2
commit a8dca2d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -16,6 +16,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/main[co
 Build / Infrastructure::
 
   * Fix javadoc check flake in CI (#814)
+  * Bump AsciidoctorJ to v3.0.0 (#651)
 
 == v3.0.0 (2024-01-30)
 

diff --git a/...oxia-module/src/main/java/org/asciidoctor/maven/site/AsciidoctorConverterDoxiaParser.java b/...oxia-module/src/main/java/org/asciidoctor/maven/site/AsciidoctorConverterDoxiaParser.java
@@ -133,7 +133,7 @@ protected OptionsBuilder defaultOptions(File siteDirectory) {
         return Options.builder()
             .backend("xhtml")
             .safe(SafeMode.UNSAFE)
-            .baseDir(new File(siteDirectory, ROLE_HINT));
+            .baseDir(new File(siteDirectory, ROLE_HINT).getAbsoluteFile());
     }
 
     protected AttributesBuilder defaultAttributes() {

diff --git a/...n-commons/src/main/java/org/asciidoctor/maven/site/SiteConversionConfigurationParser.java b/...n-commons/src/main/java/org/asciidoctor/maven/site/SiteConversionConfigurationParser.java
@@ -93,6 +93,6 @@ public SiteConversionConfiguration processAsciiDocConfig(Xpp3Dom siteConfig,
 
     private File resolveProjectDir(MavenProject project, String path) {
         final File filePath = new File(path);
-        return !filePath.isAbsolute() ? new File(project.getBasedir(), filePath.toString()) : filePath;
+        return !filePath.isAbsolute() ? new File(project.getBasedir(), filePath.toString()).getAbsoluteFile() : filePath;
     }
 }
diff --git a/...octor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoExtensionsTest.java b/...octor-maven-plugin/src/test/java/org/asciidoctor/maven/AsciidoctorMojoExtensionsTest.java
@@ -171,10 +171,9 @@ void should_convert_to_html_with_a_preprocessor() throws MojoFailureException, M
         mojo.resources = excludeAll();
         mojo.outputDirectory = outputDir;
         mojo.standalone = true;
-        // mojo.extensions = Arrays.asList(extensionConfiguration(ChangeAttributeValuePreprocessor.class));
+        mojo.extensions = Arrays.asList(extensionConfiguration(ChangeAttributeValuePreprocessor.class));
         mojo.execute();
         // then
-        String absolutePath = outputDir.getAbsolutePath();
         AsciidoctorAsserter.assertThat(outputDir, "processors-sample.html")
                 .isNotEmpty()
                 .containsPattern("(" + ChangeAttributeValuePreprocessor.AUTHOR_NAME + "([\\s\\S])*){2}");