1.3.1 release

fake

@@ -1 +0,0 @@
-ajkdfhajksdf

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <groupId>com.atlassian.plugins.confluence.markdown</groupId>
     <artifactId>confluence-markdown-macro</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <organization>
         <name>Atlassian</name>
         <url>http://www.atlassian.com/</url>
@@ -49,9 +49,9 @@
             <version>2.2.2-atlassian-1</version>
         </dependency>
         <dependency>
-            <groupId>org.pegdown</groupId>
+            <groupId>com.vladsch.flexmark</groupId>
-            <artifactId>pegdown</artifactId>
+            <artifactId>flexmark-all</artifactId>
-            <version>1.2.1</version>
+            <version>0.22.4</version>
         </dependency>
     </dependencies>
     <build>
@@ -76,14 +76,14 @@
         </plugins>
     </build>
     <properties>
-        <confluence.version>4.3.7</confluence.version>
+        <confluence.version>5.9.1</confluence.version>
-        <confluence.data.version>4.3.7</confluence.data.version>
+        <confluence.data.version>5.9.1</confluence.data.version>
-        <amps.version>4.2.2</amps.version>
+        <amps.version>6.2.11</amps.version>
         <plugin.testrunner.version>1.1</plugin.testrunner.version>
     </properties>
     <scm>
-        <connection>scm:git:git@bitbucket.org:atlassianlabs/markdown-macro-for-confluence.git</connection>
+        <connection>scm:git:git@bitbucket.org:atlasauthority/markdown-macro-for-confluence.git</connection>
-        <developerConnection>scm:git:git@bitbucket.org:atlassianlabs/markdown-macro-for-confluence.git</developerConnection>
+        <developerConnection>scm:git:git@bitbucket.org:atlasauthority/markdown-macro-for-confluence.git</developerConnection>
-        <url>https://bitbucket.org/atlassianlabs/confluence-markdown-macro</url>
+        <url>https://bitbucket.org/atlasauthority/markdown-macro-for-confluence</url>
     </scm>
 </project>

src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java

@@ -10,6 +10,7 @@ import com.atlassian.confluence.xhtml.api.MacroDefinitionHandler;
 import com.atlassian.confluence.xhtml.api.XhtmlContent;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -17,8 +18,21 @@ import com.atlassian.renderer.RenderContext;
 import com.atlassian.renderer.v2.RenderMode;
 import com.atlassian.renderer.v2.macro.BaseMacro;
 import com.atlassian.renderer.v2.macro.MacroException;
-import org.pegdown.Parser;
+
-import org.pegdown.PegDownProcessor;
+import com.vladsch.flexmark.ast.Node;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+//import com.vladsch.flexmark.ext.superscript.SuperscriptExtension;
+import com.vladsch.flexmark.ext.ins.InsExtension;
+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.html.HtmlRenderer;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.options.MutableDataSet;
+
+
 
 public class MarkdownMacro extends BaseMacro implements Macro
 {
@@ -44,9 +58,30 @@ public class MarkdownMacro extends BaseMacro implements Macro
     @Override
     public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException
     {
-        PegDownProcessor translator = new PegDownProcessor(Parser.ALL);
+        MutableDataSet options = new MutableDataSet();
-        String output = translator.markdownToHtml(bodyContent);
+
-        return output;
+        options.set(Parser.EXTENSIONS, Arrays.asList(
+            TablesExtension.create(), 
+            StrikethroughSubscriptExtension.create(),
+//            SuperscriptExtension.create(),
+            InsExtension.create(),
+            TaskListExtension.create(),
+            FootnoteExtension.create(),
+            WikiLinkExtension.create(),
+            DefinitionExtension.create()
+        ));
+
+        
+        Parser parser = Parser.builder(options).build();
+        HtmlRenderer renderer = HtmlRenderer.builder(options).build();
+
+        Node document = parser.parse(bodyContent);
+        String html = renderer.render(document);  // "<p>This is <em>Sparta</em></p>\n"
+        return html;
+
+        //PegDownProcessor translator = new PegDownProcessor(Parser.ALL);
+        //String output = translator.markdownToHtml(bodyContent);
+        //return output;
     }
 
     @Override

src/main/resources/atlassian-plugin.xml

@@ -15,8 +15,6 @@
                  documentation-url="http://daringfireball.net/projects/markdown/">
         <category name="formatting"/>
         <parameters>
-            <parameter name="extended" type="boolean" default ="true">
-            </parameter>
         </parameters>
     </xhtml-macro>
     <macro name="markdown"
@@ -26,8 +24,6 @@
            documentation-url="http://daringfireball.net/projects/markdown/">
         <category name="formatting"/>
         <parameters>
-            <parameter name="extended" type="boolean" default ="true">
-            </parameter>
         </parameters>
     </macro>
     <resource type="i18n" name="markdown" location="markdownproperties/markdown"/>

src/main/resources/markdownproperties/markdown.properties

@@ -1,3 +1 @@
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=This macro renders text in Markdown syntax into HTML.
+com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=This macro renders Markdown into HTML.
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.label=Enable extended Markdown properties:
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.desc=Find info about extended Markdown at: <a href="https://github.com/sirthias/pegdown#readme">https://github.com/sirthias/pegdown#readme</a>

src/main/resources/markdownproperties/markdown_de_DE.properties

@@ -1,3 +1 @@
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Dieses Makro wandelt Markdown in HTML um.
+com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Dieses Makro wandelt Markdown in HTML um.
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.label=Aktivieren sich weiter Eigenschaften Markdown:
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.desc=Befindet sich information \u00FCber Extended Markdown: <a href="https://github.com/sirthias/pegdown#readme">https://github.com/sirthias/pegdown#readme</a>

src/main/resources/markdownproperties/markdown_fr_FR.properties

@@ -1,3 +1 @@
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Ce macro converti le text format\u00E9 selon Markdown vers HTML
+com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Ce macro converti Markdown vers HTML
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.label=Activez les propri\u00E9t\u00E9s avanc\u00E9es de Markdown:Pour plus d'information sur
-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.param.extended.desc=Pour plus d'information sur les propri\u00E9t\u00E9s avanc\u00E9es de Markdown: <a href="https://github.com/sirthias/pegdown#readme">https://github.com/sirthias/pegdown#readme</a>

src/main/resources/markdownproperties/markdown_it_IT.properties

@@ -0,0 +1 @@
+com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown.desc=Ce macro converti le text format\u00E9 selon Markdown vers HTML