activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject git commit: fix javadoc creation, now running javadoc:aggregate work fine
Date Tue, 15 Jul 2014 09:28:55 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 3b5d89a78 -> 8f4079b43


fix javadoc creation, now running javadoc:aggregate work fine


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8f4079b4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8f4079b4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8f4079b4

Branch: refs/heads/trunk
Commit: 8f4079b438221a9f8c126f53245b980d6b2a5bf6
Parents: 3b5d89a
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Tue Jul 15 11:27:23 2014 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Tue Jul 15 11:27:23 2014 +0200

----------------------------------------------------------------------
 pom.xml | 69 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8f4079b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b10abf..33b0597 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1403,6 +1403,39 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${maven-javadoc-plugin-version}</version>
+        <configuration>
+          <links>
+            <link>${javase-javadoc-url}</link>
+            <link>${javaee-javadoc-url}</link>
+            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+            <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+            <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
+            <link>${slf4j-javadoc-url}</link>
+            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+            <link>http://junit.sourceforge.net/javadoc/</link>
+            <link>http://logging.apache.org/log4j/docs/api/</link>
+          </links>
+          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
+          <linksource>true</linksource>
+          <maxmemory>2048m</maxmemory>
+          <source>1.6</source>
+          <additionalJOption>-J-Xmx2048m</additionalJOption>
+        </configuration>
+        <executions>
+            <execution>
+                <id>aggregate</id>
+                <phase>site</phase>
+                <goals>
+                    <goal>aggregate</goal>
+                </goals>
+            </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <reporting>
@@ -1435,42 +1468,6 @@
         <artifactId>taglist-maven-plugin</artifactId>
         <version>${taglist-maven-plugin-version}</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven-javadoc-plugin-version}</version>
-        <configuration>
-          <links>
-            <link>${javase-javadoc-url}</link>
-            <link>${javaee-javadoc-url}</link>
-            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
-            <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
-            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
-            <link>${slf4j-javadoc-url}</link>
-            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
-            <link>http://junit.sourceforge.net/javadoc/</link>
-            <link>http://logging.apache.org/log4j/docs/api/</link>
-          </links>
-          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
-          <linksource>true</linksource>
-          <maxmemory>900m</maxmemory>
-          <source>1.6</source>
-          <additionalJOption>-J-Xmx256m</additionalJOption>
-        </configuration>
-      </plugin>
-      <!--<plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>-->
-
     </plugins>
   </reporting>
 


Mime
View raw message