arti/markdown-macro-for-confluence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated flexmark version and enabled a few more extensions and raised version to 1.3.2

Browse Source
This commit is contained in:
Boris Berenberg
2018-05-09 14:03:35 -04:00
parent e91e0128fd
commit 8bc3987cf7
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pom.xml
View File

@@ -9,7 +9,7 @@
</parent> </parent>
<groupId>com.atlassian.plugins.confluence.markdown</groupId> <groupId>com.atlassian.plugins.confluence.markdown</groupId>
<artifactId>confluence-markdown-macro</artifactId> <artifactId>confluence-markdown-macro</artifactId>
<version>1.3.1-SNAPSHOT</version> <version>1.3.2</version>
<organization> <organization>
<name>Atlassian</name> <name>Atlassian</name>
<url>http://www.atlassian.com/</url> <url>http://www.atlassian.com/</url>
@@ -51,8 +51,29 @@
<dependency> <dependency>
<groupId>com.vladsch.flexmark</groupId> <groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId> <artifactId>flexmark-all</artifactId>
<version>0.22.4</version> <version>0.32.22</version>
</dependency> </dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-anchorlink</artifactId>
<version>0.32.22</version>
</dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-autolink</artifactId>
<version>0.32.22</version>
</dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-superscript</artifactId>
<version>0.32.22</version>
</dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-ext-youtube-embedded</artifactId>
<version>0.32.22</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
@@ -76,8 +97,8 @@
</plugins> </plugins>
</build> </build>
<properties> <properties>
<confluence.version>5.9.1</confluence.version> <confluence.version>6.9.0</confluence.version>
<confluence.data.version>5.9.1</confluence.data.version> <confluence.data.version>6.9.0</confluence.data.version>
<amps.version>6.2.11</amps.version> <amps.version>6.2.11</amps.version>
<plugin.testrunner.version>1.1</plugin.testrunner.version> <plugin.testrunner.version>1.1</plugin.testrunner.version>
</properties> </properties>

14
src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
View File

@@ -28,6 +28,12 @@ import com.vladsch.flexmark.ext.definition.DefinitionExtension;
import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension; import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
import com.vladsch.flexmark.ext.footnotes.FootnoteExtension; import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension; 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.html.HtmlRenderer;
import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.util.options.MutableDataSet; import com.vladsch.flexmark.util.options.MutableDataSet;
@@ -63,12 +69,16 @@ public class MarkdownMacro extends BaseMacro implements Macro
options.set(Parser.EXTENSIONS, Arrays.asList( options.set(Parser.EXTENSIONS, Arrays.asList(
TablesExtension.create(), TablesExtension.create(),
StrikethroughSubscriptExtension.create(), StrikethroughSubscriptExtension.create(),
// SuperscriptExtension.create(),
InsExtension.create(), InsExtension.create(),
TaskListExtension.create(), TaskListExtension.create(),
FootnoteExtension.create(), FootnoteExtension.create(),
WikiLinkExtension.create(), WikiLinkExtension.create(),
DefinitionExtension.create() DefinitionExtension.create(),
AnchorLinkExtension.create(),
AutolinkExtension.create(),
SuperscriptExtension.create(),
YouTubeLinkExtension.create()
)); ));