You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/28 17:49:12 UTC
[maven-doxia] branch flexmark-upgrade updated (316b3d14 -> c36fdc50)
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 316b3d14 INcomplete
add b0d40921 [DOXIA-650] Make MarkdownParser to be a text parser with text markup
add 87d1ab39 [DOXIA-619] Sink.sectionTitle1() creates <h2> instead of <h1>
new c36fdc50 INcomplete
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 (316b3d14)
\
N -- N -- N refs/heads/flexmark-upgrade (c36fdc50)
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:
.../org/apache/maven/doxia/markup/HtmlMarkup.java | 3 --
.../maven/doxia/parser/Xhtml5BaseParser.java | 38 +++++++++++-----------
.../apache/maven/doxia/parser/XhtmlBaseParser.java | 34 +++++++++----------
.../maven/doxia/sink/impl/RandomAccessSink.java | 28 ----------------
.../apache/maven/doxia/sink/impl/SinkAdapter.java | 28 ----------------
.../maven/doxia/sink/impl/Xhtml5BaseSink.java | 24 +++++++-------
.../maven/doxia/sink/impl/XhtmlBaseSink.java | 24 +++++++-------
.../org/apache/maven/doxia/util/HtmlTools.java | 2 +-
.../apache/maven/doxia/macro/toc/TocMacroTest.java | 14 ++++----
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 8 ++---
.../maven/doxia/parser/XhtmlBaseParserTest.java | 8 ++---
.../doxia/sink/impl/SinkEventTestingSink.java | 24 --------------
.../org/apache/maven/doxia/sink/impl/TextSink.java | 24 --------------
.../sink/impl/WellformednessCheckingSink.java | 24 --------------
.../maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 14 ++++----
.../maven/doxia/sink/impl/XhtmlBaseSinkTest.java | 14 ++++----
.../src/main/resources/fml-1.0.1.xsd | 18 ++--------
.../doxia/module/markdown/MarkdownParser.java | 17 +++-------
.../doxia/module/markdown/MarkdownParserTest.java | 38 +++++++++++-----------
.../src/test/resources/comment-before-heading.md | 3 +-
.../src/test/resources/first-heading.md | 4 +--
.../src/test/resources/macro-toc-DOXIA-559.md | 2 +-
.../src/test/resources/macro-toc.md | 4 +--
.../apache/maven/doxia/module/xdoc/XdocParser.java | 6 ++--
.../apache/maven/doxia/module/xdoc/XdocSink.java | 16 ++++-----
.../src/main/resources/xdoc-2.0.xsd | 18 ++--------
.../maven/doxia/module/xdoc/XdocParserTest.java | 28 ++++++++--------
.../maven/doxia/module/xdoc/XdocSinkTest.java | 6 ++--
.../doxia-module-xdoc/src/test/resources/test.xml | 6 ++--
.../maven/doxia/module/xhtml/XhtmlSinkTest.java | 12 +++----
.../doxia-module-xhtml/src/test/resources/fun.html | 2 +-
.../src/test/resources/index.xml.vm | 22 ++++++-------
.../src/test/resources/test.xhtml | 10 +++---
.../maven/doxia/module/xhtml5/Xhtml5Sink.java | 24 +++++++-------
.../maven/doxia/module/xhtml5/Xhtml5SinkTest.java | 12 +++----
.../src/test/resources/fun.html | 2 +-
.../src/test/resources/index.xml.vm | 16 ++++-----
.../src/test/resources/test.xhtml | 10 +++---
.../java/org/apache/maven/doxia/sink/Sink.java | 38 ----------------------
.../doxia-site/xdoc/references/xdoc-format.xml | 12 +++----
.../xdoc/developers/mojo-api-specification.xml | 6 ++--
41 files changed, 221 insertions(+), 422 deletions(-)
[maven-doxia] 01/01: INcomplete
Posted by 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 c36fdc50fc01754db9ebfbb9d5747f6f1167d5d2
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri May 27 21:43:58 2022 +0200
INcomplete
---
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;