jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1510533 - in /jackrabbit/oak/trunk: oak-doc/pom.xml oak-parent/pom.xml
Date Mon, 05 Aug 2013 15:05:21 GMT
Author: mduerig
Date: Mon Aug  5 15:05:21 2013
New Revision: 1510533

URL: http://svn.apache.org/r1510533
Log:
OAK-301 Document Oak
Exclude javadoc from default site build. (Moved to profile site-with-javadoc)

Modified:
    jackrabbit/oak/trunk/oak-doc/pom.xml
    jackrabbit/oak/trunk/oak-parent/pom.xml

Modified: jackrabbit/oak/trunk/oak-doc/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/pom.xml?rev=1510533&r1=1510532&r2=1510533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-doc/pom.xml Mon Aug  5 15:05:21 2013
@@ -56,6 +56,9 @@
         <configuration>
           <content>target/site</content>
           <checkinComment>OAK-936: Site checkin for project ${project.name}-${project.version}</checkinComment>
+          <ignorePathsToDelete>
+            <ignorePathToDelete>apidocs</ignorePathToDelete>
+          </ignorePathsToDelete>
         </configuration>
       </plugin>
     </plugins>

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1510533&r1=1510532&r2=1510533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Aug  5 15:05:21 2013
@@ -242,27 +242,13 @@
           <artifactId>maven-scm-publish-plugin</artifactId>
           <version>1.0-beta-2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>aggregate</id>
-            <goals>
-              <goal>aggregate</goal>
-            </goals>
-            <phase>site</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <reportOutputDirectory>${basedir}/oak-doc/target/site</reportOutputDirectory>
-          <additionalparam>-notimestamp</additionalparam>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 
   <reporting>
@@ -421,5 +407,29 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>site-with-javadoc</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>aggregate</id>
+                <goals>
+                  <goal>aggregate</goal>
+                </goals>
+                <phase>site</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <reportOutputDirectory>${basedir}/oak-doc/target/site</reportOutputDirectory>
+              <additionalparam>-notimestamp</additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>



Mime
View raw message