From cc81a84e024451469beadce98f05230bff8a82c2 Mon Sep 17 00:00:00 2001 From: Abel Salgado Romero Date: Sat, 10 Apr 2021 14:29:18 +0200 Subject: [PATCH] Bump Asciidoctorj to v2.4.3 and jRuby to v9.2.14.0 --- CHANGELOG.adoc | 11 +++++++---- pom.xml | 4 ++-- .../asciidoctor/maven/AsciidoctorIntegrationTest.java | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 30e9938c..e9fb30e3 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -20,6 +20,12 @@ Documentation:: * Add ID to 'attributes' description, to be able to generate direct url from other docs (#509) * Fix broken links to extension api documentation (https://github.com/djarnis73[@djarnis73]) (#523) +Build / Infrastructure:: + * Upgrade tests to JUni5 (#521) + * Rename main branch (#524) + * Set maven wrapper to use maven v3.8.1 (#525) + * Upgrade Asciidoctorj to v2.4.3 and jRuby to v9.2.14.0 (#526) + Maintenance:: * Upgrade `netty-codec-http` to 4.1.29.Final and refactor `AsciidoctorHttpServer` (#511) @@ -29,9 +35,6 @@ Maintenance:: * Rewrite `AsciidoctorHttpMojoTest` to Java to make it more approachable (#516) * Rewrite `AsciidoctorZipMojoTest` to Java to make it more approachable (#518) * Rewrite `AsciidoctorDoxiaParserTest` to Java + remove Groovy & Spock configurations (#519) - * Upgrade tests to JUni5 (#521) - * Rename main branch (#524) - * Set maven wrapper to use maven v3.8.1 (#525) == v2.1.0 (2020-09-15) @@ -69,4 +72,4 @@ Build / Infrastructure:: * Updated jacoco-maven-plugin version from v0.8.2 to 0.8.5 (#479) * Use maven-javadoc-plugin version defined in `pluginManagement` + update to v3.2.0 (#481) * Add Maven Wrapper to project and CI builds (#484) - * Upgrade Asciidoctorj to 2.4.1 ad jRuby to 9.2.13.0 (#486) + * Upgrade Asciidoctorj to 2.4.1 and jRuby to 9.2.13.0 (#486) diff --git a/pom.xml b/pom.xml index e9943f8b..f7cc6c32 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ UTF-8 1.8 JavaSE-1.8 - 2.4.1 - 9.2.13.0 + 2.4.3 + 9.2.14.0 4.3.0 0.8.6 3.5 diff --git a/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java b/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java index e1902682..fa2b786a 100644 --- a/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java +++ b/src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java @@ -164,7 +164,7 @@ public void should_apply_code_highlighting_with_pygments_highlightjs() throws Mo // then assertThat(outputDir, "main-document.html") .contains("
")
-                .contains("");
+                .contains("if (!hljs.initHighlighting.called) {");
     }
 
     @Test