diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java b/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java index c75f669538..3d41ca4555 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java @@ -26,10 +26,6 @@ import org.apache.maven.model.Model; public interface Processor { void process( Object parent, Object child, Object target, boolean isChildMostSpecialized ); - - Object getParent(); - - Object getChild(); List getParentModels(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java index e3822fec75..46b1ee648a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java @@ -48,7 +48,7 @@ public class DefaultInterpolator if(properties == null) { - return model; + properties = new Properties(); } List interpolatorProperties = new ArrayList(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java index 1ceba9f289..e7cc8c9706 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java @@ -35,10 +35,6 @@ import org.apache.maven.model.Processor; public abstract class BaseProcessor implements Processor { - Object parent; - - Object child; - Collection processors; private List parentModels; @@ -75,8 +71,6 @@ public abstract class BaseProcessor implements Processor throw new IllegalArgumentException( "target: null" ); } - this.parent = parent; - this.child = child; if(parent instanceof Model) { parentModels.add( (Model) parent ); @@ -85,19 +79,8 @@ public abstract class BaseProcessor implements Processor { processor.process( parent, child, target, isChildMostSpecialized ); } - } - - public Object getChild() - { - return child; - } - - public Object getParent() - { - return parent; - } - + protected String normalizeUriWithRelativePath(String u, String artifactId, Model parent) { if(u == null)