Author: rfscholte
Date: Sat May 7 15:45:14 2016
New Revision: 1742722
URL: http://svn.apache.org/viewvc?rev=1742722&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
polish code
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=1742722&r1=1742721&r2=1742722&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:45:14 2016
@@ -278,7 +278,7 @@ public abstract class AbstractRewritePom
}
}
- transformDocument( project, document.getRootElement(),
releaseDescriptor, reactorProjects, scmRepository,
+ transformDocument( project, new JDomModel( document ),
releaseDescriptor, reactorProjects, scmRepository,
result, simulate );
File pomFile = ReleaseUtil.getStandardPom( project );
@@ -309,7 +309,7 @@ public abstract class AbstractRewritePom
}
}
- private void transformDocument( MavenProject project, Element rootElement,
ReleaseDescriptor releaseDescriptor,
+ private void transformDocument( MavenProject project, Model modelTarget,
ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects,
ScmRepository scmRepository,
ReleaseResult result, boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
@@ -321,8 +321,6 @@ public abstract class AbstractRewritePom
releaseDescriptor.getResolvedSnapshotDependencies();
Model model = project.getModel();
- JDomModel modelTarget = new JDomModel( rootElement );
-
Properties properties = modelTarget.getProperties();
String parentVersion = rewriteParent( project, modelTarget,
mappedVersions,