You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/10/28 17:10:27 UTC

[2/2] flink git commit: [FLINK-1610][docs] fix javadoc building for aggregate-scaladoc profile

[FLINK-1610][docs] fix javadoc building for aggregate-scaladoc profile


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2b8303cd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2b8303cd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2b8303cd

Branch: refs/heads/master
Commit: 2b8303cdca926f42a7fc4b80ea7a58244ba55384
Parents: a39aa52
Author: Maximilian Michels <mx...@apache.org>
Authored: Wed Oct 28 17:03:08 2015 +0100
Committer: Maximilian Michels <mx...@apache.org>
Committed: Wed Oct 28 17:09:33 2015 +0100

----------------------------------------------------------------------
 pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/2b8303cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d6b9be..0afa7b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -464,7 +464,23 @@ under the License.
 		<profile>
 			<!-- used for aggregating  ScalaDoc with JavaDoc -->
 			<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