Updated Branches: refs/heads/flume-1.4 fb5c5c514 -> 64b5d6432
FLUME-1262. Move doc generation to a different profile (Mike Percy via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/64b5d643 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/64b5d643 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/64b5d643 Branch: refs/heads/flume-1.4 Commit: 64b5d6432be3d1348303aaa2be90e477fa17dbb6 Parents: fb5c5c5 Author: Hari Shreedharan <[email protected]> Authored: Tue Apr 16 15:04:34 2013 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Apr 16 15:05:38 2013 -0700 ---------------------------------------------------------------------- flume-ng-dist/src/main/assembly/bin.xml | 10 +-- flume-ng-node/pom.xml | 1 - pom.xml | 111 ++++++++++++-------------- 3 files changed, 51 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/64b5d643/flume-ng-dist/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/flume-ng-dist/src/main/assembly/bin.xml b/flume-ng-dist/src/main/assembly/bin.xml index ad939d5..b6a8c8a 100644 --- a/flume-ng-dist/src/main/assembly/bin.xml +++ b/flume-ng-dist/src/main/assembly/bin.xml @@ -125,21 +125,13 @@ </fileSet> <fileSet> - <directory>../target/docs</directory> + <directory>../target/site</directory> <includes> <include>/**</include> </includes> <outputDirectory>docs</outputDirectory> </fileSet> - <fileSet> - <directory>../target/apidocs</directory> - <includes> - <include>/**</include> - </includes> - <outputDirectory>docs/apidocs</outputDirectory> - </fileSet> - </fileSets> </assembly> http://git-wip-us.apache.org/repos/asf/flume/blob/64b5d643/flume-ng-node/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml index 035ae06..1660410 100644 --- a/flume-ng-node/pom.xml +++ b/flume-ng-node/pom.xml @@ -47,7 +47,6 @@ <excludes> <!-- JSON doesn't support comments --> <exclude>src/test/resources/flume-conf.json</exclude> - <exclude>flume-docs/**</exclude> </excludes> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/flume/blob/64b5d643/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9aff211..bc28e8d 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ limitations under the License. </modules> <profiles> + <profile> <id>hadoop-1.0</id> <activation> @@ -179,32 +180,53 @@ limitations under the License. </build> </profile> - - <!-- maven 2 & 3 compat for reporting plugin --> <profile> - <id>maven-3</id> - <activation> - <file> - <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) --> - <exists>${basedir}</exists> - </file> - </activation> + <id>site</id> + <build> <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>package</phase> + <goals> + <goal>aggregate-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <executions> <execution> - <id>attach-descriptor</id> + <id>flume-site</id> + <phase>package</phase> <goals> - <goal>attach-descriptor</goal> + <goal>site</goal> </goals> </execution> + <!-- + <execution> + <id>flume-site-dist</id> + <phase>package</phase> + <goals> + <goal>stage</goal> + </goals> + </execution> + --> </executions> </plugin> + </plugins> </build> + </profile> + </profiles> <inceptionYear>2009</inceptionYear> @@ -449,33 +471,12 @@ limitations under the License. <build> <plugins> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8.1</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>aggregate-jar</goal> - </goals> - <configuration> - <!-- switch on dependency-driven aggregation --> - <includeDependencySources>true</includeDependencySources> - - <dependencySourceIncludes> - <!-- include ONLY flume multi-module dependencies --> - <dependencySourceInclude>org.apache.flume:*</dependencySourceInclude> - </dependencySourceIncludes> - </configuration> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> @@ -547,9 +548,19 @@ limitations under the License. </plugin> <plugin> - <groupId>org.tomdz.maven</groupId> - <artifactId>sphinx-maven-plugin</artifactId> - <version>1.0.2</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9</version> + <configuration> + <outputDirectory>${project.build.directory}/site/apidocs</outputDirectory> + <!-- switch on dependency-driven aggregation --> + <includeDependencySources>true</includeDependencySources> + + <dependencySourceIncludes> + <!-- include ONLY flume multi-module dependencies --> + <dependencySourceInclude>org.apache.flume:*</dependencySourceInclude> + </dependencySourceIncludes> + </configuration> </plugin> <plugin> @@ -561,11 +572,6 @@ limitations under the License. <plugin> <groupId>org.apache.avro</groupId> <artifactId>avro-maven-plugin</artifactId> - <!-- - <configuration> - <stringType>String</stringType> - </configuration> - --> <version>${avro.version}</version> </plugin> @@ -582,24 +588,6 @@ limitations under the License. <configuration> <siteDirectory>${project.basedir}/flume-ng-doc</siteDirectory> </configuration> - <dependencies> - </dependencies> - <executions> - <execution> - <id>flume-site</id> - <phase>package</phase> - <goals> - <goal>site</goal> - </goals> - </execution> - <execution> - <id>flume-site-dist</id> - <phase>package</phase> - <goals> - <goal>stage</goal> - </goals> - </execution> - </executions> </plugin> <plugin> @@ -608,7 +596,7 @@ limitations under the License. <configuration> <filesets> <fileset> - <directory>flume-docs</directory> + <directory>docs</directory> <includes> <include>**</include> </includes> @@ -984,7 +972,6 @@ limitations under the License. <version>1.4.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> @@ -1030,6 +1017,7 @@ limitations under the License. <reporting> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> @@ -1047,6 +1035,7 @@ limitations under the License. <report>cim</report> <report>scm</report> --> + <!-- warning: the "about" report conflicts with sphinx-maven --> </reports> </reportSet> </reportSets>
