Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Asciidoctorj to v2.4.3 and jRuby to v9.2.14.0 #526

Merged
merged 1 commit into from
Apr 10, 2021
Merged

Bump Asciidoctorj to v2.4.3 and jRuby to v9.2.14.0 #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions CHANGELOG.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)

Expand Down Expand Up @@ -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)
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.java.version>1.8</project.java.version>
<project.execution.environment>JavaSE-1.8</project.execution.environment>
<asciidoctorj.version>2.4.1</asciidoctorj.version>
<jruby.version>9.2.13.0</jruby.version>
<asciidoctorj.version>2.4.3</asciidoctorj.version>
<jruby.version>9.2.14.0</jruby.version>
<maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
<maven.jacoco.plugin.version>0.8.6</maven.jacoco.plugin.version>
<maven.plugin.plugin.version>3.5</maven.plugin.plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/asciidoctor/maven/AsciidoctorIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void should_apply_code_highlighting_with_pygments_highlightjs() throws Mo
// then
assertThat(outputDir, "main-document.html")
.contains("<pre class=\"highlightjs highlight\">")
.contains("<script>hljs.initHighlighting()</script>");
.contains("if (!hljs.initHighlighting.called) {");
}

@Test
Expand Down