From 3a80ae08aac785deb61e417f82560cb06209d5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>
Date: Wed, 6 Nov 2019 12:13:29 +0100
Subject: [PATCH] [MNG-6799] deprecate StringSearchModelInterpolator and remove
 @Named

---
 .../model/interpolation/StringSearchModelInterpolator.java | 7 ++-----
 .../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 c5cd1d2fcb..9b67a34e4a 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.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 0ae5bcefb3..02c7c889c5 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 @@
 
 /**
  * StringVisitorModelInterpolator
+ * 
+ * @since 3.6.2
  */
 @Named
 @Singleton