chore(confluence) 🐝 manage special characters in the page title (#109)

* chore(confluence) 🐝 manage special characters in the page title * upgrade version manually --------- Co-authored-by: Julien Boz <[email protected]>
jboz · Dec 1, 2023 · 33b997a · 33b997a
1 parent c0d2e46
commit 33b997a
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 19 deletions.
diff --git a/livingdoc-examples/aggregate/aggregate-cargo/pom.xml b/livingdoc-examples/aggregate/aggregate-cargo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-cargo</artifactId>

diff --git a/livingdoc-examples/aggregate/aggregate-handling/pom.xml b/livingdoc-examples/aggregate/aggregate-handling/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-handling</artifactId>

diff --git a/livingdoc-examples/aggregate/aggregate-location/pom.xml b/livingdoc-examples/aggregate/aggregate-location/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-location</artifactId>

diff --git a/livingdoc-examples/aggregate/aggregate-shared/pom.xml b/livingdoc-examples/aggregate/aggregate-shared/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-shared</artifactId>

diff --git a/livingdoc-examples/aggregate/aggregate-sharedhandling/pom.xml b/livingdoc-examples/aggregate/aggregate-sharedhandling/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-sharedhandling</artifactId>

diff --git a/livingdoc-examples/aggregate/aggregate-voyage/pom.xml b/livingdoc-examples/aggregate/aggregate-voyage/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-voyage</artifactId>

diff --git a/livingdoc-examples/aggregate/aggregate-zz-livingdoc/pom.xml b/livingdoc-examples/aggregate/aggregate-zz-livingdoc/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>aggregate</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate-zz-livingdoc</artifactId>

diff --git a/livingdoc-examples/aggregate/pom.xml b/livingdoc-examples/aggregate/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>livingdoc-examples</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aggregate</artifactId>

diff --git a/livingdoc-examples/ddd-annotated/pom.xml b/livingdoc-examples/ddd-annotated/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>livingdoc-examples</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>ddd-annotated</artifactId>

diff --git a/livingdoc-examples/ddd/pom.xml b/livingdoc-examples/ddd/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>livingdoc-examples</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>ddd</artifactId>

diff --git a/livingdoc-examples/ddd/src/test/resources/features/complex.feature b/livingdoc-examples/ddd/src/test/resources/features/complex.feature
@@ -1,5 +1,5 @@
 # language: en
-Feature: A complex feature
+Feature: A full feature that doesn't limit
   This is the feature description.
 
   In the feature's description, you can use asciidoctor markup as it pleases you.

diff --git a/livingdoc-examples/microservice/pom.xml b/livingdoc-examples/microservice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.ifocusit.livingdoc.example</groupId>
         <artifactId>livingdoc-examples</artifactId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6-SNAPSHOT</version>
     </parent>
     <artifactId>microservice</artifactId>
     <packaging>jar</packaging>

diff --git a/livingdoc-examples/pom.xml b/livingdoc-examples/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>ch.ifocusit.livingdoc.example</groupId>
     <artifactId>livingdoc-examples</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Living Documentation example</name>

diff --git a/livingdoc-maven-plugin/pom.xml b/livingdoc-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>ch.ifocusit.livingdoc</groupId>
     <artifactId>livingdoc-maven-plugin</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.6-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>Living Documentation maven plugin</name>

diff --git a/...oc-maven-plugin/src/main/java/ch/ifocusit/livingdoc/plugin/publish/HtmlPostProcessor.java b/...oc-maven-plugin/src/main/java/ch/ifocusit/livingdoc/plugin/publish/HtmlPostProcessor.java
@@ -130,11 +130,14 @@ public String getPageTitle(Path path) {
             throw new IllegalStateException("Unable to read page title !", e);
         }
         try {
+            String title = "";
             if (isAdoc(path)) {
-                return asciidoctor.load(pageContent, options).getStructuredDoctitle().getMain();
+                title = asciidoctor.load(pageContent, options).getStructuredDoctitle().getMain();
+            } else {
+                // try to read h1 tag
+                title = tagText(pageContent, "h1");
             }
-            // try to read h1 tag
-            return tagText(pageContent, "h1");
+            return StringEscapeUtils.unescapeHtml4(title);
         } catch (IllegalStateException e) {
             return FilenameUtils.removeExtension(path.getFileName().toString());
         }

diff --git a/...aven-plugin/src/test/java/ch/ifocusit/livingdoc/plugin/publish/HtmlPostProcessorTest.java b/...aven-plugin/src/test/java/ch/ifocusit/livingdoc/plugin/publish/HtmlPostProcessorTest.java
@@ -1,11 +1,9 @@
 package ch.ifocusit.livingdoc.plugin.publish;
 
 import ch.ifocusit.livingdoc.plugin.baseMojo.AbstractAsciidoctorMojo;
-import ch.ifocusit.livingdoc.plugin.publish.confluence.PlantumlMacroBlockProcessor;
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.Attributes;
 import org.asciidoctor.Options;
-import org.asciidoctor.extension.JavaExtensionRegistry;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;