You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/05/08 10:32:46 UTC
[maven-doxia] 01/01: [DOXIA-592] Upgrade Markdown parser - flexmark
to 0.42.8
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-592
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit e5f8f7db48830d669fb4be7b2f4a35f534de315a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed May 8 12:32:22 2019 +0200
[DOXIA-592] Upgrade Markdown parser - flexmark to 0.42.8
---
doxia-modules/doxia-module-markdown/pom.xml | 9 ++++++++-
.../maven/doxia/module/markdown/FlexmarkDoxiaExtension.java | 2 +-
.../org/apache/maven/doxia/module/markdown/MarkdownParser.java | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index f11d774..1097190 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -55,7 +55,14 @@ under the License.
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
- <version>0.40.12</version>
+ <version>0.42.8</version>
+ <exclusions>
+ <!-- exclude to PDF converter -->
+ <exclusion>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-pdf-converter</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java
index 9233148..48edc83 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java
@@ -19,8 +19,8 @@ package org.apache.maven.doxia.module.markdown;
* under the License.
*/
-import com.vladsch.flexmark.Extension;
import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.util.builder.Extension;
import com.vladsch.flexmark.util.options.DataKey;
import com.vladsch.flexmark.util.options.MutableDataHolder;
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
index b9a2e14..641d3df 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
@@ -19,7 +19,6 @@ package org.apache.maven.doxia.module.markdown;
* under the License.
*/
-import com.vladsch.flexmark.Extension;
import com.vladsch.flexmark.ast.Heading;
import com.vladsch.flexmark.ast.HtmlCommentBlock;
import com.vladsch.flexmark.util.ast.Node;
@@ -27,6 +26,7 @@ import com.vladsch.flexmark.ast.util.TextCollectingVisitor;
import com.vladsch.flexmark.html.HtmlRenderer;
import com.vladsch.flexmark.profiles.pegdown.Extensions;
import com.vladsch.flexmark.profiles.pegdown.PegdownOptionsAdapter;
+import com.vladsch.flexmark.util.builder.Extension;
import com.vladsch.flexmark.util.options.MutableDataHolder;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
@@ -62,7 +62,7 @@ import java.util.regex.Pattern;
* @author Julien Nicoulaud
* @since 1.3
*/
-@Component( role = Parser.class, hint = "markdown" )
+@Component( role = Parser.class, hint = MarkdownParser.ROLE_HINT )
public class MarkdownParser
extends AbstractParser
{