From 8a76b132cde6ac266f1471716bb74a26fd713a1f Mon Sep 17 00:00:00 2001
From: Julian Dolby <dolby@us.ibm.com>
Date: Wed, 2 Aug 2017 14:56:04 +0000
Subject: [PATCH] try new way to make javadoc

---
 .travis.yml | 2 +-
 pom.xml     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c0a466cc..8ac2ab5a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
 script:
 - xvfb-run mvn clean install -B -q
 - bash ./dependent-projects-trigger.sh $AUTH_TOKEN
-- mvn generate-sources -B -q
+- mvn javadoc:aggregate -B -q
 - bash ./upload-javascript.sh $GH_TOKEN
 - ./build-maven-jars.py "install -Dgpg.skip"
 sudo: false
diff --git a/pom.xml b/pom.xml
index 49785da7d..1918dd8a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,6 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>3.0.0-M1</version>
             <configuration>
-	      <aggregate>true</aggregate>
               <additionalparam>-Xdoclint:none</additionalparam>
             </configuration>
             <executions>
@@ -254,7 +253,7 @@
                     <goals>
                         <goal>javadoc</goal>
                     </goals>
-                    <phase>generate-sources</phase>
+                    <phase>generate-resources</phase>
                 </execution>
             </executions>
         </plugin>