diff options
| author | Shawn Pearce <sop@google.com> | 2013-10-08 10:02:06 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-10-08 10:02:06 -0700 |
| commit | 4ab88724fe155aa7efb1aafe3fe00733e690ecf0 (patch) | |
| tree | bc7e87c2dfaa87bc74277f31f7876741987816b0 | |
| parent | 6f2efb9b5fe632f77ca2ca654249d2b339a88543 (diff) | |
| parent | c2e9684b8f797968260ccc40883f822244aafdcb (diff) | |
Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Fix javadoc generation for gerrit extension and plugin API
| -rw-r--r-- | gerrit-extension-api/pom.xml | 73 | ||||
| -rw-r--r-- | gerrit-plugin-api/pom.xml | 74 |
2 files changed, 66 insertions, 81 deletions
diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 33e6f397a0..31fccc0ccf 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -83,46 +83,39 @@ limitations under the License. </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-artifact-sources</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>gerrit-extension-api</artifactId> - <version>${project.version}</version> - <classifier>all-sources</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/unpack_sources</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <sourcepath>${project.build.directory}/unpack_sources</sourcepath> - <encoding>ISO-8859-1</encoding> - <quiet>true</quiet> - <detectOfflineLinks>false</detectOfflineLinks> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>process-resources</phase> - </execution> - </executions> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>unpack-sources</id> + <phase>package</phase> + <configuration> + <tasks> + <unzip src="${project.build.directory}/${project.artifactId}-${project.version}-all-sources.jar" dest="${project.build.directory}/unpack_sources" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <sourcepath>${project.build.directory}/unpack_sources</sourcepath> + <encoding>ISO-8859-1</encoding> + <quiet>true</quiet> + <detectOfflineLinks>false</detectOfflineLinks> + </configuration> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 2b86363011..0bfc55d082 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -119,47 +119,39 @@ limitations under the License. </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-artifact-sources</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>gerrit-plugin-api</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/unpack_sources</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.7</version> - <configuration> - <sourcepath>${project.build.directory}/unpack_sources</sourcepath> - <encoding>ISO-8859-1</encoding> - <quiet>true</quiet> - <detectOfflineLinks>false</detectOfflineLinks> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>process-resources</phase> - </execution> - </executions> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>unpack-sources</id> + <phase>package</phase> + <configuration> + <tasks> + <unzip src="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" dest="${project.build.directory}/unpack_sources" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <sourcepath>${project.build.directory}/unpack_sources</sourcepath> + <encoding>ISO-8859-1</encoding> + <quiet>true</quiet> + <detectOfflineLinks>false</detectOfflineLinks> + </configuration> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + </execution> + </executions> </plugin> </plugins> </build> |