From 8bc3987cf7efd0031cf0854e3c122a7493964560 Mon Sep 17 00:00:00 2001 From: Boris Berenberg Date: Wed, 9 May 2018 14:03:35 -0400 Subject: [PATCH] updated flexmark version and enabled a few more extensions and raised version to 1.3.2 --- pom.xml | 29 ++++++++++++++++--- .../confluence/markdown/MarkdownMacro.java | 14 +++++++-- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index af87cba..ccf5bd1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.atlassian.plugins.confluence.markdown confluence-markdown-macro - 1.3.1-SNAPSHOT + 1.3.2 Atlassian http://www.atlassian.com/ @@ -51,8 +51,29 @@ com.vladsch.flexmark flexmark-all - 0.22.4 + 0.32.22 + + com.vladsch.flexmark + flexmark-ext-anchorlink + 0.32.22 + + + com.vladsch.flexmark + flexmark-ext-autolink + 0.32.22 + + + com.vladsch.flexmark + flexmark-ext-superscript + 0.32.22 + + + com.vladsch.flexmark + flexmark-ext-youtube-embedded + 0.32.22 + + @@ -76,8 +97,8 @@ - 5.9.1 - 5.9.1 + 6.9.0 + 6.9.0 6.2.11 1.1 diff --git a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java index 45e5195..ca3da41 100644 --- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java +++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java @@ -28,6 +28,12 @@ import com.vladsch.flexmark.ext.definition.DefinitionExtension; import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension; import com.vladsch.flexmark.ext.footnotes.FootnoteExtension; import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension; + +import com.vladsch.flexmark.ext.autolink.AutolinkExtension; +import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension; +import com.vladsch.flexmark.superscript.SuperscriptExtension; +import com.vladsch.flexmark.ext.youtube.embedded.YouTubeLinkExtension; + import com.vladsch.flexmark.html.HtmlRenderer; import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.util.options.MutableDataSet; @@ -63,12 +69,16 @@ public class MarkdownMacro extends BaseMacro implements Macro options.set(Parser.EXTENSIONS, Arrays.asList( TablesExtension.create(), StrikethroughSubscriptExtension.create(), -// SuperscriptExtension.create(), InsExtension.create(), TaskListExtension.create(), FootnoteExtension.create(), WikiLinkExtension.create(), - DefinitionExtension.create() + DefinitionExtension.create(), + AnchorLinkExtension.create(), + AutolinkExtension.create(), + SuperscriptExtension.create(), + YouTubeLinkExtension.create() + ));