You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2005/12/03 23:09:54 UTC
svn commit: r352029 - in /maven/maven-1/plugins/trunk/release: ./
src/main/org/apache/maven/release/ src/test-data/
src/test/org/apache/maven/release/ xdocs/
Author: fgiust
Date: Sat Dec 3 14:09:35 2005
New Revision: 352029
URL: http://svn.apache.org/viewcvs?rev=352029&view=rev
Log:
make version transformer work with poms with a declared namespace
Modified:
maven/maven-1/plugins/trunk/release/project.xml
maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java
maven/maven-1/plugins/trunk/release/src/test-data/test-pom-versions.xml
maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/SnapshotResolverTest.java
maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/VersionTransformerTest.java
maven/maven-1/plugins/trunk/release/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/release/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/project.xml?rev=352029&r1=352028&r2=352029&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/project.xml (original)
+++ maven/maven-1/plugins/trunk/release/project.xml Sat Dec 3 14:09:35 2005
@@ -1,35 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-<project>
+ /*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
<extend>../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
<id>maven-release-plugin</id>
<name>Maven Release Plug-in</name>
<currentVersion>1.5-SNAPSHOT</currentVersion>
- <description/>
+ <description>Produce project release</description>
<shortDescription>Produce project release</shortDescription>
<url>http://maven.apache.org/maven-1.x/reference/plugins/release/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPRELEASE</issueTrackingUrl>
<siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/release/</siteDirectory>
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/release/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/release/</developerConnection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/release/
+ </developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/release/</url>
</repository>
<developers>
@@ -55,7 +58,9 @@
<artifactId>commons-io</artifactId>
<version>1.0</version>
<properties>
- <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+ <comment>
+ This library is already loaded by maven's core. Be careful to use the same version number as in the core.
+ </comment>
</properties>
</dependency>
<dependency>
@@ -64,7 +69,9 @@
<version>1.4</version>
<url>http://www.dom4j.org/</url>
<properties>
- <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+ <comment>
+ This library is already loaded by maven's core. Be careful to use the same version number as in the core.
+ </comment>
</properties>
</dependency>
<dependency>
@@ -77,7 +84,9 @@
<artifactId>commons-jelly</artifactId>
<version>1.0</version>
<properties>
- <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+ <comment>
+ This library is already loaded by maven's core. Be careful to use the same version number as in the core.
+ </comment>
</properties>
</dependency>
<dependency>
@@ -97,6 +106,16 @@
<version>1.0</version>
</dependency>
</dependencies>
+ <build>
+ <unitTest>
+ <resources>
+ <resource>
+ <directory>src/test-data</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </unitTest>
+ </build>
<versions>
<version>
<id>1.2</id>
Modified: maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java?rev=352029&r1=352028&r2=352029&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java (original)
+++ maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java Sat Dec 3 14:09:35 2005
@@ -17,15 +17,6 @@
* ====================================================================
*/
-import org.apache.commons.io.FileUtils;
-import org.dom4j.Document;
-import org.dom4j.Node;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.SAXReader;
-import org.dom4j.io.XMLWriter;
-import org.jaxen.XPath;
-import org.jaxen.dom4j.Dom4jXPath;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
@@ -35,6 +26,18 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.io.FileUtils;
+import org.dom4j.Document;
+import org.dom4j.Node;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+import org.jaxen.XPath;
+import org.jaxen.dom4j.Dom4jXPath;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.XMLFilterImpl;
+
/**
* This is the base class for any tool that attempts to transform fields
* in the POM. Currently we are using the XML form of the POM and using Jaxen
@@ -263,6 +266,24 @@
throws Exception
{
SAXReader reader = new SAXReader();
+
+ // make xpath expressions worh with poms with or without namespace
+ reader.setXMLFilter( new XMLFilterImpl()
+ {
+
+ public void endElement( String uri, String localName, String qName )
+ throws SAXException
+ {
+ super.endElement( "", localName, "" );
+ }
+
+ public void startElement( String uri, String localName, String qName, Attributes atts )
+ throws SAXException
+ {
+ super.startElement( "", localName, "", atts );
+ }
+
+ } );
setDocument( reader.read( getProject() ) );
// The selecting nodes with the xpath expression will give us a list
Modified: maven/maven-1/plugins/trunk/release/src/test-data/test-pom-versions.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/src/test-data/test-pom-versions.xml?rev=352029&r1=352028&r2=352029&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/src/test-data/test-pom-versions.xml (original)
+++ maven/maven-1/plugins/trunk/release/src/test-data/test-pom-versions.xml Sat Dec 3 14:09:35 2005
@@ -15,7 +15,8 @@
* limitations under the License.
*/
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
<currentVersion>1.2-SNAPSHOT</currentVersion>
Modified: maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/SnapshotResolverTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/SnapshotResolverTest.java?rev=352029&r1=352028&r2=352029&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/SnapshotResolverTest.java (original)
+++ maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/SnapshotResolverTest.java Sat Dec 3 14:09:35 2005
@@ -17,12 +17,11 @@
* ====================================================================
*/
-import junit.framework.TestCase;
-
import java.io.File;
-
import java.util.List;
+import junit.framework.TestCase;
+
import org.dom4j.Node;
/**
@@ -30,8 +29,6 @@
public class SnapshotResolverTest
extends TestCase
{
- private static String TEST_CONF = System.getProperty( "basedir" )
- + "/src/test-data/test-pom.xml";
/**
* Constructor.
@@ -47,7 +44,7 @@
throws Exception
{
DummySnapshotResolver sr = new DummySnapshotResolver();
- sr.setProject( new File( TEST_CONF ) );
+ sr.setProject( new File( getClass().getResource( "/test-pom.xml" ).getFile() ) );
sr.transformNodes();
sr.write();
@@ -55,8 +52,8 @@
assertEquals( 3, nodes.size() );
- assertEquals( "NON-SNAPSHOT", ((Node)nodes.get(0)).selectSingleNode( "version" ).getText() );
- assertEquals( "NON-SNAPSHOT", ((Node)nodes.get(1)).selectSingleNode( "version" ).getText() );
- assertEquals( "NON-SNAPSHOT", ((Node)nodes.get(2)).selectSingleNode( "version" ).getText() );
+ assertEquals( "NON-SNAPSHOT", ( (Node) nodes.get( 0 ) ).selectSingleNode( "version" ).getText() );
+ assertEquals( "NON-SNAPSHOT", ( (Node) nodes.get( 1 ) ).selectSingleNode( "version" ).getText() );
+ assertEquals( "NON-SNAPSHOT", ( (Node) nodes.get( 2 ) ).selectSingleNode( "version" ).getText() );
}
}
Modified: maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/VersionTransformerTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/VersionTransformerTest.java?rev=352029&r1=352028&r2=352029&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/VersionTransformerTest.java (original)
+++ maven/maven-1/plugins/trunk/release/src/test/org/apache/maven/release/VersionTransformerTest.java Sat Dec 3 14:09:35 2005
@@ -44,7 +44,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-no-versions.xml" ) );
+ vt.setProject( getTestFile( "test-pom-no-versions.xml" ) );
assertTrue( "check transform required", vt.transformRequired() );
@@ -55,7 +55,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -63,7 +63,7 @@
assertEquals( "Check # versions is 1", 1, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
@@ -74,7 +74,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-versions.xml" ) );
+ vt.setProject( getTestFile( "test-pom-versions.xml" ) );
assertTrue( "check transform required", vt.transformRequired() );
@@ -85,7 +85,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -93,13 +93,13 @@
assertEquals( "Check # versions is 2", 2, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.1", "1.1", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.1", "1.1", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_1", "TEST_1_1", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 1 );
+ version = (Node) versionNodes.get( 1 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
@@ -110,7 +110,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-versions-multiple.xml" ) );
+ vt.setProject( getTestFile( "test-pom-versions-multiple.xml" ) );
assertTrue( "check transform required", vt.transformRequired() );
@@ -121,7 +121,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -129,19 +129,19 @@
assertEquals( "Check # versions is 3", 3, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.0", "1.0", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.0", "1.0", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_0", "TEST_1_0", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 1 );
+ version = (Node) versionNodes.get( 1 );
assertEquals( "Check version id is 1.1", "1.1", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.1", "1.1", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_1", "TEST_1_1", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 2 );
+ version = (Node) versionNodes.get( 2 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
@@ -152,7 +152,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-versions-wrong-order.xml" ) );
+ vt.setProject( getTestFile( "test-pom-versions-wrong-order.xml" ) );
assertTrue( "check transform required", vt.transformRequired() );
@@ -163,7 +163,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -171,19 +171,19 @@
assertEquals( "Check # versions is 3", 3, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.1", "1.1", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.1", "1.1", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_1", "TEST_1_1", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 1 );
+ version = (Node) versionNodes.get( 1 );
assertEquals( "Check version id is 1.0", "1.0", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.0", "1.0", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_0", "TEST_1_0", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 2 );
+ version = (Node) versionNodes.get( 2 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
@@ -194,7 +194,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-versions-overwrite.xml" ) );
+ vt.setProject( getTestFile( "test-pom-versions-overwrite.xml" ) );
assertTrue( "check transform required", vt.transformRequired() );
@@ -205,7 +205,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -213,13 +213,13 @@
assertEquals( "Check # versions is 2", 2, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.0", "1.0", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.0", "1.0", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_0", "TEST_1_0", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 1 );
+ version = (Node) versionNodes.get( 1 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
@@ -230,7 +230,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-versions-correct.xml" ) );
+ vt.setProject( getTestFile( "test-pom-versions-correct.xml" ) );
assertFalse( "check transform not required", vt.transformRequired() );
@@ -241,7 +241,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -249,13 +249,13 @@
assertEquals( "Check # versions is 2", 2, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.0", "1.0", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.0", "1.0", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_0", "TEST_1_0", version.selectSingleNode( "tag" ).getText() );
- version = ( Node ) versionNodes.get( 1 );
+ version = (Node) versionNodes.get( 1 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
@@ -266,7 +266,7 @@
throws Exception
{
VersionTransformer vt = new VersionTransformer( "1.2", "TEST_1_2" );
- vt.setProject( new File( System.getProperty( "basedir" ), "/src/test-data/test-pom-versions-tag-match-only.xml" ) );
+ vt.setProject( getTestFile( "test-pom-versions-tag-match-only.xml" ) );
assertTrue( "check transform required", vt.transformRequired() );
@@ -277,7 +277,7 @@
assertEquals( 1, nodes.size() );
- Node project = ( Node ) nodes.get( 0 );
+ Node project = (Node) nodes.get( 0 );
assertEquals( "Check currentVersion is 1.2", "1.2", project.selectSingleNode( "currentVersion" ).getText() );
@@ -285,11 +285,16 @@
assertEquals( "Check # versions is 1", 1, versionNodes.size() );
- Node version = ( Node ) versionNodes.get( 0 );
+ Node version = (Node) versionNodes.get( 0 );
assertEquals( "Check version id is 1.2", "1.2", version.selectSingleNode( "id" ).getText() );
assertEquals( "Check version name is 1.2", "1.2", version.selectSingleNode( "name" ).getText() );
assertEquals( "Check version tag is TEST_1_2", "TEST_1_2", version.selectSingleNode( "tag" ).getText() );
}
-}
+ private File getTestFile( String filename )
+ {
+ return new File( getClass().getResource( "/" + filename ).getFile() );
+ }
+
+}
Modified: maven/maven-1/plugins/trunk/release/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/xdocs/changes.xml?rev=352029&r1=352028&r2=352029&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/release/xdocs/changes.xml Sat Dec 3 14:09:35 2005
@@ -26,7 +26,7 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="In SVN">
- <action dev="brett" type="fix" issue="MPRELEASE-11">handle non-jar dependnecies</action>
+ <action dev="brett" type="fix" issue="MPRELEASE-11">handle non-jar dependencies</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>maven v1.0-rc2 -> v1.0.2</li>
@@ -35,6 +35,7 @@
<li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
</ul>
</action>
+ <action dev="fgiust" type="fix">Handle poms with a namespace</action>
</release>
<release version="1.4.1" date="2004-10-23">
<action dev="carlos" type="fix" issue="MPRELEASE-9">Close output file in AbstractPomTransformer.write()</action>