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 2021/05/30 10:57:14 UTC
[maven-doxia] branch test1 created (now baa05cf)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch test1
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
at baa05cf Prepare switch plexus-container-default to org.eclipse.sisu.plexus
This branch includes the following new commits:
new baa05cf Prepare switch plexus-container-default to org.eclipse.sisu.plexus
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.
[maven-doxia] 01/01: Prepare switch plexus-container-default to
org.eclipse.sisu.plexus
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch test1
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit baa05cf312459d625b03bbc962388d378398f4e8
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun May 30 11:50:40 2021 +0200
Prepare switch plexus-container-default to org.eclipse.sisu.plexus
---
.../java/org/apache/maven/doxia/macro/manager/MacroManagerTest.java | 2 +-
.../src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java | 2 +-
.../org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java | 2 +-
.../java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java | 2 +-
.../src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java | 2 +-
.../java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java | 2 +-
.../org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java | 2 +-
.../test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java | 2 +-
.../test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java | 2 +-
.../main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java | 2 +-
.../java/org/apache/maven/doxia/module/xhtml5/Xhtml5ParserTest.java | 2 +-
pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/manager/MacroManagerTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/manager/MacroManagerTest.java
index df635b6..6331d9a 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/manager/MacroManagerTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/manager/MacroManagerTest.java
@@ -35,7 +35,7 @@ public class MacroManagerTest
public void testMacroManager()
throws Exception
{
- MacroManager mm = lookup( MacroManager.ROLE );
+ MacroManager mm = lookup( MacroManager.class );
assertNotNull( mm );
diff --git a/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java b/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
index 0112fde..da243f8 100644
--- a/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
+++ b/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
@@ -49,7 +49,7 @@ public class AptParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, "apt" );
+ parser = (AptParser) lookup( Parser.class, "apt" );
}
protected Parser createParser()
diff --git a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
index a8f5805..ea2314e 100644
--- a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
+++ b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
@@ -58,7 +58,7 @@ public class ConfluenceParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, "confluence" );
+ parser = (ConfluenceParser) lookup( Parser.class, "confluence" );
output = null;
reader = null;
diff --git a/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java b/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
index 5a9ed53..a866523 100644
--- a/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
+++ b/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
@@ -47,7 +47,7 @@ public class DocBookParserTest extends AbstractParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, "docbook" );
+ parser = (DocBookParser) lookup( Parser.class, "docbook" );
}
/** {@inheritDoc} */
diff --git a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
index 735c2f0..c5a47db 100644
--- a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
+++ b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
@@ -50,7 +50,7 @@ public class FmlParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, "fml" );
+ parser = (FmlParser) lookup( Parser.class, "fml" );
// AbstractXmlParser.CachedFileEntityResolver downloads DTD/XSD files in ${java.io.tmpdir}
// Be sure to delete them
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 1431bd6..11e4da5 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
@@ -55,7 +55,7 @@ public class MarkdownParserTest
throws Exception
{
super.setUp();
- parser = lookup( Parser.ROLE, MarkdownParser.ROLE_HINT );
+ parser = (MarkdownParser) lookup( Parser.class, MarkdownParser.ROLE_HINT );
}
/**
diff --git a/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java b/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
index 367e2c9..59f66fc 100644
--- a/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
+++ b/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java
@@ -42,7 +42,7 @@ public class TwikiParserTest
{
super.setUp();
- this.parser = lookup( Parser.ROLE, id );
+ this.parser = (TWikiParser) lookup( Parser.class, id );
}
@Override
diff --git a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
index 29b2d85..a7fd9b8 100644
--- a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
+++ b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
@@ -53,7 +53,7 @@ public class XdocParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, "xdoc" );
+ parser = (XdocParser) lookup( Parser.class, "xdoc" );
// AbstractXmlParser.CachedFileEntityResolver downloads DTD/XSD files in ${java.io.tmpdir}
// Be sure to delete them
diff --git a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
index 7820fa7..9d90db1 100644
--- a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
+++ b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
@@ -43,7 +43,7 @@ public class XhtmlParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, "xhtml" );
+ parser = (XhtmlParser) lookup( Parser.class, "xhtml" );
// AbstractXmlParser.CachedFileEntityResolver downloads DTD/XSD files in ${java.io.tmpdir}
// Be sure to delete them
diff --git a/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java b/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
index 984769b..a1cd434 100644
--- a/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
+++ b/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
@@ -44,7 +44,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* Parse an xhtml model and emit events into a Doxia Sink.
*/
-@Component( role = Parser.class, hint = "xhtml5" )
+@Component( role = Parser.class, hint = Xhtml5Parser.ROLE_HINT )
public class Xhtml5Parser
extends Xhtml5BaseParser
implements Xhtml5Markup
diff --git a/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5ParserTest.java b/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5ParserTest.java
index 20720c0..f5e4164 100644
--- a/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5ParserTest.java
+++ b/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5ParserTest.java
@@ -41,7 +41,7 @@ public class Xhtml5ParserTest
{
super.setUp();
- parser = lookup( Parser.ROLE, Xhtml5Parser.ROLE_HINT );
+ parser = (Xhtml5Parser) lookup( Parser.class, Xhtml5Parser.ROLE_HINT );
// AbstractXmlParser.CachedFileEntityResolver downloads DTD/XSD files in ${java.io.tmpdir}
// Be sure to delete them
diff --git a/pom.xml b/pom.xml
index 8b8417f..e0018ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>34</version>
- <relativePath>../../pom/maven/pom.xml</relativePath>
+ <relativePath />
</parent>
<groupId>org.apache.maven.doxia</groupId>