This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit a3ea59249059292e0ed3ef413373dd85a1c79f21 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Fri Feb 5 20:43:22 2021 +0100 Maven 3.1.1 Prepare switch plexus-container-default to org.eclipse.sisu.plexus --- doxia-core/pom.xml | 6 ++++++ .../org/apache/maven/doxia/macro/manager/MacroManagerTest.java | 2 +- doxia-logging-api/pom.xml | 6 ++++++ .../java/org/apache/maven/doxia/module/apt/AptParserTest.java | 2 +- .../maven/doxia/module/confluence/ConfluenceParserTest.java | 2 +- .../org/apache/maven/doxia/module/docbook/DocBookParserTest.java | 2 +- .../java/org/apache/maven/doxia/module/fml/FmlParserTest.java | 2 +- .../apache/maven/doxia/module/markdown/MarkdownParserTest.java | 2 +- .../apache/maven/doxia/module/twiki/parser/TwikiParserTest.java | 2 +- .../java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java | 2 +- .../org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java | 2 +- .../java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java | 2 +- .../org/apache/maven/doxia/module/xhtml5/Xhtml5ParserTest.java | 2 +- pom.xml | 9 ++++++++- 14 files changed, 31 insertions(+), 12 deletions(-) diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml index 449f433..ef9f7b7 100644 --- a/doxia-core/pom.xml +++ b/doxia-core/pom.xml @@ -46,6 +46,12 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> +<!-- + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </dependency> +--> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> 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-logging-api/pom.xml b/doxia-logging-api/pom.xml index 423314b..18e4485 100644 --- a/doxia-logging-api/pom.xml +++ b/doxia-logging-api/pom.xml @@ -38,5 +38,11 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </dependency> +<!-- + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </dependency> +--> </dependencies> </project> 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 46d5b25..4070135 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> @@ -197,6 +197,13 @@ under the License. <artifactId>plexus-container-default</artifactId> <version>2.1.0</version> </dependency> +<!-- + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <version>0.0.0.M5</version> <!– M5 - Maven 3.1.1 –> + </dependency> +--> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-annotations</artifactId>
