diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 16:56:12 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 16:56:12 +0200 |
| commit | dff99a272a96777a445cf4e822ffc22067222ce9 (patch) | |
| tree | 06349d3a7eff369372dd15e41f9575805faa8da0 /pom.xml | |
| parent | 9dbb18291fc680ec9326b866f133b233093d800f (diff) | |
| parent | 23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd (diff) | |
| download | jgit-dff99a272a96777a445cf4e822ffc22067222ce9.tar.gz jgit-dff99a272a96777a445cf4e822ffc22067222ce9.zip | |
Merge branch 'stable-5.0' into stable-5.1
* stable-5.0:
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 todos in SubmoduleAddTest
Change-Id: I53272081094b8948a40a1ce409af08b6ef330c1e
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
@@ -475,7 +475,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> @@ -554,7 +554,7 @@ </reportSet> </reportSets> <configuration> - <additionalparam>-Xdoclint:none</additionalparam> + <additionalJOption>-Xdoclint:-missing</additionalJOption> </configuration> </plugin> <plugin> |