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 14:13:27 UTC
svn commit: r1742715 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
main/java/org/apache/maven/shared/release/transform/jdom/
test/java/org/apache/maven/shared/release/transform/jdom/
Author: rfscholte
Date: Sat May 7 14:13:27 2016
New Revision: 1742715
URL: http://svn.apache.org/viewvc?rev=1742715&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Rewrite direct dependencies based on Model
Added:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.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=1742715&r1=1742714&r2=1742715&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:13:27 2016
@@ -345,13 +345,16 @@ public abstract class AbstractRewritePom
List<ModelBase> modelBases = new ArrayList<ModelBase>();
modelBases.add( modelTarget );
modelBases.addAll( modelTarget.getProfiles() );
+
+ for ( ModelBase modelBase : modelBases )
+ {
+ rewriteArtifactVersions( toMavenCoordinates( modelBase.getDependencies() ), mappedVersions,
+ resolvedSnapshotDependencies, originalVersions, model, properties, result,
+ releaseDescriptor );
+ }
for ( Element root : roots )
{
- rewriteArtifactVersions( getMavenCoordinates( root, "dependencies", "dependency" ), mappedVersions,
- resolvedSnapshotDependencies, originalVersions, model, properties, result,
- releaseDescriptor );
-
rewriteArtifactVersions( getMavenCoordinates( root, "dependencyManagement", "dependencies", "dependency" ),
mappedVersions, resolvedSnapshotDependencies, originalVersions, model, properties,
result, releaseDescriptor );
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=1742715&r1=1742714&r2=1742715&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:13:27 2016
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Profile;
@@ -63,6 +64,12 @@ public class JDomModel extends Model
}
@Override
+ public List<Dependency> getDependencies()
+ {
+ return modelBase.getDependencies();
+ }
+
+ @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=1742715&r1=1742714&r2=1742715&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:13:27 2016
@@ -19,7 +19,12 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
import org.jdom.Element;
/**
@@ -49,4 +54,26 @@ public class JDomModelBase
return new JDomBuild( elm );
}
}
+
+ public List<Dependency> getDependencies()
+ {
+ Element dependenciesElm = modelBase.getChild( "dependencies", modelBase.getNamespace() );
+ if ( dependenciesElm == null )
+ {
+ return Collections.emptyList();
+ }
+ else
+ {
+ List<Element> dependencyElms = dependenciesElm.getChildren( "dependency", modelBase.getNamespace() );
+
+ List<Dependency> dependencies = new ArrayList<Dependency>( dependencyElms.size() );
+
+ for ( Element dependencyElm : dependencyElms )
+ {
+ dependencies.add( new JDomDependency( dependencyElm ) );
+ }
+
+ return dependencies;
+ }
+ }
}
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=1742715&r1=1742714&r2=1742715&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:13:27 2016
@@ -19,7 +19,10 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.model.BuildBase;
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Profile;
import org.jdom.Element;
@@ -44,4 +47,10 @@ public class JDomProfile
{
return modelBase.getBuild();
}
+
+ @Override
+ public List<Dependency> getDependencies()
+ {
+ return modelBase.getDependencies();
+ }
}
Added: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java?rev=1742715&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java (added)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java Sat May 7 14:13:27 2016
@@ -0,0 +1,186 @@
+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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.StringReader;
+
+import org.jdom.Element;
+import org.jdom.input.SAXBuilder;
+import org.junit.Test;
+
+public class JDomDependencyTest
+{
+ private SAXBuilder builder = new SAXBuilder();
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testIsOptional()
+ {
+ new JDomDependency( null ).isOptional();
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetOptional()
+ {
+ new JDomDependency( null ).setOptional( true );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testAddExclusion()
+ {
+ new JDomDependency( null ).addExclusion( null );
+ }
+
+ @Test
+ public void testGetArtifactId() throws Exception
+ {
+ String content = "<dependency></dependency>";
+ Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ assertNull( new JDomDependency( dependencyElm ).getArtifactId() );
+
+ content = "<dependency><artifactId>ARTIFACTID</artifactId></dependency>";
+ dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ assertEquals( "ARTIFACTID", new JDomDependency( dependencyElm ).getArtifactId() );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testGetClassifier()
+ {
+ new JDomDependency( null ).getClassifier();
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testGetExclusions()
+ {
+ new JDomDependency( null ).getExclusions();
+ }
+
+ @Test
+ public void testGetGroupId() throws Exception
+ {
+ String content = "<dependency></dependency>";
+ Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ assertNull( new JDomDependency( dependencyElm ).getGroupId() );
+
+ content = "<dependency><groupId>GROUPID</groupId></dependency>";
+ dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ assertEquals( "GROUPID", new JDomDependency( dependencyElm ).getGroupId() );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testGetScope()
+ {
+ new JDomDependency( null ).getScope();
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testGetSystemPath()
+ {
+ new JDomDependency( null ).getSystemPath();
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testGetType()
+ {
+ new JDomDependency( null ).getType();
+ }
+
+ @Test
+ public void testGetVersion() throws Exception
+ {
+ String content = "<dependency></dependency>";
+ Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ assertNull( new JDomDependency( dependencyElm ).getVersion() );
+
+ content = "<dependency><version>VERSION</version></dependency>";
+ dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ assertEquals( "VERSION", new JDomDependency( dependencyElm ).getVersion() );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testRemoveExclusion()
+ {
+ new JDomDependency( null ).removeExclusion( null );;
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetArtifactIdString()
+ {
+ new JDomDependency( null ).setArtifactId( null );;
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetClassifierString()
+ {
+ new JDomDependency( null ).setClassifier( null );;
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetExclusions()
+ {
+ new JDomDependency( null ).setExclusions( null );;
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetGroupIdString()
+ {
+ new JDomDependency( null ).setGroupId( null );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetScopeString()
+ {
+ new JDomDependency( null ).setScope( null );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetSystemPathString()
+ {
+ new JDomDependency( null ).setSystemPath( null );
+ }
+
+ @Test( expected = UnsupportedOperationException.class )
+ public void testSetTypeString()
+ {
+ new JDomDependency( null ).setType( null );
+ }
+
+ @Test
+ public void testSetVersionString() throws Exception
+ {
+ String content = "<dependency><version>OLD_VERSION</version></dependency>";
+ Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
+ new JDomDependency( dependencyElm ).setVersion( "NEW_VERSION" );
+ assertEquals( "NEW_VERSION", getVersion( dependencyElm ) );
+ }
+
+ @Test
+ public void testGetName()
+ {
+ assertEquals( "dependency", new JDomDependency( null ).getName() );
+ }
+
+ private String getVersion( Element dependencyElm )
+ {
+ return dependencyElm.getChildTextTrim( "version", dependencyElm.getNamespace() );
+ }
+}