This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-656+DOXIA-657
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit af633436423e80c4ca0b181412d3db240f2be9ad
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Jun 11 20:34:16 2022 +0200
[DOXIA-657] Deprecate XHML(4) module
This closes #105
---
.../src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java | 1 +
.../src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java | 1 +
.../test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java | 1 +
.../test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java | 2 +-
.../java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java | 1 +
.../src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java | 1 +
.../src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java | 1 +
.../java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java | 1 +
.../src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java | 1 +
.../main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java | 1 +
.../java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java | 1 +
.../test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java | 1 +
.../test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java | 1 +
.../apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java | 1 +
14 files changed, 14 insertions(+), 1 deletion(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
index c4f78ff4..109189dd 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
* @author ltheussl
* @since 1.1
*/
+@Deprecated
public class XhtmlBaseParser
extends AbstractXmlParser
implements HtmlMarkup
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
index bc7ca83f..8bccda25 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;
* @author ltheussl
* @since 1.1
*/
+@Deprecated
public class XhtmlBaseSink
extends AbstractXmlSink
implements HtmlMarkup
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
index 8a91a014..d2f7d138 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
@@ -35,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.*;
* @author ltheussl
* @since 1.1
*/
+@Deprecated
public class XhtmlBaseParserTest
extends AbstractParserTest
{
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
index bea64e93..813d56f8 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
@@ -27,7 +27,6 @@ import javax.swing.text.html.HTML.Attribute;
import org.apache.maven.doxia.markup.Markup;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -40,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* @author ltheussl
* @since 1.1
*/
+@Deprecated
public class XhtmlBaseSinkTest
{
protected static final String LS = Markup.EOL;
diff --git
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
index 9d8f707b..6649327b 100644
---
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
+++
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
@@ -27,6 +27,7 @@ import org.apache.maven.doxia.sink.impl.SinkAdapter;
* @author <a href="mailto:ja...@maven.org";>Jason van Zyl</a>
* @since 1.0
*/
+@Deprecated
public abstract class AbstractXhtmlSink
extends SinkAdapter
{
diff --git
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
index 2cf30213..55553cf0 100644
---
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
+++
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
@@ -31,6 +31,7 @@ import org.apache.maven.doxia.markup.HtmlMarkup;
* @since 1.0
*/
@SuppressWarnings( "checkstyle:interfaceistype" )
+@Deprecated
public interface XhtmlMarkup
extends HtmlMarkup
{
diff --git
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
index 506ffd49..92bc8dd8 100644
---
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
+++
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
*/
@Singleton
@Named( "xhtml4" )
+@Deprecated
public class XhtmlParser
extends XhtmlBaseParser
implements XhtmlMarkup
diff --git
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java
index a8e86268..92922b0a 100644
---
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java
+++
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParserModule.java
@@ -31,6 +31,7 @@ import
org.apache.maven.doxia.parser.module.AbstractParserModule;
*/
@Singleton
@Named( "xhtml4" )
+@Deprecated
public class XhtmlParserModule
extends AbstractParserModule
{
diff --git
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
index 2a43f355..4580b74a 100644
---
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
+++
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
@@ -40,6 +40,7 @@ import org.codehaus.plexus.util.StringUtils;
* @author ltheussl
* @since 1.0
*/
+@Deprecated
public class XhtmlSink
extends XhtmlBaseSink
implements XhtmlMarkup
diff --git
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
index 963cba7b..31dbd709 100644
---
a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
+++
b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
@@ -35,6 +35,7 @@ import
org.apache.maven.doxia.sink.impl.AbstractXmlSinkFactory;
*/
@Singleton
@Named( "xhtml4" )
+@Deprecated
public class XhtmlSinkFactory
extends AbstractXmlSinkFactory
{
diff --git
a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
index fb3abeba..9ac0e28f 100644
---
a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
+++
b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.BeforeEach;
* Check that piping a full model through an XhtmlParser and an XhtmlSink
* leaves the model unchanged.
*/
+@Deprecated
public class XhtmlIdentityTest
extends AbstractIdentityTest
{
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 3642add7..77c6bba5 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
@@ -40,6 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* @author <a href="mailto:l...@trieloff.net";>Lars Trieloff</a>
*/
+@Deprecated
public class XhtmlParserTest
extends AbstractParserTest
{
diff --git
a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
index f62b5ea1..4fac9974 100644
---
a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
+++
b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
@@ -36,6 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* @author Jason van Zyl
* @since 1.0
*/
+@Deprecated
public class XhtmlSinkTest
extends AbstractSinkTest
{
diff --git
a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
index 98032a37..13c32454 100644
---
a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
+++
b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
@@ -27,6 +27,7 @@ import org.apache.maven.doxia.sink.Sink;
/**
* @author <a href="mailto:vincent.sive...@gmail.com";>Vincent Siveton</a>
*/
+@Deprecated
public class XhtmlSinkWithLanguageIdTest
extends XhtmlSinkTest
{
