diff --git a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java index c0ece80b..21f44ebe 100644 --- a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java +++ b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java @@ -16,6 +16,15 @@ package org.apache.maven.artifact; * limitations under the License. */ +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import org.apache.commons.jelly.JellyContext; import org.apache.maven.MavenException; import org.apache.maven.MavenUtils; @@ -27,15 +36,6 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.project.Project; import org.codehaus.plexus.util.IOUtil; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.StringReader; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - /** * Rewrite a full model for publishing. Inheritence and expression will have been resolved. * @@ -88,7 +88,10 @@ public class PomRewriter m.setAccessible( true ); p = (Project) m.invoke( null, new Object[]{p} ); m.setAccessible( false ); - + // The rewrittenPOM must redefine dependencies versions + // if override properties are used + p.buildArtifactList(); + // now sanitize p.setContext( null ); p.setParent( null ); diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index 6264990a..5e6c37dd 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -26,7 +26,8 @@ Correct handling of directory without a leading / - New tag artifact:rewritePOM : Rewrite a full model. Inheritence and expression are resolved. + When rewriting POM, versions of dependencies overrided are resolved. + New tag artifact:rewritePOM to Rewrite a full model. Inheritence,expression, and versions of dependencies overrided are resolved. Correct basedir for file:// URLs