Author: jvanzyl
Date: Sun May 22 05:42:01 2005
New Revision: 171307
URL: http://svn.apache.org/viewcvs?rev=171307&view=rev
Log:
o adding some more debug info to try and find the problem with a POM
transformation
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/VersionTransformer.java
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=171307&r1=171306&r2=171307&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
Sun May 22 05:42:01 2005
@@ -61,27 +61,38 @@
Element project = (Element) node;
Node version = node.selectSingleNode( "version" );
+
if ( version != null )
{
+ System.out.println( ">> We have a version element and we are
changing it to " + getUpdatedModel().getVersion() );
+
version.setText( getUpdatedModel().getVersion() );
}
else
{
+ System.out.println( ">> We are adding a version element and we
are setting it to " + getUpdatedModel().getVersion() );
+
project.addElement( "version" ).addText(
getUpdatedModel().getVersion() );
}
}
else if ( selectDependenciesNodesXPathExpression().equals(
node.getPath() ) )
{
Element dependency = (Element) node;
+
Node groupId = node.selectSingleNode( "groupId" );
+
Node artifactId = node.selectSingleNode( "artifactId" );
+
Node type = node.selectSingleNode( "type" );
+
String typeText = "jar";
+
if ( type != null )
{
typeText = type.getText();
}
Node version = node.selectSingleNode( "version" );
+
if ( version != null )
{
version.setText( getDependency( groupId.getText(),
artifactId.getText(), typeText ).getVersion() );
@@ -95,15 +106,22 @@
else
{
Element plugin = (Element) node;
+
Node groupId = node.selectSingleNode( "groupId" );
+
String groupIdText = "org.apache.maven.plugins";
+
if ( groupId != null )
{
groupIdText = groupId.getText();
}
+
Node artifactId = node.selectSingleNode( "artifactId" );
+
Node version = node.selectSingleNode( "version" );
+
Plugin p = getPlugin( groupIdText, artifactId.getText() );
+
if ( groupId != null )
{
groupId.setText( p.getGroupId() );
@@ -128,6 +146,7 @@
for ( Iterator i = getUpdatedModel().getDependencies().iterator();
i.hasNext(); )
{
Dependency dependency = (Dependency) i.next();
+
if ( dependency.getGroupId().equals( groupId ) &&
dependency.getArtifactId().equals( artifactId )
&& dependency.getType().equals( type ) )
{
@@ -143,6 +162,7 @@
for ( Iterator i =
getUpdatedModel().getBuild().getPlugins().iterator(); i.hasNext(); )
{
Plugin plugin = (Plugin) i.next();
+
if ( plugin.getGroupId().equals( groupId ) &&
plugin.getArtifactId().equals( artifactId ) )
{
return plugin;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
