Make doc generation consistent across projects

liferay · May 30, 2019 · d512182 · d512182
1 parent cd04d1a
commit d512182
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/alloy/pom.xml b/alloy/pom.xml
@@ -160,19 +160,36 @@
 			</build>
 		</profile>
 		<profile>
-			<id>generate-vdldoc</id>
+			<id>generate-docs</id>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.10.4</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>javadoc</goal>
+								</goals>
+								<phase>generate-resources</phase>
+								<configuration>
+									<destDir>${project.artifact.selectedVersion.majorVersion}.${project.artifact.selectedVersion.minorVersion}</destDir>
+									<reportOutputDirectory>${project.build.directory}/javadoc/alloy</reportOutputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.2.1</version>
+						<version>1.5.0</version>
 						<executions>
 							<execution>
 								<goals>
 									<goal>java</goal>
 								</goals>
-								<phase>prepare-package</phase>
+								<phase>generate-resources</phase>
 								<configuration>
 									<includePluginDependencies>true</includePluginDependencies>
 									<mainClass>org.omnifaces.vdldoc.Main</mainClass>
@@ -182,7 +199,7 @@
 										<argument>-doctitle</argument>
 										<argument>Liferay Faces Alloy View Description Language Documentation (VDLDoc)</argument>
 										<argument>-d</argument>
-										<argument>${project.build.directory}/vdldoc/${project.artifact.selectedVersion.majorVersion}.${project.artifact.selectedVersion.minorVersion}/</argument>
+										<argument>${project.build.directory}/vdldoc/alloy/${project.artifact.selectedVersion.majorVersion}.${project.artifact.selectedVersion.minorVersion}</argument>
 										<argument>${project.basedir}/src/main/resources/META-INF/alloy.taglib.xml</argument>
 									</arguments>
 									<executableDependency>