diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java index b3b838a901d7..c5f6b660b79b 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java @@ -46,6 +46,8 @@ import org.apache.maven.model.building.DefaultModelBuilder; import org.apache.maven.model.building.ModelBuilder; import org.apache.maven.model.building.ModelProblem; import org.apache.maven.model.interpolation.ModelInterpolator; +import org.apache.maven.model.interpolation.StringSearchModelInterpolator; +import org.apache.maven.model.path.UrlNormalizer; import org.apache.maven.model.profile.DefaultProfileInjector; import org.apache.maven.model.validation.ModelValidator; import org.apache.maven.plugin.LegacySupport; @@ -529,6 +531,10 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { myContainer.addComponent(getComponent(RepositoryMetadataManager.class, "ide"), RepositoryMetadataManager.class.getName()); myContainer.addComponent(getComponent(PluginDescriptorCache.class, "ide"), PluginDescriptorCache.class.getName()); ModelInterpolator modelInterpolator = getComponent(ModelInterpolator.class, "ide"); + if (!"3.0.5".equals(getMavenVersion()) && modelInterpolator instanceof StringSearchModelInterpolator) { + ((StringSearchModelInterpolator)modelInterpolator).setPathTranslator(getComponent(org.apache.maven.model.path.PathTranslator.class)); + ((StringSearchModelInterpolator)modelInterpolator).setUrlNormalizer(getComponent(UrlNormalizer.class)); + } myContainer.addComponent(modelInterpolator, ModelInterpolator.class.getName()); myContainer.addComponent(getComponent(org.apache.maven.project.interpolation.ModelInterpolator.class, "ide"), org.apache.maven.project.interpolation.ModelInterpolator.ROLE);