You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/07/09 13:19:25 UTC
[maven-doxia] branch DOXIA-568 updated (cf0a0ba -> 63d8fbf)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch DOXIA-568
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
discard cf0a0ba [DOXIA-568] Enable ANCHORLINKS extension
add d735862 Create Dependabot config file
add c7ca821 Exclude missing JAI core/codec artefacts
add 5df0b65 Bump plexus-utils from 3.1.0 to 3.3.0 (#29)
add 5871d17 Bump xalan from 2.7.1 to 2.7.2 (#30)
add f6a9f58 Bump plexus-component-annotations from 1.7.1 to 2.1.0 (#27)
add dc7a28b Bump xmlunit-core from 2.6.3 to 2.7.0 (#26)
add 4772e6f Bump xmlunit-matchers from 2.6.3 to 2.7.0 (#31)
add cb49c87 Bump fop from 2.4 to 2.5 (#28)
add dca1483 Bump plexus-container-default from 1.7.1 to 2.1.0 (#25)
add f596481 Bump httpclient from 4.5.8 to 4.5.12 (#23)
add 72cd7f9 Bump httpcore from 4.4.11 to 4.4.13 (#22)
add 3540aec update commons-lang to 3.8.1 (#34)
add aac72c3 configure notifications to avoid dev@maven spam
add d55d614 configure GitHub merge button
new 63d8fbf [DOXIA-568] Enable ANCHORLINKS extension
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 (cf0a0ba)
\
N -- N -- N refs/heads/DOXIA-568 (63d8fbf)
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:
.asf.yaml | 10 ++++++++++
.github/dependabot.yml | 24 ++++++++++++++++++++++++
doxia-core/pom.xml | 6 +++---
doxia-modules/doxia-module-fml/pom.xml | 2 +-
doxia-modules/doxia-module-fo/pom.xml | 13 ++++++++++++-
doxia-modules/doxia-module-xdoc/pom.xml | 2 +-
pom.xml | 10 +++++-----
7 files changed, 56 insertions(+), 11 deletions(-)
create mode 100644 .github/dependabot.yml
[maven-doxia] 01/01: [DOXIA-568] Enable ANCHORLINKS extension
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-568
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 63d8fbfde9748c0e59cb5ae93af15325bd7e333e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Feb 7 08:46:58 2020 +0100
[DOXIA-568] Enable ANCHORLINKS extension
---
.../maven/doxia/module/markdown/MarkdownParser.java | 9 ++++++---
.../doxia/module/markdown/MarkdownParserTest.java | 18 ++++++++++++------
2 files changed, 18 insertions(+), 9 deletions(-)
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 f40e123..a00adda 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
@@ -134,15 +134,18 @@ public class MarkdownParser
throws IOException
{
String text = IOUtil.toString( source );
- MutableDataHolder flexmarkOptions = PegdownOptionsAdapter.flexmarkOptions(
- Extensions.ALL & ~( Extensions.HARDWRAPS | Extensions.ANCHORLINKS ) ).toMutable();
+
ArrayList<Extension> extensions = new ArrayList<>();
+
+ MutableDataHolder flexmarkOptions = PegdownOptionsAdapter
+ .flexmarkOptions( Extensions.ALL & ~( Extensions.HARDWRAPS ) )
+ .toMutable();
for ( Extension extension : flexmarkOptions.get( com.vladsch.flexmark.parser.Parser.EXTENSIONS ) )
{
extensions.add( extension );
}
-
extensions.add( FlexmarkDoxiaExtension.create() );
+
flexmarkOptions.set( com.vladsch.flexmark.parser.Parser.EXTENSIONS, extensions );
flexmarkOptions.set( HtmlRenderer.HTML_BLOCK_OPEN_TAG_EOL, false );
flexmarkOptions.set( HtmlRenderer.HTML_BLOCK_CLOSE_TAG_EOL, false );
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 861dc9f..7149879 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
@@ -1,10 +1,4 @@
package org.apache.maven.doxia.module.markdown;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.List;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -32,6 +26,13 @@ import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.impl.SinkEventElement;
import org.apache.maven.doxia.sink.impl.SinkEventTestingSink;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
/**
* Tests for {@link MarkdownParser}.
*
@@ -361,6 +362,11 @@ public class MarkdownParserTest
}
}
+ public void testTocMacro2() throws IOException, ParseException
+ {
+ String html = parseFileToHtml( "macro-toc" );
+ assertTrue( html.contains( "<!-- MACRO{toc|fromDepth=1|toDepth=2} -->" ) );
+ }
/** @throws Exception */
public void testTocMacro()
throws Exception