Author: aheritier
Date: Tue Oct 4 15:12:57 2005
New Revision: 294932
URL: http://svn.apache.org/viewcvs?rev=294932&view=rev
Log:
update : When rewriting POM, versions of dependencies overrided are resolved.
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java?rev=294932&r1=294931&r2=294932&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
(original)
+++
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
Tue Oct 4 15:12:57 2005
@@ -16,6 +16,15 @@
* 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.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 @@
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 );
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?rev=294932&r1=294931&r2=294932&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Tue Oct 4 15:12:57
2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
