Repository: flink Updated Branches: refs/heads/release-1.4 b3df579f0 -> 431ae36f7
[FLINK-7702] Remove Javadoc aggregation for Scala code genjavadoc generated some Java code that was making Javadoc fail. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6aeac3fb Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6aeac3fb Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6aeac3fb Branch: refs/heads/release-1.4 Commit: 6aeac3fb77c1053e344d08c0cc68e84a88623a43 Parents: b3df579 Author: Aljoscha Krettek <[email protected]> Authored: Fri Nov 10 16:28:46 2017 +0100 Committer: Aljoscha Krettek <[email protected]> Committed: Mon Nov 13 12:04:54 2017 +0100 ---------------------------------------------------------------------- pom.xml | 94 ++---------------------------------------------------------- 1 file changed, 2 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/6aeac3fb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 21ad7aa..5c04f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -738,99 +738,9 @@ under the License. </profile> <profile> - <!-- used for aggregating ScalaDoc with JavaDoc --> + <!-- Kept for backwards compatiblity, the doc buildbot expects + this profile to exist.--> <id>aggregate-scaladoc</id> - <dependencies> - <dependency> - <!-- - This is necessary for building the java docs using Java 8. Otherwise the javadoc - plugin will fail with "javadoc: error - - com.sun.tools.doclets.internal.toolkit.util.DocletAbortException: - com.sun.tools.javac.code.Symbol$CompletionFailure: - class file for akka.testkit.TestKit not found" - --> - <groupId>com.typesafe.akka</groupId> - <artifactId>akka-testkit_${scala.binary.version}</artifactId> - <version>${akka.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - <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> - <configuration> - <excludeDefaultDirectories>true</excludeDefaultDirectories> - <filesets> - <fileset> - <directory>${project.build.directory}</directory> - <includes> - <include>**/*.class</include> - <include>**/classes.*.timestamp</include> - </includes> - </fileset> - </filesets> - </configuration> - </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.10</version> - </compilerPlugin> - </compilerPlugins> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <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> - </plugins> - </build> </profile> <profile>
