[maven-doxia] branch flexmark-upgrade updated (c36fdc50 -> 6377f6cc)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch flexmark-upgrade
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git


 discard c36fdc50 INcomplete
     new 6377f6cc [DOXIA-651] Upgrade Flexmark to 0.50.50

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c36fdc50)
            \
             N -- N -- N   refs/heads/flexmark-upgrade (6377f6cc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[maven-doxia] 01/01: [DOXIA-651] Upgrade Flexmark to 0.50.50

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch flexmark-upgrade
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git

commit 6377f6cc0100907e533e686dbf7ca0c8c1b5b8c8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri May 27 21:43:58 2022 +0200

    [DOXIA-651] Upgrade Flexmark to 0.50.50
    
    This closes #101
---
 doxia-modules/doxia-module-markdown/pom.xml                             | 2 +-
 .../apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java   | 2 +-
 .../java/org/apache/maven/doxia/module/markdown/MarkdownParser.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index c9f17668..5798a4fb 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -63,7 +63,7 @@ under the License.
     <dependency>
       <groupId>com.vladsch.flexmark</groupId>
       <artifactId>flexmark-all</artifactId>
-      <version>0.42.14</version>
+      <version>0.50.50</version>
       <exclusions>
         <!-- exclude to PDF converter -->
         <exclusion>
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java
index 4b950274..91929d0a 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java
@@ -103,7 +103,7 @@ public class FlexmarkDoxiaLinkResolver implements LinkResolver
         }
 
         @Override
-            public LinkResolver create( LinkResolverContext context )
+        public LinkResolver apply( LinkResolverContext context )
         {
             return new FlexmarkDoxiaLinkResolver( context );
         }
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 6ae517e9..330bf3a4 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
@@ -28,7 +28,6 @@ import com.vladsch.flexmark.ast.HtmlCommentBlock;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.ast.util.TextCollectingVisitor;
 import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.util.options.MutableDataSet;
 import com.vladsch.flexmark.ext.escaped.character.EscapedCharacterExtension;
 import com.vladsch.flexmark.ext.abbreviation.AbbreviationExtension;
 import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
@@ -37,6 +36,7 @@ import com.vladsch.flexmark.ext.typographic.TypographicExtension;
 import com.vladsch.flexmark.ext.tables.TablesExtension;
 import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
+import com.vladsch.flexmark.util.data.MutableDataSet;
 
 import org.apache.maven.doxia.markup.HtmlMarkup;
 import org.apache.maven.doxia.markup.TextMarkup;