diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-06-24 00:19:47 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-06-24 00:25:34 +0200 |
| commit | f40b39345cd9b54473ee871bff401fe3d394ffe3 (patch) | |
| tree | fb5ddb177f9290f53a1b6d5b5482ad4d9b7a2f1e | |
| parent | 82ae431e45cc673aab147dde3e25402d5c9fe1b4 (diff) | |
| parent | a7ea275eaf5b84a8715715b99b22f13e8cd53384 (diff) | |
| download | jgit-f40b39345cd9b54473ee871bff401fe3d394ffe3.tar.gz jgit-f40b39345cd9b54473ee871bff401fe3d394ffe3.zip | |
Merge branch 'stable-5.0'
* stable-5.0:
Prepare 5.0.2-SNAPSHOT builds
JGit v5.0.1.201806211838-r
Add project-info reports to maven site
Fix maven site generation failing with javadoc errors
Change-Id: Iedbc4c777a6e724f487419e187e25cf7e3aa55d6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.jgit.test/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 36 |
2 files changed, 39 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c2fd83ed94..017db3df6c 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -62,6 +62,10 @@ JUnit tests for the core library. </description> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -484,7 +484,6 @@ </configuration> <executions> <execution> - <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> @@ -539,6 +538,23 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>${maven-javadoc-plugin-version}</version> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + </reports> + </reportSet> + <reportSet> + <id>aggregate</id> + <inherited>false</inherited> + <reports> + <report>aggregate</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -562,6 +578,24 @@ </reportsDirectories> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.9</version> + <reportSets> + <reportSet> + <reports> + <report>dependencies</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> </reporting> |