From 4344a147a439f309c2ab19c01c460e4401cb5654 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 11 Oct 2009 17:30:24 +0000 Subject: [PATCH] o Simplified code (the only two entries in the container context, the container itself and its core realm, don't apply to filtering) git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824114 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/internal/DefaultMavenPluginManager.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 798a8bc182..20fdd4a45c 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -20,11 +20,11 @@ package org.apache.maven.plugin.internal; */ import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.Reader; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Arrays; @@ -89,10 +89,8 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.InterpolationFilterReader; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.xml.XmlStreamReader; import org.codehaus.plexus.util.xml.Xpp3Dom; /** @@ -259,12 +257,9 @@ public class DefaultMavenPluginManager { try { - XmlStreamReader reader = ReaderFactory.newXmlReader( is ); + Reader reader = ReaderFactory.newXmlReader( is ); - InterpolationFilterReader interpolationFilterReader = - new InterpolationFilterReader( new BufferedReader( reader ), container.getContext().getContextData() ); - - PluginDescriptor pluginDescriptor = builder.build( interpolationFilterReader ); + PluginDescriptor pluginDescriptor = builder.build( reader ); return pluginDescriptor; }