diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 99c19e3d..fe214e9a 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -13,12 +13,19 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/main[co == Unreleased +Bug Fixes:: + + * Fixed default value for eruby which caused a fail when using erb templates (#610) + Build / Infrastructure:: - + * Bump Doxia to v1.11.1 and maven-site-plugin in IT to 3.12.0 (#579) * Bump netty-codec-http to v4.1.77.Final (fix CVE-2021-21290) (#582) * Upgrade Asciidoctorj to v2.5.4 and jRuby to v9.3.4.0 (#584) * Upgrade Asciidoctorj to v2.5.5 (#591) + * Upgrade build related Maven plugins to the latest versions (#606) + * Upgrade Asciidoctorj to v2.5.7 (#604) + * Bump netty-codec-http to v4.1.90.Final (fix several CVEs) Documentation:: diff --git a/pom.xml b/pom.xml index bb9ccbe0..83268f83 100644 --- a/pom.xml +++ b/pom.xml @@ -65,17 +65,16 @@ UTF-8 1.8 JavaSE-1.8 - 2.5.5 - 9.3.4.0 + 2.5.7 + 9.3.8.0 4.3.0 - 0.8.7 + 0.8.8 3.5 3.0.5 - 3.8.1 3.2.0 3.0.23 1.7 - 4.1.77.Final + 4.1.90.Final 1.11.1 @@ -172,7 +171,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 + 3.1.0 enforce-maven @@ -204,7 +203,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.plugin.version} + 3.10.1 ${project.java.version} ${project.java.version} @@ -322,17 +321,17 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.4.1 org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 org.apache.maven.plugins maven-surefire-plugin - 2.22.1 + 3.0.0-M7 org.apache.maven.plugins diff --git a/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java b/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java index 303ff49a..95782c7a 100644 --- a/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java +++ b/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java @@ -88,13 +88,13 @@ public class AsciidoctorMojo extends AbstractMojo { protected String attributesChain = ""; @Parameter(property = AsciidoctorMaven.PREFIX + Options.BACKEND, defaultValue = "html5") - protected String backend = ""; + protected String backend = "html5"; @Parameter(property = AsciidoctorMaven.PREFIX + Options.DOCTYPE) protected String doctype; @Parameter(property = AsciidoctorMaven.PREFIX + Options.ERUBY) - protected String eruby = ""; + protected String eruby; @Parameter(property = AsciidoctorMaven.PREFIX + "headerFooter") protected boolean headerFooter = true; @@ -123,14 +123,14 @@ public class AsciidoctorMojo extends AbstractMojo { @Parameter protected List extensions = new ArrayList<>(); - @Parameter(property = AsciidoctorMaven.PREFIX + "embedAssets") + @Parameter(property = AsciidoctorMaven.PREFIX + "embedAssets", defaultValue = "false") protected boolean embedAssets = false; // List of resources to copy to the output directory (e.g., images, css). By default everything is copied @Parameter protected List resources; - @Parameter(property = AsciidoctorMaven.PREFIX + "verbose") + @Parameter(property = AsciidoctorMaven.PREFIX + "verbose", defaultValue = "false") protected boolean enableVerbose = false; @Parameter @@ -476,9 +476,11 @@ protected OptionsBuilder createOptionsBuilder(AsciidoctorMojo configuration, Att .backend(configuration.getBackend()) .safe(SafeMode.UNSAFE) .headerFooter(configuration.isHeaderFooter()) - .eruby(configuration.getEruby()) .mkDirs(true); + if (!isBlank(configuration.getEruby())) + optionsBuilder.eruby(configuration.getEruby()); + if (configuration.isSourcemap()) optionsBuilder.option(Options.SOURCEMAP, true); diff --git a/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java b/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java index fa2b786a..8294a974 100644 --- a/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java +++ b/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java @@ -314,7 +314,7 @@ public void should_not_include_github_files_when_allowUriRead_is_false() throws // then assertThat(outputDir, "github-include.html") - .contains("link:https://raw.githubusercontent.com/cometd/cometd/4.0.x/pom.xml[]"); + .contains("link:https://raw.githubusercontent.com/cometd/cometd/4.0.x/pom.xml[role=include]"); } @Test diff --git a/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java b/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java index d4162dc5..d6342af5 100644 --- a/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java +++ b/src/test/java/org/asciidoctor/maven/AsciidoctorMojoTest.java @@ -179,9 +179,9 @@ public void should_convert_to_html_with_attributes() throws MojoFailureException } @Test - public void should_convert_to_html_with_a_custom_template() throws MojoFailureException, MojoExecutionException { + public void should_convert_to_html_with_a_custom_slim_template() throws MojoFailureException, MojoExecutionException { // given - final String templatesPath = "target/test-classes/templates/"; + final String templatesPath = "target/test-classes/templates/slim/"; File srcDir = new File(DEFAULT_SOURCE_DIRECTORY); File outputDir = newOutputTestDirectory(); @@ -205,6 +205,31 @@ public void should_convert_to_html_with_a_custom_template() throws MojoFailureEx .contains("custom-block-style"); } + @Test + public void should_convert_to_html_with_a_custom_erb_template() throws MojoFailureException, MojoExecutionException { + // given + final String templatesPath = "target/test-classes/templates/"; + File srcDir = new File(DEFAULT_SOURCE_DIRECTORY); + File outputDir = newOutputTestDirectory(); + + // when + AsciidoctorMojo mojo = mockAsciidoctorMojo(); + mojo.backend = "html"; + mojo.sourceDirectory = srcDir; + mojo.sourceDocumentName = "sample.asciidoc"; + mojo.resources = excludeAll(); + mojo.outputDirectory = outputDir; + mojo.templateDirs = Arrays.asList( + new File(templatesPath, "erb") + ); + mojo.execute(); + + // then + assertThat(outputDir, "sample.html") + .isNotEmpty() + .contains("custom-style"); + } + @Test public void should_set_output_file() throws MojoFailureException, MojoExecutionException { // given diff --git a/src/test/resources/templates/erb/section.html.erb b/src/test/resources/templates/erb/section.html.erb new file mode 100644 index 00000000..3f54c5db --- /dev/null +++ b/src/test/resources/templates/erb/section.html.erb @@ -0,0 +1,28 @@ +<%#encoding:UTF-8%><% +slevel = @level.zero? && @special ? 1 : @level +anchor = link_start = link_end = nil +if @id + if @document.attr? :sectanchors + anchor = %() + elsif @document.attr? :sectlinks + link_start = %() + link_end = '' + end +end +if slevel.zero? + %> class="sect0"><%= %(#{anchor}#{link_start}#{title}#{link_end}) %> +<%= content %><% +else + snum = @numbered && @caption.nil? && slevel <= (@document.attr 'sectnumlevels', 3).to_i ? %(#{sectnum} ) : nil + hlevel = slevel + 1 + %>
+<%= @id && %( id="#{@id}") %>><%= %(#{anchor}#{link_start}#{snum}#{captioned_title}#{link_end}) %>><% + if slevel == 1 %> +
+<%= content %> +
<% + else %> +<%= content %><% + end %> +
<% +end %> diff --git a/src/test/resources/templates/set-1/admonition.html.slim b/src/test/resources/templates/slim/set-1/admonition.html.slim similarity index 100% rename from src/test/resources/templates/set-1/admonition.html.slim rename to src/test/resources/templates/slim/set-1/admonition.html.slim diff --git a/src/test/resources/templates/set-2/block_paragraph.html.slim b/src/test/resources/templates/slim/set-2/block_paragraph.html.slim similarity index 100% rename from src/test/resources/templates/set-2/block_paragraph.html.slim rename to src/test/resources/templates/slim/set-2/block_paragraph.html.slim