leosimons    2003/06/17 11:36:35

  Modified:    buildsystem/xml-forrest/src/resources/maven-plugin
                        project.xml plugin.jelly
  Log:
  sync with my local version
  
  Revision  Changes    Path
  1.3       +20 -22    
avalon/buildsystem/xml-forrest/src/resources/maven-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon/buildsystem/xml-forrest/src/resources/maven-plugin/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml       10 Jun 2003 18:05:44 -0000      1.2
  +++ project.xml       17 Jun 2003 18:36:35 -0000      1.3
  @@ -4,7 +4,7 @@
       <pomVersion>3</pomVersion>
       <id>maven-forrest-plugin</id>
       <name>Maven Forrest Plug-in</name>
  -    <currentVersion>1.0</currentVersion>
  +    <currentVersion>1.1</currentVersion>
       <shortDescription>Java Documentation Management Tool</shortDescription>
       <url>http://xml.apache.org/forrest/</url>
       <inceptionYear>2003</inceptionYear>
  @@ -92,26 +92,24 @@
           </dependency>-->
   
           <!-- xml stuff -->
  -        <dependencies>
  -            <dependency>
  -                <id>xml-apis</id>
  -                <version>2.0.2</version>
  -            </dependency>
  -            <dependency>
  -                <id>xercesImpl</id>
  -                <version>2.4.0</version>
  -                <groupId>xerces</groupId>
  -            </dependency>
  -            <dependency>
  -                <id>xmlParserAPIs</id>
  -                <version>2.2.1</version>
  -                <groupId>xerces</groupId>
  -            </dependency>
  -            <dependency>
  -                <id>xalan</id>
  -                <version>2.5.1</version>
  -            </dependency>
  -        </dependencies>
  +        <dependency>
  +            <id>xml-apis</id>
  +            <version>2.0.2</version>
  +        </dependency>
  +        <dependency>
  +            <id>xercesImpl</id>
  +            <version>2.4.0</version>
  +            <groupId>xerces</groupId>
  +        </dependency>
  +        <dependency>
  +            <id>xmlParserAPIs</id>
  +            <version>2.2.1</version>
  +            <groupId>xerces</groupId>
  +        </dependency>
  +        <dependency>
  +            <id>xalan</id>
  +            <version>2.5.1</version>
  +        </dependency>
           <dependency>
               <id>batik-all</id>
               <version>1.5b5</version>
  @@ -261,7 +259,7 @@
           </dependency>
           <dependency>
               <id>excalibur-sourceresolve</id>
  -            <version>1.0</version>
  +            <version>1.0.1</version>
           </dependency>
           <dependency>
               <id>excalibur-store</id>
  
  
  
  1.3       +4 -12     
avalon/buildsystem/xml-forrest/src/resources/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: 
/home/cvs/avalon/buildsystem/xml-forrest/src/resources/maven-plugin/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly      10 Jun 2003 18:05:44 -0000      1.2
  +++ plugin.jelly      17 Jun 2003 18:36:35 -0000      1.3
  @@ -7,24 +7,16 @@
       <goal name="forrest:generate"
           description="generates the site using forrest">
   
  -        <echo>
  -Forrest Plugin warming up......
  --------------------------------
  -forrest.home: ${forrest.home}
  -basedir: ${basedir}
  -project.home: ${project.home}
  -        </echo>
  -
           <ant:java
                   classname="org.apache.tools.ant.Main"
                   fork="true">
               <ant:classpath>
                   <ant:fileset dir="${maven.repo.local}">
  -                    <j:forEach var="dep" items="${plugin.dependencies}">
  -                      <ant:include 
name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
  -                    </j:forEach>
  -                    <ant:pathelement path="${forrest.home}/WEB-INF/classes"/>
  +                  <j:forEach var="dep" items="${plugin.dependencies}">
  +                    <ant:include 
name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
  +                  </j:forEach>
                   </ant:fileset>
  +                <ant:pathelement path="${forrest.home}/WEB-INF/classes"/>
               </ant:classpath>
               <ant:jvmarg value="-Dforrest.home=${forrest.home}"/>
               <ant:jvmarg value="-Dbasedir=${basedir}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to