Author: rfscholte
Date: Sat May 7 14:26:48 2016
New Revision: 1742716
URL: http://svn.apache.org/viewvc?rev=1742716&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Rewrite dependecyManagement.dependencies based on Model
Added:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.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/JDomModel.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.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=1742716&r1=1742715&r2=1742716&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 14:26:48 2016
@@ -351,13 +351,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 )
{
- rewriteArtifactVersions( getMavenCoordinates( root,
"dependencyManagement", "dependencies", "dependency" ),
- mappedVersions,
resolvedSnapshotDependencies, originalVersions, model, properties,
- result, releaseDescriptor );
+
List<Element> pluginElements = new ArrayList<Element>();
pluginElements.addAll( getChildren( root, "build", "plugins",
"plugin" ) );
Added:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java?rev=1742716&view=auto
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
(added)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
Sat May 7 14:26:48 2016
@@ -0,0 +1,87 @@
+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 org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.jdom.Element;
+
+/**
+ * JDom implementation of poms DEPENDENCYMANAGEMENT element
+ *
+ * @author Robert Scholte
+ * @since 3.0
+ */
+public class JDomDependencyManagement extends DependencyManagement
+{
+ private final Element dependencyManagement;
+
+ public JDomDependencyManagement( Element dependencyManagement )
+ {
+ this.dependencyManagement = dependencyManagement;
+ }
+
+ @Override
+ public void addDependency( Dependency dependency )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public List<Dependency> getDependencies()
+ {
+ Element dependenciesElm = dependencyManagement.getChild(
"dependencies", dependencyManagement.getNamespace() );
+ if ( dependenciesElm == null )
+ {
+ return Collections.emptyList();
+ }
+ else
+ {
+ List<Element> dependencyElms =
+ dependenciesElm.getChildren( "dependency",
dependencyManagement.getNamespace() );
+
+ List<Dependency> dependencies = new ArrayList<Dependency>(
dependencyElms.size() );
+
+ for ( Element dependencyElm : dependencyElms )
+ {
+ dependencies.add( new JDomDependency( dependencyElm ) );
+ }
+
+ return dependencies;
+ }
+ }
+
+ @Override
+ public void removeDependency( Dependency dependency )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setDependencies( List<Dependency> dependencies )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java?rev=1742716&r1=1742715&r2=1742716&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
Sat May 7 14:26:48 2016
@@ -26,6 +26,7 @@ import java.util.Properties;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Profile;
@@ -70,6 +71,12 @@ public class JDomModel extends Model
}
@Override
+ public DependencyManagement getDependencyManagement()
+ {
+ return modelBase.getDependencyManagement();
+ }
+
+ @Override
public Parent getParent()
{
Element elm = getParentElement();
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java?rev=1742716&r1=1742715&r2=1742716&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
Sat May 7 14:26:48 2016
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
import org.jdom.Element;
/**
@@ -76,4 +77,18 @@ public class JDomModelBase
return dependencies;
}
}
+
+ public DependencyManagement getDependencyManagement()
+ {
+ Element elm = modelBase.getChild( "dependencyManagement",
modelBase.getNamespace() );
+ if ( elm == null )
+ {
+ return null;
+ }
+ else
+ {
+ // this way build setters change DOM tree immediately
+ return new JDomDependencyManagement( elm );
+ }
+ }
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java?rev=1742716&r1=1742715&r2=1742716&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
Sat May 7 14:26:48 2016
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Profile;
import org.jdom.Element;
@@ -53,4 +54,10 @@ public class JDomProfile
{
return modelBase.getDependencies();
}
+
+ @Override
+ public DependencyManagement getDependencyManagement()
+ {
+ return modelBase.getDependencyManagement();
+ }
}
