From 63a6f3642d73b7357c37736746a7fb793a1d70bc Mon Sep 17 00:00:00 2001 From: Robert Panzer Date: Mon, 4 Mar 2024 08:19:08 +0100 Subject: [PATCH] Upgrade asciidoctor 2.0.21 (#1267) --- CHANGELOG.adoc | 6 +++++ .../asciidoctor/WhenBackendIsRevealJs.java | 22 +++++-------------- build.gradle | 12 +++++----- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index fbeb00471..7a2280ede 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -16,6 +16,12 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co Improvement:: * Add Reader.getSource() and Reader.getSourceLines() (#1262) +* Upgrade to asciidoctor 2.0.21 (#1267) +* Upgrade to JRuby 9.4.6.0 (#1267) +* Upgrade to asciidoctorj-pdf 2.3.13 (#1267) +* Upgrade to asciidoctorj-diagram 2.3.0 (#1267) +* Upgrade to asciidoctorj-diagram-plantuml 1.2024.3 (#1267) +* Upgrade to asciidoctorj-reveal.js 5.1.0 (#1267) == 2.5.10 (2023-12-20) diff --git a/asciidoctorj-distribution/src/test/java/org/asciidoctor/WhenBackendIsRevealJs.java b/asciidoctorj-distribution/src/test/java/org/asciidoctor/WhenBackendIsRevealJs.java index dcca04c28..c994b90fc 100644 --- a/asciidoctorj-distribution/src/test/java/org/asciidoctor/WhenBackendIsRevealJs.java +++ b/asciidoctorj-distribution/src/test/java/org/asciidoctor/WhenBackendIsRevealJs.java @@ -12,22 +12,11 @@ import java.util.List; import static java.util.stream.Collectors.toList; -import static org.asciidoctor.OptionsBuilder.options; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; public class WhenBackendIsRevealJs { - private Asciidoctor asciidoctor; - - @Before - public void initAsciidoctor() { - this.asciidoctor = Asciidoctor.Factory.create(); - } - @Test public void should_create_simple_slides() throws IOException { String filename = "sample"; @@ -38,7 +27,7 @@ public void should_create_simple_slides() throws IOException { AsciidoctorInvoker.main(new String[]{ "-b", "revealjs", "-r", "asciidoctor-diagram", - "-a", "revealjsdir=https://cdn.jsdelivr.net/npm/reveal.js@3.9.2", + "-a", "revealjsdir=https://cdn.jsdelivr.net/npm/reveal.js@4.1.2", inputFile.getAbsolutePath() }); @@ -51,9 +40,8 @@ public void should_create_simple_slides() throws IOException { .map(element -> element.attr("href")) .collect(toList()); assertThat(stylesheets, - hasItems( - "https://cdn.jsdelivr.net/npm/reveal.js@3.9.2/css/reveal.css", - "https://cdn.jsdelivr.net/npm/reveal.js@3.9.2/css/theme/black.css")); + hasItems("https://cdn.jsdelivr.net/npm/reveal.js@4.1.2/dist/reveal.css", + "https://cdn.jsdelivr.net/npm/reveal.js@4.1.2/dist/theme/black.css")); Element diagramSlide = doc.selectFirst("#diagram"); assertThat(diagramSlide, notNullValue()); diff --git a/build.gradle b/build.gradle index 6c40bd1df..5c93b37ac 100644 --- a/build.gradle +++ b/build.gradle @@ -59,17 +59,17 @@ ext { // jar versions arquillianVersion = '1.6.0.Final' arquillianSpockVersion = '1.0.0.CR1' - asciidoctorjPdfVersion = '2.3.10' + asciidoctorjPdfVersion = '2.3.13' asciidoctorjEpub3Version = '1.5.1' - asciidoctorjDiagramVersion = '2.2.7' // 2.2.8+ requires Java 11 + asciidoctorjDiagramVersion = '2.3.0' asciidoctorjDiagramDitaaMiniVersion = '1.0.3' - asciidoctorjDiagramPlantumlVersion = '1.2023.5' - asciidoctorjRevealJsVersion = '4.1.0' + asciidoctorjDiagramPlantumlVersion = '1.2024.3' + asciidoctorjRevealJsVersion = '5.1.0' commonsioVersion = '2.11.0' guavaVersion = '18.0' hamcrestVersion = '1.3' jcommanderVersion = '1.82' - jrubyVersion = '9.4.5.0' + jrubyVersion = '9.4.6.0' jsoupVersion = '1.14.3' junitVersion = '4.13.2' assertjVersion = '3.19.0' @@ -79,7 +79,7 @@ ext { pdfboxVersion = '1.8.16' // gem versions - asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.20' + asciidoctorGemVersion = project.hasProperty('asciidoctorGemVersion') ? project.asciidoctorGemVersion : '2.0.21' asciimathGemVersion = '2.0.4' coderayGemVersion = '1.1.3' rougeGemVersion = '3.30.0'