You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/19 03:12:29 UTC
svn commit: r219588 - in /maven/components/trunk:
maven-artifact/src/main/java/org/apache/maven/artifact/
maven-artifact/src/main/java/org/apache/maven/artifact/factory/
maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/
Author: brett
Date: Mon Jul 18 18:11:17 2005
New Revision: 219588
URL: http://svn.apache.org/viewcvs?rev=219588&view=rev
Log:
cleanup, reformat
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/VersionTransformer.java
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=219588&r1=219587&r2=219588&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Mon Jul 18 18:11:17 2005
@@ -39,9 +39,16 @@
private final String artifactId;
+ /**
+ * The resolved version for the artifact after conflict resolution and all transformations.
+ */
private String version;
- // TODO: should be final
+ /**
+ * The resolved version for the artifact after conflict resolution, that has not been transformed.
+ *
+ * @todo should be final
+ */
private String baseVersion;
private final String type;
@@ -72,6 +79,7 @@
this.artifactId = artifactId;
+ // TODO: this would be where we might have a min/max instead
this.version = version;
this.artifactHandler = artifactHandler;
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=219588&r1=219587&r2=219588&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Mon Jul 18 18:11:17 2005
@@ -86,9 +86,7 @@
}
ArtifactHandler handler = artifactHandlerManager.getArtifactHandler( type );
- DefaultArtifact artifact = new DefaultArtifact( groupId, artifactId, version, desiredScope, type, classifier,
- handler );
- return artifact;
+ return new DefaultArtifact( groupId, artifactId, version, desiredScope, type, classifier, handler );
}
}
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/VersionTransformer.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/VersionTransformer.java?rev=219588&r1=219587&r2=219588&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/VersionTransformer.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/VersionTransformer.java Mon Jul 18 18:11:17 2005
@@ -16,18 +16,15 @@
* limitations under the License.
*/
-import java.util.Iterator;
-
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.dom4j.Element;
import org.dom4j.Node;
+import java.util.Iterator;
+
/**
- *
- *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- *
* @version $Id: VersionTransformer.java 115421 2004-06-01 02:20:18Z dion $
*/
public class VersionTransformer
@@ -94,14 +91,14 @@
}
Node version = node.selectSingleNode( "version" );
+ String versionText = getDependency( groupId.getText(), artifactId.getText(), typeText ).getVersion();
if ( version != null )
{
- version.setText( getDependency( groupId.getText(), artifactId.getText(), typeText ).getVersion() );
+ version.setText( versionText );
}
else
{
- dependency.addElement( "version" ).addText( getDependency( groupId.getText(), artifactId.getText(),
- type.getText() ).getVersion() );
+ dependency.addElement( "version" ).addText( versionText );
}
}
else if ( selectPluginsNodesXPathExpression().equals( node.getPath() ) )
@@ -147,9 +144,9 @@
{
// Modify scm tag
Element scm = (Element) node;
-
+
Node tag = node.selectSingleNode( "tag" );
-
+
if ( tag == null )
{
if ( !"HEAD".equals( getUpdatedModel().getScm().getTag() ) )
@@ -161,10 +158,10 @@
{
tag.setText( getUpdatedModel().getScm().getTag() );
}
-
+
// Modify scmConnections
Node connection = node.selectSingleNode( "connection" );
-
+
if ( connection != null )
{
if ( !connection.getText().equals( getUpdatedModel().getScm().getConnection() ) )
@@ -172,9 +169,9 @@
connection.setText( getUpdatedModel().getScm().getConnection() );
}
}
-
+
Node developerConnection = node.selectSingleNode( "developerConnection" );
-
+
if ( developerConnection != null )
{
if ( !developerConnection.getText().equals( getUpdatedModel().getScm().getDeveloperConnection() ) )
@@ -192,8 +189,8 @@
{
Dependency dependency = (Dependency) i.next();
- if ( dependency.getGroupId().equals( groupId ) && dependency.getArtifactId().equals( artifactId )
- && dependency.getType().equals( type ) )
+ if ( dependency.getGroupId().equals( groupId ) && dependency.getArtifactId().equals( artifactId ) &&
+ dependency.getType().equals( type ) )
{
return dependency;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org