--- doxia-1.12.0/doxia-modules/doxia-module-markdown/pom.xml.orig	2023-01-09 21:09:18.000000000 -0700

+++ doxia-1.12.0/doxia-modules/doxia-module-markdown/pom.xml	2023-08-21 10:42:42.697953805 -0600

@@ -52,7 +52,7 @@ under the License.

   </contributors>

   <properties>

-    <flexmarkVersion>0.42.14</flexmarkVersion>

+    <flexmarkVersion>0.60.0</flexmarkVersion>

   </properties>

   <dependencies>

--- doxia-1.12.0/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java.orig	2023-01-09 21:09:18.000000000 -0700

+++ doxia-1.12.0/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java	2023-08-21 11:04:17.857176178 -0600

@@ -28,7 +28,7 @@ import com.vladsch.flexmark.ext.wikilink

 import com.vladsch.flexmark.html.IndependentLinkResolverFactory;

 import com.vladsch.flexmark.html.LinkResolver;

 import com.vladsch.flexmark.html.LinkResolverFactory;

-import com.vladsch.flexmark.html.renderer.LinkResolverContext;

+import com.vladsch.flexmark.html.renderer.LinkResolverBasicContext;

 import com.vladsch.flexmark.html.renderer.LinkStatus;

 import com.vladsch.flexmark.html.renderer.LinkType;

 import com.vladsch.flexmark.html.renderer.ResolvedLink;

@@ -60,9 +60,9 @@ public class FlexmarkDoxiaLinkResolver i

     /**

      * 
Constructor for FlexmarkDoxiaLinkResolver.

      *

-     * @param context a {@link com.vladsch.flexmark.html.renderer.LinkResolverContext} object.

+     * @param context a {@link com.vladsch.flexmark.html.renderer.LinkResolverBasicContext} object.

      */

-    public FlexmarkDoxiaLinkResolver( LinkResolverContext context )

+    public FlexmarkDoxiaLinkResolver( LinkResolverBasicContext context )

     {

         this.pattern = Pattern.compile(

                             "^(?![^:]+:)((?:\\./)?(?:\\.\\./)*[^\\.]+).(?:"

@@ -75,7 +75,7 @@ public class FlexmarkDoxiaLinkResolver i

     /** {@inheritDoc} */

     @Override

-    public ResolvedLink resolveLink( Node node, LinkResolverContext context, ResolvedLink link )

+    public ResolvedLink resolveLink( Node node, LinkResolverBasicContext context, ResolvedLink link )

     {

         if ( link.getLinkType() == LinkType.LINK )

         {

@@ -95,15 +95,15 @@ public class FlexmarkDoxiaLinkResolver i

     public static class Factory extends IndependentLinkResolverFactory

     {

         @Override

-        public Set<Class<? extends LinkResolverFactory>> getBeforeDependents()

+        public Set<Class<?>> getBeforeDependents()

         {

-            Set<Class<? extends LinkResolverFactory>> set = new HashSet<>();

+            Set<Class<?>> set = new HashSet<>();

             set.add( WikiLinkLinkResolver.Factory.class );

             return set;

         }

         @Override

-            public LinkResolver create( LinkResolverContext context )

+        public LinkResolver apply( LinkResolverBasicContext context )

         {

             return new FlexmarkDoxiaLinkResolver( context );

         }

--- doxia-1.12.0/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java.orig	2023-01-09 21:09:18.000000000 -0700

+++ doxia-1.12.0/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java	2023-08-21 11:22:47.362297483 -0600

@@ -24,7 +24,8 @@ import com.vladsch.flexmark.ast.HtmlComm

 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.util.data.MutableDataSet;

+import com.vladsch.flexmark.util.misc.Extension;

 import com.vladsch.flexmark.ext.escaped.character.EscapedCharacterExtension;

 import com.vladsch.flexmark.ext.abbreviation.AbbreviationExtension;

 import com.vladsch.flexmark.ext.autolink.AutolinkExtension;

@@ -123,7 +124,7 @@ public class MarkdownParser

         MutableDataSet flexmarkOptions = new MutableDataSet();

         // Enable the extensions that we used to have in Pegdown

-        flexmarkOptions.set( com.vladsch.flexmark.parser.Parser.EXTENSIONS, Arrays.asList(

+        flexmarkOptions.set( com.vladsch.flexmark.parser.Parser.EXTENSIONS, Arrays.<Extension>asList(

                 EscapedCharacterExtension.create(),

                 AbbreviationExtension.create(),

                 AutolinkExtension.create(),

--- doxia-1.12.0/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java.orig	2023-01-09 21:09:18.000000000 -0700

+++ doxia-1.12.0/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java	2023-08-21 11:43:36.473591077 -0600

@@ -400,7 +400,7 @@ public class MarkdownParserTest

                 "text", "unknown", "paragraph", "text", "paragraph_", "text", "table", "tableRows", "text", "tableRow",

                 "tableHeaderCell", "text", "tableHeaderCell_", "tableRow_", "text", "tableRow",

                                 "tableCell", "text", "tableCell_", "tableRow_", "text", "tableRows_", "table_",

-                "body_" );

+                "text", "body_" );

         assertFalse( it.hasNext() );

     }