You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by fe...@apache.org on 2011/04/13 06:44:46 UTC

svn commit: r1091645 - in /james: project/trunk/project/pom.xml server/trunk/pom.xml

Author: felixk
Date: Wed Apr 13 04:44:45 2011
New Revision: 1091645

URL: http://svn.apache.org/viewvc?rev=1091645&view=rev
Log:
Have javadocs generated when either running mvn site or mvn site -Psite-reports, but not for the goals install/deploy. Move this to from server to project pom.xml

Modified:
    james/project/trunk/project/pom.xml
    james/server/trunk/pom.xml

Modified: james/project/trunk/project/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/project/pom.xml?rev=1091645&r1=1091644&r2=1091645&view=diff
==============================================================================
--- james/project/trunk/project/pom.xml (original)
+++ james/project/trunk/project/pom.xml Wed Apr 13 04:44:45 2011
@@ -102,9 +102,54 @@
                     <artifactId>maven-project-info-reports-plugin</artifactId>
                     <version>2.3.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.7</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
+            <!-- Generate javadoc only when running mvn site, but not for mvn install -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>javadocs-for-site</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>aggregate</goal>
+                            <goal>test-aggregate</goal>
+                        </goals>
+                        <configuration>
+                            <minmemory>256m</minmemory>
+                            <maxmemory>1g</maxmemory>
+                            <linksource>true</linksource>
+                            <tags>
+                                <tag>
+                                    <name>note</name>
+                                    <placement>a</placement>
+                                    <head>NOTE</head>
+                                </tag>
+                                <tag>
+                                    <name>todo</name>
+                                    <placement>a</placement>
+                                    <head>TODO</head>
+                                </tag>
+                                <tag>
+                                    <name>warning</name>
+                                    <placement>a</placement>
+                                    <head>WARNING</head>
+                                </tag>
+                            </tags>
+                            <source>${target.jdk}</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+          
+            <!-- Site generation -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -157,5 +202,6 @@
     <properties>
         <maven-site-plugin.siteDirectory>${basedir}/src/site</maven-site-plugin.siteDirectory>
         <maven-site-plugin.generateReports>false</maven-site-plugin.generateReports>
+        <target.jdk>1.5</target.jdk>
     </properties>
 </project>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1091645&r1=1091644&r2=1091645&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Apr 13 04:44:45 2011
@@ -274,45 +274,6 @@
         </configuration>
       </plugin>
 
-      <!-- Generate javadoc only when running mvn site, but not for mvn install -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>javadocs-for-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>aggregate</goal>
-              <goal>test-aggregate</goal>
-            </goals>
-            <configuration>
-              <minmemory>256m</minmemory>
-              <maxmemory>1g</maxmemory>
-              <linksource>true</linksource>
-              <tags>
-                <tag>
-                  <name>note</name>
-                  <placement>a</placement>
-                  <head>NOTE</head>
-                </tag>
-                <tag>
-                  <name>todo</name>
-                  <placement>a</placement>
-                  <head>TODO</head>
-                </tag>
-                <tag>
-                  <name>warning</name>
-                  <placement>a</placement>
-                  <head>WARNING</head>
-                </tag>
-              </tags>
-              <source>${target.jdk}</source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Site generation -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>



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