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/07/27 15:05:05 UTC
[maven-doxia] branch DOXIA-664 updated (a2b5559d -> f6b1b1cc)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIA-664
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
omit a2b5559d [DOXIA-664] Upgrade Flexmark to 0.62.2
add 41312ab9 [DOXIA-663] Remove deprecated XHTML module
new f6b1b1cc [DOXIA-664] Upgrade Flexmark to 0.62.2
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 (a2b5559d)
\
N -- N -- N refs/heads/DOXIA-664 (f6b1b1cc)
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:
.../apache/maven/doxia/parser/XhtmlBaseParser.java | 1242 -----------
.../maven/doxia/sink/impl/XhtmlBaseSink.java | 2229 --------------------
.../maven/doxia/parser/XhtmlBaseParserTest.java | 772 -------
.../maven/doxia/sink/impl/XhtmlBaseSinkTest.java | 1181 -----------
doxia-modules/doxia-module-xhtml/pom.xml | 84 -
.../doxia/module/xhtml/AbstractXhtmlSink.java | 34 -
.../maven/doxia/module/xhtml/XhtmlMarkup.java | 46 -
.../maven/doxia/module/xhtml/XhtmlParser.java | 366 ----
.../doxia/module/xhtml/XhtmlParserModule.java | 45 -
.../apache/maven/doxia/module/xhtml/XhtmlSink.java | 278 ---
.../maven/doxia/module/xhtml/XhtmlSinkFactory.java | 53 -
doxia-modules/doxia-module-xhtml/src/site/site.xml | 43 -
.../doxia/module/xhtml/XhtmlIdentityTest.java | 87 -
.../maven/doxia/module/xhtml/XhtmlParserTest.java | 210 --
.../maven/doxia/module/xhtml/XhtmlSinkTest.java | 462 ----
.../module/xhtml/XhtmlSinkWithLanguageIdTest.java | 48 -
.../src/test/resources/download.apt.vm | 79 -
.../src/test/resources/file.with.dot.in.name.xml | 20 -
.../doxia-module-xhtml/src/test/resources/fun.html | 66 -
.../src/test/resources/index.xml.vm | 231 --
.../src/test/resources/test.xhtml4 | 152 --
doxia-modules/pom.xml | 1 -
pom.xml | 7 +-
src/site/resources/images/doxia-deps.png | Bin 20465 -> 19941 bytes
src/site/xdoc/doxia-deps.odg | Bin 12670 -> 12594 bytes
src/site/xdoc/index.xml | 3 +-
26 files changed, 2 insertions(+), 7737 deletions(-)
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
delete mode 100644 doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
delete mode 100644 doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/pom.xml
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/site/site.xml
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/download.apt.vm
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/file.with.dot.in.name.xml
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/fun.html
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/index.xml.vm
delete mode 100644 doxia-modules/doxia-module-xhtml/src/test/resources/test.xhtml4
[maven-doxia] 01/01: [DOXIA-664] Upgrade Flexmark to 0.62.2
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-664
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit f6b1b1cc037e9c0db614b2429f5325c554b98c20
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 22 20:08:02 2022 +0200
[DOXIA-664] Upgrade Flexmark to 0.62.2
---
doxia-modules/doxia-module-markdown/pom.xml | 8 +++++++-
.../module/markdown/FlexmarkDoxiaLinkResolver.java | 18 +++++++++++-------
.../doxia/module/markdown/MarkdownParserTest.java | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index f576f406..41ee0377 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -63,7 +63,8 @@ under the License.
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
- <version>0.50.50</version>
+ <!-- 0.64.0 requires Java 11 -->
+ <version>0.62.2</version>
<exclusions>
<!-- exclude to PDF converter -->
<exclusion>
@@ -72,6 +73,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>15.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xhtml5</artifactId>
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 91929d0a..9b97ecdd 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
@@ -24,11 +24,13 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
import com.vladsch.flexmark.ext.wikilink.internal.WikiLinkLinkResolver;
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;
@@ -62,7 +64,7 @@ public class FlexmarkDoxiaLinkResolver implements LinkResolver
*
* @param context a {@link com.vladsch.flexmark.html.renderer.LinkResolverContext} object.
*/
- public FlexmarkDoxiaLinkResolver( LinkResolverContext context )
+ public FlexmarkDoxiaLinkResolver( @NotNull LinkResolverBasicContext context )
{
this.pattern = Pattern.compile(
"^(?![^:]+:)((?:\\./)?(?:\\.\\./)*[^\\.]+).(?:"
@@ -75,7 +77,8 @@ public class FlexmarkDoxiaLinkResolver implements LinkResolver
/** {@inheritDoc} */
@Override
- public ResolvedLink resolveLink( Node node, LinkResolverContext context, ResolvedLink link )
+ public @NotNull ResolvedLink resolveLink( @NotNull Node node, @NotNull LinkResolverBasicContext context,
+ @NotNull ResolvedLink link )
{
if ( link.getLinkType() == LinkType.LINK )
{
@@ -95,17 +98,18 @@ public class FlexmarkDoxiaLinkResolver implements LinkResolver
public static class Factory extends IndependentLinkResolverFactory
{
@Override
- public Set<Class<? extends LinkResolverFactory>> getBeforeDependents()
+ public @Nullable 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 apply( LinkResolverContext context )
+ public @NotNull LinkResolver apply( @NotNull LinkResolverBasicContext context )
{
return new FlexmarkDoxiaLinkResolver( context );
}
}
+
}
diff --git a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
index 8519fe38..7887f0bd 100644
--- a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
+++ b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
@@ -394,7 +394,7 @@ public class MarkdownParserTest
"horizontalRule", "section1", "sectionTitle1", "text", "sectionTitle1_", "paragraph", "text",
"paragraph_", "text", "table", "tableRows", "text", "tableRow", "tableHeaderCell", "text",
"tableHeaderCell_", "tableRow_", "text", "tableRow", "tableCell", "text", "tableCell_", "tableRow_",
- "text", "tableRows_", "table_", "section1_", "body_" );
+ "text", "tableRows_", "table_", "text", "section1_", "body_" );
assertFalse( it.hasNext() );
}