You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/02 08:30:53 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/java plugin.jelly

jvanzyl     2003/01/01 23:30:53

  Modified:    .        build-bootstrap.properties build-bootstrap.xml
                        maven.xml
               src/plugins-build/java plugin.jelly
  Log:
  
  
  Revision  Changes    Path
  1.6       +1 -1      jakarta-turbine-maven/build-bootstrap.properties
  
  Index: build-bootstrap.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build-bootstrap.properties	31 Dec 2002 07:43:57 -0000	1.5
  +++ build-bootstrap.properties	2 Jan 2003 07:30:53 -0000	1.6
  @@ -5,7 +5,7 @@
   # bootstrap is offline or online - online by default . Pass this property
   # as -o from the command prompt if you are offline 
   # ------------------------------------------------------------------------------
  -maven.bootstrap.online=
  +maven.bootstrap.online=-o
   
   # ------------------------------------------------------------------------------
   # The bootstrap classes consist of an Ant task front that:
  
  
  
  1.185     +12 -3     jakarta-turbine-maven/build-bootstrap.xml
  
  Index: build-bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
  retrieving revision 1.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- build-bootstrap.xml	1 Jan 2003 15:22:09 -0000	1.184
  +++ build-bootstrap.xml	2 Jan 2003 07:30:53 -0000	1.185
  @@ -214,17 +214,26 @@
   |                                                                  |
   +------------------------------------------------------------------+
       </echo>
  +    
   
       <exec 
         executable="${maven.command}"
         failonerror="true">
         <arg value="${maven.bootstrap.online}"/>
         <arg value="maven:plugins-build"/>
  -      <!--
  -      <arg value="-X"/>
  -      -->
         <arg value="-e"/>
       </exec>
  +
  +    <!--    
  +    <exec 
  +      executable="${maven.command}"
  +      failonerror="true">
  +      <arg value="${maven.bootstrap.online}"/>
  +      <arg value="java:jar"/>
  +      <arg value="-e"/>
  +    </exec>
  +    -->
  +
   
       <echo>
   +------------------------------------------------------------------+
  
  
  
  1.70      +0 -1      jakarta-turbine-maven/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- maven.xml	1 Jan 2003 15:22:51 -0000	1.69
  +++ maven.xml	2 Jan 2003 07:30:53 -0000	1.70
  @@ -27,7 +27,6 @@
   
     <postGoal name="test:test">
       <maven:maven
  -      basedir="${basedir}/src/test/touchstone-build"
         descriptor="${basedir}/src/test/touchstone-build/project.xml"
         goals="java:jar"
         ignoreFailures="false"
  
  
  
  1.37      +6 -0      jakarta-turbine-maven/src/plugins-build/java/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/java/plugin.jelly,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- plugin.jelly	18 Dec 2002 23:53:54 -0000	1.36
  +++ plugin.jelly	2 Jan 2003 07:30:53 -0000	1.37
  @@ -57,6 +57,12 @@
               <path refid="maven.compile.src.set"/>
             </src>
         
  +          <!--
  +           | 
  +           | Source Modifications.
  +           |
  +          -->
  +      
             <j:forEach var="sm" items="${pom.build.sourceModifications}">
               <available property="classPresent" classname="${sm.className}"/>
               <j:if test="${classPresent != 'true'}">
  
  
  

Re: cvs commit: jakarta-turbine-maven/src/plugins-build/java plugin.jelly

Posted by di...@multitask.com.au.
Jason, did you mean this:

jvanzyl@apache.org wrote on 02/01/2003 06:30:53 PM:

> jvanzyl     2003/01/01 23:30:53
>   --- build-bootstrap.properties   31 Dec 2002 07:43:57 -0000   1.5
>   +++ build-bootstrap.properties   2 Jan 2003 07:30:53 -0000   1.6
>   @@ -5,7 +5,7 @@
>    # bootstrap is offline or online - online by default . Pass this 
property
>    # as -o from the command prompt if you are offline 
>    # 
> 
------------------------------------------------------------------------------
>   -maven.bootstrap.online=
>   +maven.bootstrap.online=-o
> 
--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au