maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r399238 - in /maven/plugins/trunk/maven-release-plugin/src: main/java/org/apache/maven/plugins/release/phase/ main/java/org/apache/maven/plugins/release/scm/ main/resources/META-INF/plexus/ test/java/org/apache/maven/plugins/release/phase/ ...
Date Wed, 03 May 2006 10:21:40 GMT
Author: brett
Date: Wed May  3 03:21:33 2006
New Revision: 399238

URL: http://svn.apache.org/viewcvs?rev=399238&view=rev
Log:
[MRELEASE-60] add support for tag under CVS, correct some other issues with interpolation

Added:
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java
  (with props)
    maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/
    maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
  (with props)
    maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
  (with props)
    maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/
    maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
  (with props)
    maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
  (with props)
Modified:
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/ScmTranslator.java
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/SubversionScmTranslator.java
    maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml
    maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
    maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhase.java
Wed May  3 03:21:33 2006
@@ -19,10 +19,12 @@
 import org.apache.maven.model.Scm;
 import org.apache.maven.plugins.release.ReleaseExecutionException;
 import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.scm.ScmTranslator;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.jdom.Element;
 import org.jdom.Namespace;
+import org.jdom.Text;
 
 import java.util.Map;
 
@@ -34,6 +36,11 @@
 public class RewritePomsForDevelopmentPhase
     extends AbstractRewritePomsPhase
 {
+    /**
+     * SCM URL translators mapped by provider name.
+     */
+    private Map scmTranslators;
+
     protected void transformScm( MavenProject project, Element rootElement, Namespace namespace,
                                  ReleaseConfiguration releaseConfiguration, String projectId,
                                  ScmRepository scmRepository )
@@ -64,6 +71,46 @@
                 if ( url != null )
                 {
                     url.setText( scm.getUrl() );
+                }
+
+                ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider()
);
+                if ( translator != null )
+                {
+                    String resolvedTag = translator.resolveTag( null, scm.getTag() );
+
+                    Element tagElement = scmRoot.getChild( "tag", namespace );
+                    if ( tagElement != null )
+                    {
+                        if ( resolvedTag != null )
+                        {
+                            tagElement.setText( resolvedTag );
+                        }
+                        else
+                        {
+                            int index = scmRoot.indexOf( tagElement );
+                            scmRoot.removeContent( index );
+                            for ( int i = index - 1; i >= 0; i-- )
+                            {
+                                if ( scmRoot.getContent( i ) instanceof Text )
+                                {
+                                    scmRoot.removeContent( i );
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if ( resolvedTag != null )
+                        {
+                            Element element = new Element( "tag", namespace );
+                            element.setText( resolvedTag );
+                            scmRoot.addContent( "  " ).addContent( element ).addContent(
"\n  " );
+                        }
+                    }
                 }
             }
         }

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhase.java
Wed May  3 03:21:33 2006
@@ -54,7 +54,7 @@
                 ScmTranslator translator = (ScmTranslator) scmTranslators.get( scmRepository.getProvider()
);
                 if ( translator != null )
                 {
-                    Scm scm = project.getScm();
+                    Scm scm = project.getOriginalModel().getScm();
                     String tag = releaseConfiguration.getReleaseLabel();
                     scmRoot.getChild( "connection", namespace ).setText(
                         translator.translateTagUrl( scm.getConnection(), tag ) );
@@ -69,6 +69,29 @@
                     if ( url != null )
                     {
                         url.setText( translator.translateTagUrl( scm.getUrl(), tag ) );
+                    }
+
+                    String resolvedTag = translator.resolveTag( scm.getTag(), tag );
+                    Element tagElement = scmRoot.getChild( "tag", namespace );
+                    if ( tagElement != null )
+                    {
+                        if ( resolvedTag != null )
+                        {
+                            tagElement.setText( resolvedTag );
+                        }
+                        else
+                        {
+                            tagElement.getParentElement().removeChild( "tag", namespace );
+                        }
+                    }
+                    else
+                    {
+                        if ( resolvedTag != null )
+                        {
+                            Element element = new Element( "tag", namespace );
+                            element.setText( resolvedTag );
+                            scmRoot.addContent( "  " ).addContent( element ).addContent(
"\n  " );
+                        }
                     }
                 }
                 else

Added: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java?rev=399238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java
(added)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java
Wed May  3 03:21:33 2006
@@ -0,0 +1,43 @@
+package org.apache.maven.plugins.release.scm;
+
+/*
+ * Copyright 2005-2006 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.
+ */
+
+/**
+ * Subversion tag translator.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ */
+public class CvsScmTranslator
+    implements ScmTranslator
+{
+    public String translateTagUrl( String url, String tag )
+    {
+        return url;
+    }
+
+    public String resolveTag( String sourceTag, String tag )
+    {
+        if ( !"HEAD".equals( tag ) )
+        {
+            return tag;
+        }
+        else
+        {
+            return null;
+        }
+    }
+}

Propchange: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/CvsScmTranslator.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/ScmTranslator.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/ScmTranslator.java?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/ScmTranslator.java
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/ScmTranslator.java
Wed May  3 03:21:33 2006
@@ -37,4 +37,12 @@
      * @return the replacement URL
      */
     String translateTagUrl( String url, String tag );
+
+    /**
+     * Determine what tag should be added to the POM given the original tag and the new one.
+     * @param sourceTag the original tag
+     * @param tag the new tag
+     * @return the tag to use, or <code>null</code> if the provider does not
use tags
+     */
+    String resolveTag( String sourceTag, String tag );
 }

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/SubversionScmTranslator.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/SubversionScmTranslator.java?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/SubversionScmTranslator.java
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/scm/SubversionScmTranslator.java
Wed May  3 03:21:33 2006
@@ -30,4 +30,9 @@
     {
         return SvnTagBranchUtils.resolveTagUrl( url, tag );
     }
