Author: evenisse Date: Tue May 24 16:35:00 2005 New Revision: 178323 URL: http://svn.apache.org/viewcvs?rev=178323&view=rev Log: Rewrite scm tag part in project file in prepare release phase.
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java 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/release/PrepareReleaseMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java?rev=178323&r1=178322&r2=178323&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java Tue May 24 16:35:00 2005 @@ -67,6 +67,8 @@ private String userTag; + private String currentTag; + protected void executeTask() throws MojoExecutionException { @@ -254,6 +256,10 @@ model.setVersion( projectVersion ); + currentTag = model.getScm().getTag(); + + model.getScm().setTag( getTagLabel() ); + try { Properties releaseProperties = new Properties(); @@ -382,6 +388,8 @@ } model.setVersion( projectVersion ); + + model.getScm().setTag( currentTag ); PomTransformer transformer = new VersionTransformer(); Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java?rev=178323&r1=178322&r2=178323&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java (original) +++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java Tue May 24 16:35:00 2005 @@ -207,28 +207,14 @@ // Implementation // ---------------------------------------------------------------------- - /** - * - * @return - */ public abstract String selectProjectNodeXPathExpression(); - /** - * - * @return - */ public abstract String selectDependenciesNodesXPathExpression(); - /** - * - * @return - */ public abstract String selectPluginsNodesXPathExpression(); - /** - * - * @param node - */ + public abstract String selectScmTagNodesXPathExpression(); + public abstract void transformNode( Node node ); /** @@ -255,6 +241,8 @@ XPath pluginsXpath = new Dom4jXPath( selectPluginsNodesXPathExpression() ); + XPath scmXpath = new Dom4jXPath( selectScmTagNodesXPathExpression() ); + List nodes = new ArrayList(); nodes.addAll( pomXpath.selectNodes( getDocument() ) ); @@ -262,6 +250,8 @@ nodes.addAll( dependenciesXpath.selectNodes( getDocument() ) ); nodes.addAll( pluginsXpath.selectNodes( getDocument() ) ); + + nodes.addAll( scmXpath.selectNodes( getDocument() ) ); setSelectedNodes( nodes ); } 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=178323&r1=178322&r2=178323&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 Tue May 24 16:35:00 2005 @@ -52,10 +52,16 @@ return "/project/build/plugins/plugin"; } + public String selectScmTagNodesXPathExpression() + { + return "/project/scm/tag"; + } + public void transformNode( Node node ) { if ( selectProjectNodeXPathExpression().equals( node.getPath() ) ) { + // Modify project version Element project = (Element) node; Node version = node.selectSingleNode( "version" ); @@ -71,6 +77,7 @@ } else if ( selectDependenciesNodesXPathExpression().equals( node.getPath() ) ) { + // Modify dependency version Element dependency = (Element) node; Node groupId = node.selectSingleNode( "groupId" ); @@ -97,8 +104,9 @@ type.getText() ).getVersion() ); } } - else + else if ( selectPluginsNodesXPathExpression().equals( node.getPath() ) ) { + // Modify plugin version Element plugin = (Element) node; Node groupId = node.selectSingleNode( "groupId" ); @@ -131,6 +139,25 @@ else { plugin.addElement( "version" ).addText( p.getVersion() ); + } + } + else + { + // Modify scm tag + Element scm = (Element) node; + + Node tag = node.selectSingleNode( "tag" ); + + if ( tag == null ) + { + if ( !"HEAD".equals( getUpdatedModel().getScm().getTag() ) ) + { + scm.addElement( "tag" ).addText( getUpdatedModel().getScm().getTag() ); + } + } + else + { + tag.setText( getUpdatedModel().getScm().getTag() ); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]