dion        2003/08/03 23:29:10

  Modified:    src/plugins-build/multiproject/xdocs navigation.xml
               src/plugins-build/multiproject project.xml
  Added:       src/plugins-build/multiproject/xdocs faq.fml
  Log:
  Apply patch for MAVEN-617 and fix reports in project.xml
  
  Revision  Changes    Path
  1.2       +1 -0      maven/src/plugins-build/multiproject/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml    30 Jun 2003 03:18:49 -0000      1.1
  +++ navigation.xml    4 Aug 2003 06:29:10 -0000       1.2
  @@ -10,6 +10,7 @@
       <menu name="Overview">
         <item name="Goals" href="/goals.html" />
         <item name="Properties" href="/properties.html" />
  +      <item name="FAQ" href="/faq.html" />
       </menu>
     </body>
   </project>
  
  
  
  1.1                  maven/src/plugins-build/multiproject/xdocs/faq.fml
  
  Index: faq.fml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <faqs title="Frequently Asked Questions">
      <part id="using">
          <title>Using Multiproject</title>
          <faq id="resources-not-included-in-artifacts">
              <question>When using multiproject to build subprojects, resources are 
not included in my artifacts. Why?</question>
              <answer>
                  Use ${basedir} in your subproject's POM resource section:
                  <p>
                      <source>
                          <![CDATA[
                                             <resources>
                                                 <resource>
                                                     
<directory>${basedir}/src/java</directory>
                                                     <includes>
                                                         
<include>**/*.properties</include>
                                                     </includes>
                                                 </resource>
                                             </resources>
                                     ]]>
                      </source>
                  </p>
                  <p>
                      The resources won't be included if you just specify "src/java" 
as directory unless maven is started from within the subproject directory.
                  </p>
              </answer>
          </faq>
      </part>
  </faqs>
  
  
  
  1.7       +17 -0     maven/src/plugins-build/multiproject/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/multiproject/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml       25 Jul 2003 12:31:32 -0000      1.6
  +++ project.xml       4 Aug 2003 06:29:10 -0000       1.7
  @@ -57,4 +57,21 @@
       </dependency>
       
     </dependencies>
  +  
  +  <reports>
  +    <report>maven-changelog-plugin</report>
  +    <report>maven-changes-plugin</report>
  +    <report>maven-checkstyle-plugin</report>
  +    <report>maven-developer-activity-plugin</report>
  +    <report>maven-faq-plugin</report>
  +    <report>maven-file-activity-plugin</report>
  +    <report>maven-javadoc-plugin</report>
  +    <report>maven-jdepend-plugin</report>
  +    <report>maven-junit-report-plugin</report>
  +    <report>maven-jxr-plugin</report>
  +    <report>maven-license-plugin</report>
  +    <report>maven-linkcheck-plugin</report>
  +    <report>maven-pmd-plugin</report>
  +    <report>maven-tasklist-plugin</report>
  +  </reports>
   </project>
  
  
  

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

Reply via email to