You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2023/02/13 18:33:28 UTC
[maven-doxia] branch master updated: Migrate remaining component from Plexus to JSR 330 annotations (#147)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/master by this push:
new 218b5afa Migrate remaining component from Plexus to JSR 330 annotations (#147)
218b5afa is described below
commit 218b5afaa4e677fcbf3ae6a39ec8e59430f3be1a
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Feb 13 19:33:23 2023 +0100
Migrate remaining component from Plexus to JSR 330 annotations (#147)
---
doxia-core/pom.xml | 4 ----
doxia-modules/doxia-module-markdown/pom.xml | 4 ----
.../apache/maven/doxia/module/markdown/MarkdownSinkFactory.java | 8 +++++---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index 8d92e7cc..de32cefc 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -48,10 +48,6 @@ 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.apache.commons</groupId>
<artifactId>commons-text</artifactId>
diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index e32ba64d..4346ce69 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -57,10 +57,6 @@ under the License.
</properties>
<dependencies>
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSinkFactory.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSinkFactory.java
index 96e172fb..4e8f7a58 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSinkFactory.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSinkFactory.java
@@ -18,17 +18,19 @@
*/
package org.apache.maven.doxia.module.markdown;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.Writer;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkFactory;
import org.apache.maven.doxia.sink.impl.AbstractTextSinkFactory;
-import org.codehaus.plexus.component.annotations.Component;
/**
* Markdown implementation of the Sink factory.
*/
-@Component(role = SinkFactory.class, hint = "markdown")
+@Singleton
+@Named("markdown")
public class MarkdownSinkFactory extends AbstractTextSinkFactory {
/** {@inheritDoc} */
protected Sink createSink(Writer writer, String encoding) {