maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1742719 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Date Sat, 07 May 2016 15:01:51 GMT
Author: rfscholte
Date: Sat May  7 15:01:51 2016
New Revision: 1742719

URL: http://svn.apache.org/viewvc?rev=1742719&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Rewrite plugin dependencies based on Model

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1742719&r1=1742718&r2=1742719&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Sat May  7 15:01:51 2016
@@ -39,6 +39,7 @@ import org.apache.maven.artifact.Artifac
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.ModelBase;
+import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Scm;
 import org.apache.maven.project.MavenProject;
@@ -347,6 +348,13 @@ public abstract class AbstractRewritePom
             rewriteArtifactVersions( toMavenCoordinates( buildTarget.getPlugins() ), mappedVersions,
                                      resolvedSnapshotDependencies, originalVersions, model,
properties, result,
                                      releaseDescriptor );
+            
+            for ( Plugin plugin : buildTarget.getPlugins() )
+            {
+                rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ),
+                                         mappedVersions, resolvedSnapshotDependencies, originalVersions,
model,
+                                         properties, result, releaseDescriptor );
+            }
         }
         
         for ( Profile profile : modelTarget.getProfiles() )
@@ -356,6 +364,13 @@ public abstract class AbstractRewritePom
                 rewriteArtifactVersions( toMavenCoordinates( profile.getBuild().getPlugins()
), mappedVersions,
                                          resolvedSnapshotDependencies, originalVersions,
model, properties, result,
                                          releaseDescriptor );
+                
+                for ( Plugin plugin : profile.getBuild().getPlugins() )
+                {
+                    rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies()
),
+                                             mappedVersions, resolvedSnapshotDependencies,
originalVersions, model,
+                                             properties, result, releaseDescriptor );
+                }
             }
         }
         



Mime
View raw message