You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/02/17 15:56:21 UTC
[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-251] Plexus to Sisu migration missed Singleton annotation
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch DOXIASITETOOLS-251-sisu-singleton
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit f6739e23e436918ccc4aa914f1f1c85ac5e3e19d
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Feb 17 16:55:39 2022 +0100
[DOXIASITETOOLS-251] Plexus to Sisu migration missed Singleton annotation
Fixing the affect component annotations to remain singletons.
---
.../inheritance/DefaultDecorationModelInheritanceAssembler.java | 2 ++
.../src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java | 2 ++
.../java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
index 98e3d25..6b59afe 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
+++ b/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
@@ -20,6 +20,7 @@ package org.apache.maven.doxia.site.decoration.inheritance;
*/
import javax.inject.Named;
+import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +41,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
*/
+@Singleton
@Named
public class DefaultDecorationModelInheritanceAssembler
implements DecorationModelInheritanceAssembler
diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index a792dd3..c51c1d7 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -21,6 +21,7 @@ package org.apache.maven.doxia.tools;
import javax.inject.Inject;
import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.File;
import java.io.IOException;
@@ -84,6 +85,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
*/
+@Singleton
@Named
public class DefaultSiteTool
implements SiteTool
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index ec39efc..768eda5 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -21,6 +21,7 @@ package org.apache.maven.doxia.siterenderer;
import javax.inject.Inject;
import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.BufferedReader;
import java.io.File;
@@ -119,6 +120,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @since 1.0
*/
+@Singleton
@Named
public class DefaultSiteRenderer
implements Renderer