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 2004/03/02 01:17:58 UTC

cvs commit: maven-plugins/scm plugin.jelly

brett       2004/03/01 16:17:58

  Modified:    scm      plugin.jelly
  Log:
  fix perform release when running on a clean project
  
  Revision  Changes    Path
  1.8       +20 -19    maven-plugins/scm/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/scm/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly	26 Feb 2004 15:08:17 -0000	1.7
  +++ plugin.jelly	2 Mar 2004 00:17:58 -0000	1.8
  @@ -97,6 +97,25 @@
     <goal name="scm:bootstrap-project"
       description="Bootstrap a project from SCM"
       prereqs="scm:checkout-project">
  +    <!-- TODO: check tagged syntax ok with other SCM than CVS, including in docs -->
  +    <j:set var="checkTagged" value="${maven.scm.check.tagged}"/>
  +    <j:if test="${checkTagged}">
  +      <!-- TODO: what about branch tags? Check <version>? What about cvs command for such? -->
  +      <j:set var="tag" value="${maven.scm.cvs.sticky.tag}"/>
  +      <j:if test="${tag == 'HEAD'}">
  +        <maven:pom var="project" projectDescriptor="${maven.scm.checkout.dir}/${maven.scm.cvs.module}/project.xml"/>
  +        <log:info>WARNING: you are releasing HEAD. This will overwrite any previous release versioned '${project.currentVersion}'.</log:info>
  +        <i:ask 
  +          question="Are you sure (y/n)?"
  +          answer="ok"
  +          default="n"
  +        />
  +        <j:if test="${ok != 'y'}">
  +          <ant:fail>Cancelled by response '${ok}'</ant:fail>
  +        </j:if> 
  +      </j:if>
  +    </j:if>
  +
       <maven:maven
         descriptor="${maven.scm.bootstrap.pom.dir}/project.xml"
         goals="${maven.scm.bootstrap.goals}"
  @@ -158,25 +177,7 @@
         <i:ask question="What goals are you using to build?" answer="maven.scm.bootstrap.goals" default="multiproject:deploy" />  
       </j:if>
   
  -    <!-- TODO: check tagged syntax ok with other SCM than CVS, including in docs -->
  -    <j:set var="checkTagged" value="${maven.scm.check.tagged}"/>
  -    <j:if test="${checkTagged}">
  -      <!-- TODO: what about branch tags? Check <version>? What about cvs command for such? -->
  -      <j:set var="tag" value="${maven.scm.cvs.sticky.tag}"/>
  -      <j:if test="${tag == 'HEAD'}">
  -        <maven:pom var="project" projectDescriptor="${maven.scm.checkout.dir}/${maven.scm.cvs.module}/project.xml"/>
  -        <log:info>WARNING: you are releasing HEAD. This will overwrite any previous release versioned '${project.currentVersion}'.</log:info>
  -        <i:ask 
  -          question="Are you sure (y/n)?"
  -          answer="ok"
  -          default="n"
  -        />
  -        <j:if test="${ok != 'y'}">
  -          <ant:fail>Cancelled by response '${ok}'</ant:fail>
  -        </j:if> 
  -      </j:if>
  -      <attainGoal name="scm:bootstrap-project" />
  -    </j:if>
  +    <attainGoal name="scm:bootstrap-project" />
     </goal>
     
     <!--==================================================================-->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org