You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/05/06 18:57:35 UTC
svn commit: r1742590 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Fri May 6 18:57:35 2016
New Revision: 1742590
URL: http://svn.apache.org/viewvc?rev=1742590&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Make concrete classes JDom free
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.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=1742590&r1=1742589&r2=1742590&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 Fri May 6 18:57:35 2016
@@ -55,6 +55,7 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ScmTranslator;
+import org.apache.maven.shared.release.transform.jdom.JDomModel;
import org.apache.maven.shared.release.transform.jdom.JDomUtils;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.IOUtil;
@@ -372,7 +373,8 @@ public abstract class AbstractRewritePom
throw new ReleaseExecutionException( "Exception occurred while calculating common basedir: "
+ e.getMessage(), e );
}
- transformScm( project, rootElement, namespace, releaseDescriptor, projectId, scmRepository, result,
+
+ transformScm( project, new JDomModel( rootElement ), releaseDescriptor, projectId, scmRepository, result,
commonBasedir );
}
@@ -699,9 +701,9 @@ public abstract class AbstractRewritePom
protected abstract Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor );
- protected abstract void transformScm( MavenProject project, Element rootElement, Namespace namespace,
- ReleaseDescriptor releaseDescriptor, String projectId,
- ScmRepository scmRepository, ReleaseResult result, String commonBasedir )
+ protected abstract void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
+ String projectId, ScmRepository scmRepository,
+ ReleaseResult result, String commonBasedir )
throws ReleaseExecutionException;
/**
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java?rev=1742590&r1=1742589&r2=1742590&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java Fri May 6 18:57:35 2016
@@ -22,13 +22,12 @@ package org.apache.maven.shared.release.
import java.util.List;
import java.util.Map;
+import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.jdom.Element;
-import org.jdom.Namespace;
/**
* Rewrite POMs for future development
@@ -40,9 +39,9 @@ public class RewritePomVersionsPhase
{
@Override
- protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
- ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
- ReleaseResult result, String commonBasedir )
+ protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
+ String projectId, ScmRepository scmRepository, ReleaseResult result,
+ String commonBasedir )
throws ReleaseExecutionException
{
// We are only updating versions no mods to scm needed
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java?rev=1742590&r1=1742589&r2=1742590&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java Fri May 6 18:57:35 2016
@@ -32,10 +32,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
-import org.apache.maven.shared.release.transform.jdom.JDomModel;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.jdom.Element;
-import org.jdom.Namespace;
/**
* Rewrite POMs for branch.
@@ -46,15 +43,14 @@ import org.jdom.Namespace;
public class RewritePomsForBranchPhase
extends AbstractRewritePomsPhase
{
- protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
- ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
- ReleaseResult result, String commonBasedir )
+ protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
+ String projectId, ScmRepository scmRepository, ReleaseResult result,
+ String commonBasedir )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
if ( project.getScm() != null )
{
- Model modelTarget = new JDomModel( rootElement );
Scm scmRoot = modelTarget.getScm();
if ( scmRoot != null )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java?rev=1742590&r1=1742589&r2=1742590&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java Fri May 6 18:57:35 2016
@@ -30,9 +30,6 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
-import org.apache.maven.shared.release.transform.jdom.JDomModel;
-import org.jdom.Element;
-import org.jdom.Namespace;
/**
* Rewrite POMs for future development
@@ -43,16 +40,14 @@ public class RewritePomsForDevelopmentPh
extends AbstractRewritePomsPhase
{
@Override
- protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
- ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
- ReleaseResult result, String commonBasedir )
+ protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
+ String projectId, ScmRepository scmRepository, ReleaseResult result,
+ String commonBasedir )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
if ( project.getScm() != null )
{
- Model modelTarget = new JDomModel( rootElement );
-
Scm scmRoot = modelTarget.getScm();
if ( scmRoot != null )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1742590&r1=1742589&r2=1742590&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Fri May 6 18:57:35 2016
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
@@ -31,10 +32,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
-import org.apache.maven.shared.release.transform.jdom.JDomModel;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.jdom.Element;
-import org.jdom.Namespace;
/**
* Rewrite POMs for release.
@@ -46,17 +44,15 @@ public class RewritePomsForReleasePhase
{
@Override
- protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
- ReleaseDescriptor releaseDescriptor, String projectId, ScmRepository scmRepository,
- ReleaseResult result, String commonBasedir )
+ protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
+ String projectId, ScmRepository scmRepository, ReleaseResult result,
+ String commonBasedir )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
if ( project.getScm() != null )
{
- JDomModel model = new JDomModel( rootElement );
-
- Scm scmRoot = model.getScm();
+ Scm scmRoot = modelTarget.getScm();
if ( scmRoot != null )
{
Scm scm = buildScm( project );
@@ -93,7 +89,7 @@ public class RewritePomsForReleasePhase
if ( translateScm( project, releaseDescriptor, scmTarget, scmRepository, result,
commonBasedir ) )
{
- model.setScm( scmTarget );
+ modelTarget.setScm( scmTarget );
}
}
catch ( IOException e )