You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/07/27 06:25:03 UTC
[isis] branch master updated: Bump asciidoctorj.version from 2.5.4 to 2.5.5
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new fc050fce49 Bump asciidoctorj.version from 2.5.4 to 2.5.5
fc050fce49 is described below
commit fc050fce49788af1aa8e13277f0239e0e21d0efb
Author: andi-huber <ah...@apache.org>
AuthorDate: Wed Jul 27 08:24:54 2022 +0200
Bump asciidoctorj.version from 2.5.4 to 2.5.5
- also re-bases SimpleCell on SimpleStructuralNode to honor upstream
changes around the Cell interface
---
.../main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java | 2 +-
.../java/org/apache/isis/tooling/model4adoc/ast/SimpleCell.java | 8 +++++---
tooling/pom.xml | 2 +-
valuetypes/asciidoc/pom.xml | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java
index 647783d014..bb56bbfbf6 100644
--- a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java
+++ b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/J2AdocContext.java
@@ -269,7 +269,7 @@ public class J2AdocContext {
private static void logIfEmptyOrAmbiguous(final Can<J2AdocUnit> units, final String doingWhat) {
if(units.isEmpty()) {
- log.warn("{} yielded no match %n", doingWhat);
+ log.warn("{} yielded no match", doingWhat);
} else if(units.isCardinalityMultiple()) {
log.warn("{} was ambiguous with results: ", doingWhat);
units.forEach(unit->log.warn("\t{}", unit.toString()));
diff --git a/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/ast/SimpleCell.java b/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/ast/SimpleCell.java
index 78cead42ab..04bdc7312d 100644
--- a/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/ast/SimpleCell.java
+++ b/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/ast/SimpleCell.java
@@ -26,7 +26,9 @@ import org.asciidoctor.ast.Table;
import lombok.Getter;
import lombok.Setter;
-public class SimpleCell extends ContentNodeAbstract implements Cell {
+public class SimpleCell
+extends SimpleStructuralNode
+implements Cell {
@Getter @Setter private String style;
@Getter @Setter private String source;
@@ -47,7 +49,7 @@ public class SimpleCell extends ContentNodeAbstract implements Cell {
}
@Override
- public void setHorizontalAlignment(Table.HorizontalAlignment halign) {
+ public void setHorizontalAlignment(final Table.HorizontalAlignment halign) {
setAttribute("halign", halign.name().toLowerCase(), true);
}
@@ -57,7 +59,7 @@ public class SimpleCell extends ContentNodeAbstract implements Cell {
}
@Override
- public void setVerticalAlignment(Table.VerticalAlignment valign) {
+ public void setVerticalAlignment(final Table.VerticalAlignment valign) {
setAttribute("valign", valign.name().toLowerCase(), true);
}
diff --git a/tooling/pom.xml b/tooling/pom.xml
index a74d62f2f3..6af9045b92 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -39,7 +39,7 @@
<jar-plugin.automaticModuleName>org.apache.isis.tooling</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/tooling</git-plugin.propertiesDir>
- <asciidoctorj.version>2.5.4</asciidoctorj.version>
+ <asciidoctorj.version>2.5.5</asciidoctorj.version>
<gradle-tooling.version>7.1.1</gradle-tooling.version>
<maven-model-builder.version>3.8.6</maven-model-builder.version>
<picocli.version>4.6.3</picocli.version>
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
index fb2695bc4f..4991840598 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -29,7 +29,7 @@
<packaging>pom</packaging>
<properties>
- <asciidoctorj.version>2.5.4</asciidoctorj.version>
+ <asciidoctorj.version>2.5.5</asciidoctorj.version>
</properties>
<modules>