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

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

Merged
merged 2 commits into from
Dec 1, 2023
Merged

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

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
552ef03
chore(confluence) 🐝 manage special characters in the page title
Dec 1, 2023
70c781e
upgrade version manually
Dec 1, 2023
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
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-cargo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-handling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-location/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-sharedhandling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-voyage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/aggregate-zz-livingdoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/ddd-annotated/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/ddd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/ddd/src/test/resources/features/complex.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/microservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion livingdoc-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 6 additions & 3 deletions ...oc-maven-plugin/src/main/java/ch/ifocusit/livingdoc/plugin/publish/HtmlPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
2 changes: 0 additions & 2 deletions ...aven-plugin/src/test/java/ch/ifocusit/livingdoc/plugin/publish/HtmlPostProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down