Author: rfscholte
Date: Sat May 7 15:20:44 2016
New Revision: 1742720
URL: http://svn.apache.org/viewvc?rev=1742720&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Rewrite pluginManagement plugins and their dependencies based on Model
Added:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
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/jdom/JDomBuild.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=1742720&r1=1742719&r2=1742720&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:20:44 2016
@@ -37,6 +37,7 @@ import java.util.regex.Pattern;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Build;
+import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBase;
import org.apache.maven.model.Plugin;
@@ -355,22 +356,51 @@ public abstract class AbstractRewritePom
mappedVersions,
resolvedSnapshotDependencies, originalVersions, model,
properties, result, releaseDescriptor
);
}
+
+ if ( buildTarget.getPluginManagement() != null )
+ {
+ rewriteArtifactVersions( toMavenCoordinates(
buildTarget.getPluginManagement().getPlugins() ),
+ mappedVersions,
resolvedSnapshotDependencies, originalVersions, model,
+ properties, result, releaseDescriptor
);
+
+ for ( Plugin plugin :
buildTarget.getPluginManagement().getPlugins() )
+ {
+ rewriteArtifactVersions( toMavenCoordinates(
plugin.getDependencies() ), mappedVersions,
+ resolvedSnapshotDependencies,
originalVersions, model, properties,
+ result, releaseDescriptor );
+ }
+ }
}
for ( Profile profile : modelTarget.getProfiles() )
{
- if ( profile.getBuild() != null )
+ BuildBase profileBuild = profile.getBuild();
+ if ( profileBuild != null )
{
- rewriteArtifactVersions( toMavenCoordinates(
profile.getBuild().getPlugins() ), mappedVersions,
+ rewriteArtifactVersions( toMavenCoordinates(
profileBuild.getPlugins() ), mappedVersions,
resolvedSnapshotDependencies,
originalVersions, model, properties, result,
releaseDescriptor );
- for ( Plugin plugin : profile.getBuild().getPlugins() )
+ for ( Plugin plugin : profileBuild.getPlugins() )
{
rewriteArtifactVersions( toMavenCoordinates(
plugin.getDependencies() ),
mappedVersions,
resolvedSnapshotDependencies, originalVersions, model,
properties, result,
releaseDescriptor );
}
+
+ if ( profileBuild.getPluginManagement() != null )
+ {
+ rewriteArtifactVersions( toMavenCoordinates(
profileBuild.getPluginManagement().getPlugins() ),
+ mappedVersions,
resolvedSnapshotDependencies, originalVersions, model,
+ properties, result,
releaseDescriptor );
+
+ for ( Plugin plugin :
profileBuild.getPluginManagement().getPlugins() )
+ {
+ rewriteArtifactVersions( toMavenCoordinates(
plugin.getDependencies() ), mappedVersions,
+ resolvedSnapshotDependencies,
originalVersions, model, properties,
+ result, releaseDescriptor );
+ }
+ }
}
}
@@ -383,38 +413,17 @@ public abstract class AbstractRewritePom
rewriteArtifactVersions( toMavenCoordinates(
modelBase.getDependencies() ), mappedVersions,
resolvedSnapshotDependencies,
originalVersions, model, properties, result,
releaseDescriptor );
+
if ( modelBase.getDependencyManagement() != null )
{
rewriteArtifactVersions( toMavenCoordinates(
modelBase.getDependencyManagement().getDependencies() ),
mappedVersions,
resolvedSnapshotDependencies, originalVersions, model,
properties, result, releaseDescriptor
);
}
-
}
for ( Element root : roots )
{
- List<Element> pluginElements = new ArrayList<Element>();
- 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
) );
- }
-
- pluginElements.addAll( getChildren( root, "build", "plugins",
"plugin" ) );
-
- rewriteArtifactVersions( pluginCoordinates, mappedVersions,
resolvedSnapshotDependencies, originalVersions,
- model, properties, result,
releaseDescriptor );
-
- for ( Element pluginElement : pluginElements )
- {
- rewriteArtifactVersions( getMavenCoordinates( pluginElement,
"dependencies", "dependency" ),
- mappedVersions,
resolvedSnapshotDependencies, originalVersions, model,
- properties, result, releaseDescriptor
);
- }
-
rewriteArtifactVersions( getMavenCoordinates( root, "reporting",
"plugins", "plugin" ), mappedVersions,
resolvedSnapshotDependencies,
originalVersions, model, properties, result,
releaseDescriptor );
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java?rev=1742720&r1=1742719&r2=1742720&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
Sat May 7 15:20:44 2016
@@ -256,7 +256,15 @@ public class JDomBuild
@Override
public PluginManagement getPluginManagement()
{
- throw new UnsupportedOperationException();
+ Element pluginManagementElm = build.getChild( "pluginManagement",
build.getNamespace() );
+ if ( pluginManagementElm == null )
+ {
+ return null;
+ }
+ else
+ {
+ return new JDomPluginManagement( pluginManagementElm );
+ }
}
@Override
Added:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java?rev=1742720&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
(added)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
Sat May 7 15:20:44 2016
@@ -0,0 +1,98 @@
+package org.apache.maven.shared.release.transform.jdom;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginManagement;
+import org.jdom.Element;
+
+/**
+ * JDom implementation of poms PLUGINMANAGEMENT element
+ *
+ * @author Robert Scholte
+ * @since 3.0
+ */
+public class JDomPluginManagement extends PluginManagement
+{
+ private final Element pluginManagement;
+
+ public JDomPluginManagement( Element pluginManagement )
+ {
+ this.pluginManagement = pluginManagement;
+ }
+
+ @Override
+ public void addPlugin( Plugin plugin )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public List<Plugin> getPlugins()
+ {
+ Element pluginsElm = pluginManagement.getChild( "plugins",
pluginManagement.getNamespace() );
+ if ( pluginsElm == null )
+ {
+ return Collections.emptyList();
+ }
+ else
+ {
+ List<Element> pluginElms = pluginsElm.getChildren( "plugin",
pluginManagement.getNamespace() );
+
+ List<Plugin> plugins = new ArrayList<Plugin>( pluginElms.size() );
+
+ for ( Element pluginElm : pluginElms )
+ {
+ plugins.add( new JDomPlugin( pluginElm ) );
+ }
+
+ return plugins;
+ }
+ }
+
+ @Override
+ public void removePlugin( Plugin plugin )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setPlugins( List<Plugin> plugins )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void flushPluginMap()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Map getPluginsAsMap()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
