]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.11' into stable-5.0 99/130499/4
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 6 Oct 2018 12:44:12 +0000 (14:44 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 6 Oct 2018 14:40:46 +0000 (16:40 +0200)
commit23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd
treed5375fb6f0bd9f1f2f09f834cd9b880283f3dcdf
parent7893fcb0b480e5a59b72dd98757aab21777ceb33
parent620370ab6ad850862d0cfa1816c1fff0cbce3662
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>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
pom.xml