Repository: flink Updated Branches: refs/heads/master 6e38eb841 -> ce39c190a
[FLINK-1720] Integrate ScalaDoc into JavaDoc This closes #497 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ce39c190 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ce39c190 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ce39c190 Branch: refs/heads/master Commit: ce39c190a2befa837fd03436a8420d40edf8d713 Parents: 6071fb8 Author: Aljoscha Krettek <[email protected]> Authored: Thu Mar 12 11:07:33 2015 +0100 Committer: Stephan Ewen <[email protected]> Committed: Thu Mar 19 17:51:04 2015 +0100 ---------------------------------------------------------------------- flink-scala/pom.xml | 2 +- flink-staging/flink-expressions/pom.xml | 2 +- flink-staging/flink-hcatalog/pom.xml | 7 --- .../flink-streaming-examples/pom.xml | 7 --- .../flink-streaming-scala/pom.xml | 2 +- flink-test-utils/pom.xml | 7 --- pom.xml | 59 ++++++++++++++++++++ 7 files changed, 62 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/flink-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index 32faa6f..523237e 100644 --- a/flink-scala/pom.xml +++ b/flink-scala/pom.xml @@ -134,7 +134,7 @@ under the License. <jvmArg>-Xms128m</jvmArg> <jvmArg>-Xmx512m</jvmArg> </jvmArgs> - <compilerPlugins> + <compilerPlugins combine.children="append"> <compilerPlugin> <groupId>org.scalamacros</groupId> <artifactId>paradise_${scala.version}</artifactId> http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/flink-staging/flink-expressions/pom.xml ---------------------------------------------------------------------- diff --git a/flink-staging/flink-expressions/pom.xml b/flink-staging/flink-expressions/pom.xml index 56ed345..1707ff4 100644 --- a/flink-staging/flink-expressions/pom.xml +++ b/flink-staging/flink-expressions/pom.xml @@ -129,7 +129,7 @@ under the License. <jvmArg>-Xms128m</jvmArg> <jvmArg>-Xmx512m</jvmArg> </jvmArgs> - <compilerPlugins> + <compilerPlugins combine.children="append"> <compilerPlugin> <groupId>org.scalamacros</groupId> <artifactId>paradise_${scala.version}</artifactId> http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/flink-staging/flink-hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/flink-staging/flink-hcatalog/pom.xml b/flink-staging/flink-hcatalog/pom.xml index 8762b9c..e672361 100644 --- a/flink-staging/flink-hcatalog/pom.xml +++ b/flink-staging/flink-hcatalog/pom.xml @@ -82,13 +82,6 @@ under the License. <jvmArg>-Xms128m</jvmArg> <jvmArg>-Xmx512m</jvmArg> </jvmArgs> - <compilerPlugins> - <compilerPlugin> - <groupId>org.scalamacros</groupId> - <artifactId>paradise_${scala.version}</artifactId> - <version>${scala.macros.version}</version> - </compilerPlugin> - </compilerPlugins> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/flink-staging/flink-streaming/flink-streaming-examples/pom.xml ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-examples/pom.xml b/flink-staging/flink-streaming/flink-streaming-examples/pom.xml index 0f280dce..dcb0454 100644 --- a/flink-staging/flink-streaming/flink-streaming-examples/pom.xml +++ b/flink-staging/flink-streaming/flink-streaming-examples/pom.xml @@ -369,13 +369,6 @@ under the License. <jvmArg>-Xms128m</jvmArg> <jvmArg>-Xmx512m</jvmArg> </jvmArgs> - <compilerPlugins> - <compilerPlugin> - <groupId>org.scalamacros</groupId> - <artifactId>paradise_${scala.version}</artifactId> - <version>${scala.macros.version}</version> - </compilerPlugin> - </compilerPlugins> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/flink-staging/flink-streaming/flink-streaming-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-scala/pom.xml b/flink-staging/flink-streaming/flink-streaming-scala/pom.xml index 5a244ad..213bdec 100644 --- a/flink-staging/flink-streaming/flink-streaming-scala/pom.xml +++ b/flink-staging/flink-streaming/flink-streaming-scala/pom.xml @@ -113,7 +113,7 @@ under the License. <jvmArg>-Xms128m</jvmArg> <jvmArg>-Xmx512m</jvmArg> </jvmArgs> - <compilerPlugins> + <compilerPlugins combine.children="append"> <compilerPlugin> <groupId>org.scalamacros</groupId> <artifactId>paradise_${scala.version}</artifactId> http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/flink-test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/flink-test-utils/pom.xml b/flink-test-utils/pom.xml index 1a87496..e8da4e9 100644 --- a/flink-test-utils/pom.xml +++ b/flink-test-utils/pom.xml @@ -112,13 +112,6 @@ under the License. <jvmArg>-Xms128m</jvmArg> <jvmArg>-Xmx512m</jvmArg> </jvmArgs> - <compilerPlugins> - <compilerPlugin> - <groupId>org.scalamacros</groupId> - <artifactId>paradise_${scala.version}</artifactId> - <version>${scala.macros.version}</version> - </compilerPlugin> - </compilerPlugins> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flink/blob/ce39c190/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3c6538e..e771ad4 100644 --- a/pom.xml +++ b/pom.xml @@ -416,6 +416,65 @@ under the License. <id>docs-and-source</id> <build> <plugins> + + <!-- We need to clean compiled classes to make sure that genjavadoc + is called to generate our fake Java source from Scala source. --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version><!--$NO-MVN-MAN-VER$--> + <executions> + <execution> + <id>clean-target</id> + <phase>generate-sources</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <executions> + <execution> + <id>doc</id> + <phase>generate-sources</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + <configuration> + <args> + <arg>-P:genjavadoc:out=${project.build.directory}/genjavadoc</arg> + </args> + <compilerPlugins> + <compilerPlugin> + <groupId>com.typesafe.genjavadoc</groupId> + <artifactId>genjavadoc-plugin_${scala.version}</artifactId> + <version>0.8</version> + </compilerPlugin> + </compilerPlugins> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${project.build.directory}/genjavadoc</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId>
