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/07 12:04:02 UTC
svn commit: r1742702 - in
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release:
phase/AbstractRewritePomsPhase.java transform/MavenCoordinate.java
transform/jdom/JDomMavenCoordinate.java
Author: rfscholte
Date: Sat May 7 12:04:02 2016
New Revision: 1742702
URL: http://svn.apache.org/viewvc?rev=1742702&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Pull up usage MavenCoordinate
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/transform/MavenCoordinate.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.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=1742702&r1=1742701&r2=1742702&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 12:04:02 2016
@@ -311,7 +311,6 @@ public abstract class AbstractRewritePom
ReleaseResult result, boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
- Namespace namespace = rootElement.getNamespace();
Map<String, String> mappedVersions = getNextVersionMap( releaseDescriptor );
Map<String, String> originalVersions = getOriginalVersionMap( releaseDescriptor, reactorProjects, simulate );
@SuppressWarnings( "unchecked" )
@@ -334,33 +333,39 @@ public abstract class AbstractRewritePom
for ( Element root : roots )
{
- rewriteArtifactVersions( getChildren( root, "dependencies", "dependency" ), mappedVersions,
+ rewriteArtifactVersions( getMavenCoordinates( root, "dependencies", "dependency" ), mappedVersions,
resolvedSnapshotDependencies, originalVersions, model, properties, result,
releaseDescriptor );
- rewriteArtifactVersions( getChildren( root, "dependencyManagement", "dependencies", "dependency" ),
+ rewriteArtifactVersions( getMavenCoordinates( root, "dependencyManagement", "dependencies", "dependency" ),
mappedVersions, resolvedSnapshotDependencies, originalVersions, model, properties,
result, releaseDescriptor );
- rewriteArtifactVersions( getChildren( root, "build", "extensions", "extension" ), mappedVersions,
+ rewriteArtifactVersions( getMavenCoordinates( root, "build", "extensions", "extension" ), mappedVersions,
resolvedSnapshotDependencies, originalVersions, model, properties, result,
releaseDescriptor );
List<Element> pluginElements = new ArrayList<Element>();
pluginElements.addAll( getChildren( root, "build", "plugins", "plugin" ) );
pluginElements.addAll( getChildren( root, "build", "pluginManagement", "plugins", "plugin" ) );
+
+ List<MavenCoordinate> pluginCoordinates = new ArrayList<MavenCoordinate>( pluginElements.size() );
+ for ( Element pluginElement : pluginElements )
+ {
+ pluginCoordinates.add( new JDomMavenCoordinate( pluginElement ) );
+ }
- rewriteArtifactVersions( pluginElements, mappedVersions, resolvedSnapshotDependencies, originalVersions,
+ rewriteArtifactVersions( pluginCoordinates, mappedVersions, resolvedSnapshotDependencies, originalVersions,
model, properties, result, releaseDescriptor );
for ( Element pluginElement : pluginElements )
{
- rewriteArtifactVersions( getChildren( pluginElement, "dependencies", "dependency" ), mappedVersions,
- resolvedSnapshotDependencies, originalVersions, model, properties, result,
- releaseDescriptor );
+ rewriteArtifactVersions( getMavenCoordinates( pluginElement, "dependencies", "dependency" ),
+ mappedVersions, resolvedSnapshotDependencies, originalVersions, model,
+ properties, result, releaseDescriptor );
}
- rewriteArtifactVersions( getChildren( root, "reporting", "plugins", "plugin" ), mappedVersions,
+ rewriteArtifactVersions( getMavenCoordinates( root, "reporting", "plugins", "plugin" ), mappedVersions,
resolvedSnapshotDependencies, originalVersions, model, properties, result,
releaseDescriptor );
}
@@ -394,7 +399,18 @@ public abstract class AbstractRewritePom
}
return parent.getChildren( names[names.length - 1], parent.getNamespace() );
}
-
+
+ private List<MavenCoordinate> getMavenCoordinates( Element root, String... names )
+ {
+ List<Element> children = getChildren( root, names );
+
+ List<MavenCoordinate> coordinates = new ArrayList<MavenCoordinate>( children.size() );
+ for ( Element child : children )
+ {
+ coordinates.add( new JDomMavenCoordinate( child ) );
+ }
+ return coordinates;
+ }
private void rewriteVersion( Model modelTarget, Map<String, String> mappedVersions, String projectId,
MavenProject project, String parentVersion )
@@ -440,7 +456,7 @@ public abstract class AbstractRewritePom
return parentVersion;
}
- private void rewriteArtifactVersions( Collection<Element> elements, Map<String, String> mappedVersions,
+ private void rewriteArtifactVersions( Collection<MavenCoordinate> elements, Map<String, String> mappedVersions,
Map<String, Map<String, String>> resolvedSnapshotDependencies,
Map<String, String> originalVersions, Model projectModel,
Properties properties, ReleaseResult result,
@@ -452,10 +468,8 @@ public abstract class AbstractRewritePom
return;
}
String projectId = ArtifactUtils.versionlessKey( projectModel.getGroupId(), projectModel.getArtifactId() );
- for ( Element element : elements )
+ for ( MavenCoordinate coordinate : elements )
{
- MavenCoordinate coordinate = new JDomMavenCoordinate( element );
-
String rawVersion = coordinate.getVersion();
if ( rawVersion == null )
{
@@ -466,7 +480,7 @@ public abstract class AbstractRewritePom
String rawGroupId = coordinate.getGroupId();
if ( rawGroupId == null )
{
- if ( "plugin".equals( element.getName() ) )
+ if ( "plugin".equals( coordinate.getName() ) )
{
rawGroupId = "org.apache.maven.plugins";
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java?rev=1742702&r1=1742701&r2=1742702&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java Sat May 7 12:04:02 2016
@@ -33,4 +33,7 @@ public interface MavenCoordinate
String getVersion();
void setVersion( String version );
+
+ // @todo helper method during refactoring, will be removed
+ String getName();
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java?rev=1742702&r1=1742701&r2=1742702&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java Sat May 7 12:04:02 2016
@@ -73,4 +73,10 @@ public class JDomMavenCoordinate impleme
{
JDomUtils.rewriteValue( getVersionElement(), version );
}
+
+ @Override
+ public String getName()
+ {
+ return element.getName();
+ }
}