update : When rewriting POM, versions of dependencies overrided are resolved.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@294932 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
a7fad00f29
commit
7b9c0f5171
2 files changed
+15
-11
No files matched your search
@@ -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 );
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
<body>
|
||||
<release version="1.7-SNAPSHOT" date="in SVN">
|
||||
<action dev="brett" type="fix" issue="MPARTIFACT-58">Correct handling of directory without a leading /</action>
|
||||
<action dev="aheritier" type="add">New tag artifact:rewritePOM : Rewrite a full model. Inheritence and expression are resolved.</action>
|
||||
<action dev="aheritier" type="update">When rewriting POM, versions of dependencies overrided are resolved.</action>
|
||||
<action dev="aheritier" type="add">New tag artifact:rewritePOM to Rewrite a full model. Inheritence,expression, and versions of dependencies overrided are resolved.</action>
|
||||
</release>
|
||||
<release version="1.6" date="2005-07-30">
|
||||
<action dev="brett" type="fix" issue="MPARTIFACT-55">Correct basedir for file:// URLs</action>
|
||||
|
||||
Reference in new issue
Block a user