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

Bump AsciidoctorJ to v2.5.12 and JRuby to v9.4.6.0 #259

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Bump AsciidoctorJ to v2.5.12 and JRuby to v9.4.6.0 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1f9640
Bump AsciidoctorJ to v2.5.12 and JRuby to v9.4.6.0
abelsromero Mar 12, 2024
3ac70e8
Fix use of OS dependant linebreaks in tests
abelsromero Mar 12, 2024
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
4 changes: 2 additions & 2 deletions asciidoc-maven-site-converter-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions asciidoc-maven-site-parser-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions asciidoc-multiple-inputs-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions asciidoc-to-html-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions asciidoc-to-html-multipage-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<asciidoctor-multipage.version>0.0.16</asciidoctor-multipage.version>
<jruby.version>9.4.5.0</jruby.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions asciidoc-to-revealjs-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
<revealjs.version>3.9.2</revealjs.version>
<!-- Use 'master' as version and remove the 'v' prefixing the download url to use the current snapshot version -->
<asciidoctor-revealjs.version>master</asciidoctor-revealjs.version>
Expand Down
4 changes: 2 additions & 2 deletions asciidoctor-diagram-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<asciidoctorj.diagram.version>2.3.0</asciidoctorj.diagram.version>
<jruby.version>9.4.5.0</jruby.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions asciidoctor-epub-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.epub.version>2.1.0</asciidoctorj.epub.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<!-- for a correct kf8 generation, you'll need at least jRuby >= 9.1.8.0 -->
<jruby.version>9.4.5.0</jruby.version>
<jruby.version>9.4.6.0</jruby.version>
<!-- provide full path to kindlegen application if you need the fallback solution -->
<path.to.kindlegen>/absolute/path/to/kindlegen</path.to.kindlegen>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions asciidoctor-pdf-cjk-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
<jruby.version>9.4.5.0</jruby.version>
<jruby.version>9.4.6.0</jruby.version>
<pdf.cjk.version>0.1.3</pdf.cjk.version>
<pdf.cjk.kaigen.version>0.1.1</pdf.cjk.kaigen.version>
<pdf.cjk.kaigen.fonts.download.uri>https://github.com/chloerei/asciidoctor-pdf-cjk-kai_gen_gothic/releases/download/v0.1.0-fonts</pdf.cjk.kaigen.fonts.download.uri>
Expand Down
4 changes: 2 additions & 2 deletions asciidoctor-pdf-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions asciidoctor-pdf-with-theme-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions docbook-pipeline-docbkx-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
4 changes: 2 additions & 2 deletions java-extension-example/asciidoctor-with-extension-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<jruby.version>9.4.6.0</jruby.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion java-extension-example/asciidoctorj-twitter-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions tests/src/test/java/org/asciidoctor/maven/examples/common/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
public class StringUtils {

/**
* Applies OS specific linebreaks.
* Fixed in AsciidoctorJ 2.5.12, always uses '\n' for all OSs.
*/
public static String lines(String... lines) {
return Arrays.stream(lines)
.collect(Collectors.joining(System.lineSeparator()));
.collect(Collectors.joining("\n"));
}
}