+
+    public String resolveTag( String sourceTag, String tag )
+    {
+        return null;
+    }
 }

Modified: maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/resources/META-INF/plexus/components.xml
Wed May  3 03:21:33 2006
@@ -197,6 +197,10 @@
         <requirement>
           <role>org.apache.maven.plugins.release.scm.ScmRepositoryConfigurator</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.plugins.release.scm.ScmTranslator</role>
+          <field-name>scmTranslators</field-name>
+        </requirement>
       </requirements>
     </component>
     <component>
@@ -217,6 +221,11 @@
       <role>org.apache.maven.plugins.release.scm.ScmTranslator</role>
       <role-hint>svn</role-hint>
       <implementation>org.apache.maven.plugins.release.scm.SubversionScmTranslator</implementation>
+    </component>
+    <component>
+      <role>org.apache.maven.plugins.release.scm.ScmTranslator</role>
+      <role-hint>cvs</role-hint>
+      <implementation>org.apache.maven.plugins.release.scm.CvsScmTranslator</implementation>
     </component>
     <component>
       <role>org.apache.maven.plugins.release.exec.MavenExecutor</role>

Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
Wed May  3 03:21:33 2006
@@ -19,6 +19,7 @@
 import org.apache.maven.model.Scm;
 import org.apache.maven.plugins.release.ReleaseExecutionException;
 import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -133,7 +134,17 @@
     {
         ReleaseConfiguration releaseConfiguration =
             createConfigurationFromProjects( "rewrite-for-development/", path, copyFiles
);
-        releaseConfiguration.setUrl( "scm:svn:file://localhost/tmp/scm-repo" );
+
+        MavenProject rootProject = (MavenProject) releaseConfiguration.getReactorProjects().get(
0 );
+        if ( rootProject.getScm() == null )
+        {
+            releaseConfiguration.setUrl( "scm:svn:file://localhost/tmp/scm-repo/trunk" );
+        }
+        else
+        {
+            releaseConfiguration.setUrl( rootProject.getScm().getConnection() );
+        }
+
         releaseConfiguration.setWorkingDirectory( getTestFile( "target/test/checkout" ) );
 
         return releaseConfiguration;
@@ -201,5 +212,22 @@
         mapScm( config );
 
         return config;
+    }
+
+    public void testRewriteBasicPomWithCvs()
+        throws Exception
+    {
+        ReleaseConfiguration config = createConfigurationFromProjects( "basic-pom-with-cvs"
);
+        mapNextVersion( config, "groupId:artifactId" );
+
+        Scm scm = new Scm();
+        scm.setConnection( "scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module" );
+        scm.setDeveloperConnection( "scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module"
);
+        scm.setUrl( "http://localhost/viewcvs.cgi/module" );
+        config.mapOriginalScmInfo( "groupId:artifactId", scm );
+
+        phase.execute( config );
+
+        assertTrue( compareFiles( config.getReactorProjects() ) );
     }
 }

Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java?rev=399238&r1=399237&r2=399238&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
(original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
Wed May  3 03:21:33 2006
@@ -17,6 +17,7 @@
  */
 
 import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -47,7 +48,17 @@
     {
         ReleaseConfiguration releaseConfiguration =
             createConfigurationFromProjects( "rewrite-for-release/", path, copyFiles );
-        releaseConfiguration.setUrl( "scm:svn:file://localhost/tmp/scm-repo" );
+
+        MavenProject rootProject = (MavenProject) releaseConfiguration.getReactorProjects().get(
0 );
+        if ( rootProject.getScm() == null )
+        {
+            releaseConfiguration.setUrl( "scm:svn:file://localhost/tmp/scm-repo/trunk" );
+        }
+        else
+        {
+            releaseConfiguration.setUrl( rootProject.getScm().getConnection() );
+        }
+
         releaseConfiguration.setReleaseLabel( "release-label" );
         releaseConfiguration.setWorkingDirectory( getTestFile( "target/test/checkout" ) );
 
@@ -163,5 +174,16 @@
     protected void unmapNextVersion( ReleaseConfiguration config, String projectId )
     {
         // nothing to do
+    }
+
+    public void testRewriteBasicPomWithCvs()
+        throws Exception
+    {
+        ReleaseConfiguration config = createConfigurationFromProjects( "basic-pom-with-cvs"
);
+        mapNextVersion( config, "groupId:artifactId" );
+
+        phase.execute( config );
+
+        assertTrue( compareFiles( config.getReactorProjects() ) );
     }
 }

Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml?rev=399238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
(added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
Wed May  3 03:21:33 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2005-2006 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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupId</groupId>
+  <artifactId>artifactId</artifactId>
+  <version>1.1-SNAPSHOT</version>
+
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <scm>
+    <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+    <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+    <url>http://localhost/viewcvs.cgi/module</url>
+  </scm>
+</project>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml?rev=399238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
(added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
Wed May  3 03:21:33 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2005-2006 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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupId</groupId>
+  <artifactId>artifactId</artifactId>
+  <version>1.0</version>
+
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <scm>
+    <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+    <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+    <url>http://localhost/viewcvs.cgi/module</url>
+    <tag>release-label</tag>
+  </scm>
+</project>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml?rev=399238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
(added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
Wed May  3 03:21:33 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2005-2006 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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupId</groupId>
+  <artifactId>artifactId</artifactId>
+  <version>1.0</version>
+
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <scm>
+    <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+    <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+    <url>http://localhost/viewcvs.cgi/module</url>
+    <tag>release-label</tag>
+  </scm>
+</project>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/expected-pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml?rev=399238&view=auto
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
(added)
+++ maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
Wed May  3 03:21:33 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2005-2006 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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupId</groupId>
+  <artifactId>artifactId</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <scm>
+    <connection>scm:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+    <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+    <url>http://localhost/viewcvs.cgi/module</url>
+  </scm>
+</project>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-release-plugin/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message