diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 14:44:12 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 16:40:46 +0200 |
| commit | 23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd (patch) | |
| tree | d5375fb6f0bd9f1f2f09f834cd9b880283f3dcdf /pom.xml | |
| parent | 7893fcb0b480e5a59b72dd98757aab21777ceb33 (diff) | |
| parent | 620370ab6ad850862d0cfa1816c1fff0cbce3662 (diff) | |
| download | jgit-23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd.tar.gz jgit-23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd.zip | |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
Prepare 4.11.5-SNAPSHOT builds
JGit v4.11.4.201810060650-r
Fix configuration of maven-javadoc-plugin
Prepare 4.9.7-SNAPSHOT builds
JGit v4.9.6.201810051924-r
Prepare 4.7.6-SNAPSHOT builds
JGit v4.7.5.201810051826-r
BaseReceivePack: Validate incoming .gitmodules files
ObjectChecker: Report .gitmodules files found in the pack
SubmoduleAddCommand: Reject submodule URIs that look like cli options
* Fix configuration of maven-javadoc-plugin for site generation
Change-Id: Ic6ff8d324867ee41f15a5b890c7eee5092e8453e
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -474,7 +474,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <additionalparam>-Xdoclint:-missing</additionalparam> + <additionalJOption>-Xdoclint:-missing</additionalJOption> <encoding>${project.build.sourceEncoding}</encoding> <quiet>true</quiet> <excludePackageNames>org.eclipse.jgit.http.test</excludePackageNames> @@ -553,7 +553,7 @@ </reportSet> </reportSets> <configuration> - <additionalparam>-Xdoclint:none</additionalparam> + <additionalJOption>-Xdoclint:-missing</additionalJOption> </configuration> </plugin> <plugin> |