This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 1e578aa6d8f17a82184c78ec488cbd57cded23f2 Author: juanpablo <[email protected]> AuthorDate: Thu Feb 27 00:07:22 2020 +0100 update flexmark to 0.60.2 --- .../java/org/apache/wiki/markdown/renderer/JSPWikiLinkRenderer.java | 3 +-- .../org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java | 2 +- .../main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiLinkRenderer.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiLinkRenderer.java index 70895c7..6b7c760 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiLinkRenderer.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiLinkRenderer.java @@ -18,7 +18,6 @@ */ package org.apache.wiki.markdown.renderer; -import com.vladsch.flexmark.html.CustomNodeRenderer; import com.vladsch.flexmark.html.HtmlWriter; import com.vladsch.flexmark.html.renderer.LinkType; import com.vladsch.flexmark.html.renderer.NodeRenderer; @@ -44,7 +43,7 @@ public class JSPWikiLinkRenderer implements NodeRenderer { @Override public Set< NodeRenderingHandler< ? > > getNodeRenderingHandlers() { final HashSet< NodeRenderingHandler< ? > > set = new HashSet<>(); - set.add( new NodeRenderingHandler<>( JSPWikiLink.class, new CustomNodeRenderer< JSPWikiLink >() { + set.add( new NodeRenderingHandler<>( JSPWikiLink.class, new NodeRenderingHandler.CustomNodeRenderer< JSPWikiLink >() { /** * {@inheritDoc} diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java index 147a757..ce376b9 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java @@ -50,7 +50,7 @@ public class JSPWikiNodeRendererFactory implements DelegatingNodeRendererFactory * {@inheritDoc} */ @Override - public Set< Class< ? extends NodeRendererFactory > > getDelegates() { + public Set< Class< ? > > getDelegates() { // return null if renderer does not delegate or delegates only to core node renderer return null; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java b/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java index b8b0e28..e441a0a 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java @@ -23,8 +23,8 @@ import com.vladsch.flexmark.ext.toc.TocExtension; import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.parser.ParserEmulationProfile; import com.vladsch.flexmark.util.ast.Node; -import com.vladsch.flexmark.util.builder.Extension; import com.vladsch.flexmark.util.data.MutableDataSet; +import com.vladsch.flexmark.util.misc.Extension; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; import org.apache.wiki.markdown.MarkdownForJSPWikiExtension; diff --git a/pom.xml b/pom.xml index c7c6a65..b3def41 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ <commons-lang.version>3.9</commons-lang.version> <commons-text.version>1.8</commons-text.version> <ehcache.version>2.10.6</ehcache.version> - <flexmark.version>0.50.50</flexmark.version> + <flexmark.version>0.60.2</flexmark.version> <freshcookies-security.version>0.60</freshcookies-security.version> <gson.version>2.8.5</gson.version> <hsqldb.version>2.5.0</hsqldb.version>
