Author: [email protected]
Date: Wed Jan 18 16:12:19 2012
New Revision: 1933
Log:
[AMDATUOPENSOCIAL-180] Fixed configuration of rest doc generation, breaking the
build from the root folder with maven2
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
Modified: trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml Wed Jan 18
16:12:19 2012
@@ -99,27 +99,28 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
+ <inherited>false</inherited>
<executions>
<execution>
- <id>generate-rest-documentation</id>
+ <id>attach-javadocs</id>
<phase>compile</phase>
<goals>
- <goal>javadoc</goal>
+ <goal>jar</goal>
</goals>
- <configuration>
- <useStandardDocletOptions>false</useStandardDocletOptions>
- <doclet>org.amdatu.commons.restdoclet.RESTDoclet</doclet>
- <docletArtifact>
- <groupId>org.amdatu.commons</groupId>
- <artifactId>org.amdatu.commons.restdoclet</artifactId>
- <version>1.0.1</version>
- </docletArtifact>
- <debug>true</debug>
-
<subpackages>org.amdatu.opensocial.gadgetmanagement.rest</subpackages>
- <destDir>rest</destDir>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <useStandardDocletOptions>false</useStandardDocletOptions>
+ <doclet>org.amdatu.commons.restdoclet.RESTDoclet</doclet>
+ <docletArtifact>
+ <groupId>org.amdatu.commons</groupId>
+ <artifactId>org.amdatu.commons.restdoclet</artifactId>
+ <version>1.0.1</version>
+ </docletArtifact>
+ <debug>true</debug>
+
<subpackages>org.amdatu.opensocial.gadgetmanagement.rest</subpackages>
+ <destDir>${project.build.directory}/restdocs</destDir>
+ </configuration>
</plugin>
<plugin>
@@ -132,7 +133,7 @@
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Export-Package>org.amdatu.opensocial.gadgetmanagement</Export-Package>
<Include-Resource>
- {maven-resources}, {maven-dependencies},
static/help=target/site/apidocs/rest/html
+ {maven-resources}, {maven-dependencies},
static/help=target/restdocs/html
</Include-Resource>
</instructions>
</configuration>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
