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:25:35 UTC

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

Repository: flink
Updated Branches:
  refs/heads/release-0.9 2b5f88a4b -> 9178a58bb


[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/9178a58b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9178a58b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9178a58b

Branch: refs/heads/release-0.9
Commit: 9178a58bbc3db1e89b0814b5351f9c5a7e3c1de4
Parents: 2b5f88a
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:25:00 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/flink/blob/9178a58b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a83d6d7..36a7b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,7 +445,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