james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r1079748 - /james/imap/trunk/pom.xml
Date Wed, 09 Mar 2011 11:11:30 GMT
Author: felixk
Date: Wed Mar  9 11:11:30 2011
New Revision: 1079748

URL: http://svn.apache.org/viewvc?rev=1079748&view=rev
Log:
Use SNAPSHOT of parent, fix site/report generation switch (JAMES-1041)

Modified:
    james/imap/trunk/pom.xml

Modified: james/imap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/pom.xml?rev=1079748&r1=1079747&r2=1079748&view=diff
==============================================================================
--- james/imap/trunk/pom.xml (original)
+++ james/imap/trunk/pom.xml Wed Mar  9 11:11:30 2011
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>james-project</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>1.5</version>
+    <version>1.6-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -218,10 +218,42 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-descriptor</id>
+            <goals>
+              <goal>attach-descriptor</goal>
+            </goals>
+            <configuration>
+              <siteDirectory>${basedir}/src/site</siteDirectory>
+              <generateReports>false</generateReports>
+            </configuration>
+          </execution>
+        </executions>
         <configuration>
-          <siteDirectory>${imap.siteDirectory}</siteDirectory>
-          <generateReports>${imap.generateReports}</generateReports>
+          <siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
+          <generateReports>${maven-site-plugin.generateReports}</generateReports>
           <reportPlugins>
+            <!-- Order matters. First project-info-reports, second jxr. -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <reports>
+                <report>dependencies</report>
+                <report>dependency-management</report>
+                <report>dependency-convergence</report>
+                <report>distribution-management</report>
+                <report>index</report>
+                <report>license</report>
+                <report>mailing-list</report>
+                <report>modules</report>
+                <report>plugin-management</report>
+                <report>plugins</report>
+                <report>project-team</report>
+                <report>scm</report>
+                <report>summary</report>
+              </reports>
+            </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-jxr-plugin</artifactId>
@@ -231,29 +263,6 @@
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>dependencies</report>
-                    <report>dependency-management</report>
-                    <report>dependency-convergence</report>
-                    <report>distribution-management</report>
-                    <report>index</report>
-                    <report>license</report>
-                    <report>mailing-list</report>
-                    <report>modules</report>
-                    <report>plugin-management</report>
-                    <report>plugins</report>
-                    <report>project-team</report>
-                    <report>scm</report>
-                    <report>summary</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-report-plugin</artifactId>
               <configuration>
                 <aggregate>true</aggregate>
@@ -273,7 +282,6 @@
                   <!-- Eclipse -->
                   <exclude>**/.*</exclude>
                   <exclude>.*/**/*</exclude>
-      
                 </excludes>
               </configuration>
             </plugin>
@@ -574,13 +582,6 @@
         <version.activation>1.0.2</version.activation>
       </properties>
     </profile>
-    <profile>
-      <id>site-reports</id>
-      <properties>
-        <imap.siteDirectory>${basedir}/src/reporting-site</imap.siteDirectory>
-        <imap.generateReports>true</imap.generateReports>
-      </properties>
-    </profile>
   </profiles>
 
   <properties>
@@ -600,7 +601,5 @@
     <version.torque>3.3</version.torque>
     <version.jmock>2.5.1</version.jmock>
     <target.jdk>1.5</target.jdk>
-    <imap.siteDirectory>${basedir}/src/site</imap.siteDirectory>
-    <imap.generateReports>false</imap.generateReports>
   </properties>
 </project>



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


Mime
View raw message