You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/11/06 11:18:15 UTC
[maven] 03/03: [MNG-6799] deprecate StringSearchModelInterpolator
and remove @Named
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 16961b32b7dccbc9447ed4e18b4e0949d5fe3b56
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Nov 6 12:13:29 2019 +0100
[MNG-6799] deprecate StringSearchModelInterpolator and remove @Named
---
.../maven/model/interpolation/StringSearchModelInterpolator.java | 7 ++-----
.../maven/model/interpolation/StringVisitorModelInterpolator.java | 2 ++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index c5cd1d2..9b67a34 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -46,14 +46,11 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
/**
* StringSearchModelInterpolator
+ * @deprecated replaced by StringVisitorModelInterpolator (MNG-6697)
*/
-@Named
-@Singleton
+@Deprecated
public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
index 0ae5bce..02c7c88 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
@@ -80,6 +80,8 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* StringVisitorModelInterpolator
+ *
+ * @since 3.6.2
*/
@Named
@Singleton