From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sat, 6 Oct 2018 12:44:12 +0000 (+0200)
Subject: Merge branch 'stable-4.11' into stable-5.0
X-Git-Tag: v5.1.2.201810061102-r~1^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd;p=jgit.git

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>
---

23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd
diff --cc org.eclipse.jgit/.settings/.api_filters
index e7ea220dca,eb2ed7dabb..089510ac51
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -3,14 -3,33 +3,24 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="5.0.3"/>
 -                <message_argument value="4.11.2"/>
 -                <message_argument value="4.11.0"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
 -        <filter id="1141899266">
 -            <message_arguments>
 -                <message_argument value="4.7"/>
 -                <message_argument value="4.11"/>
 -                <message_argument value="LOCK_SUFFIX"/>
++                <message_argument value="5.0.4"/>
 +                <message_argument value="5.0.0"/>
              </message_arguments>
          </filter>
-         <filter id="924844039">
+     </resource>
+     <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry">
+         <filter id="1109393411">
              <message_arguments>
-                 <message_argument value="5.0.4"/>
-                 <message_argument value="5.0.0"/>
+                 <message_argument value="4.7.5"/>
+                 <message_argument value="org.eclipse.jgit.lib.GitmoduleEntry"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/lib/ObjectChecker.java" type="org.eclipse.jgit.lib.ObjectChecker">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="4.7.5"/>
+                 <message_argument value="getGitsubmodules()"/>
              </message_arguments>
          </filter>
      </resource>
diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index c8b24f559f,4a933d42f8..bbea8a3d24
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@@ -365,8 -362,8 +365,9 @@@ invalidCommitParentNumber=Invalid commi
  invalidDepth=Invalid depth: {0}
  invalidEncryption=Invalid encryption
  invalidExpandWildcard=ExpandFromSource on a refspec that can have mismatched wildcards does not make sense.
 +invalidFilter=Invalid filter: {0}
  invalidGitdirRef = Invalid .git reference in file ''{0}''
+ invalidGitModules=Invalid .gitmodules file
  invalidGitType=invalid git type: {0}
  invalidId=Invalid id: {0}
  invalidId0=Invalid id
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 94b4e03bc5,5af25aa28f..18f4c85d88
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@@ -426,8 -423,8 +426,9 @@@ public class JGitText extends Translati
  	/***/ public String invalidDepth;
  	/***/ public String invalidEncryption;
  	/***/ public String invalidExpandWildcard;
 +	/***/ public String invalidFilter;
  	/***/ public String invalidGitdirRef;
+ 	/***/ public String invalidGitModules;
  	/***/ public String invalidGitType;
  	/***/ public String invalidId;
  	/***/ public String invalidId0;
diff --cc pom.xml
index 25c923d373,72bab00364..334784796e
--- a/pom.xml
+++ b/pom.xml
@@@ -538,23 -596,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>
++          <additionalJOption>-Xdoclint:-missing</additionalJOption>
 +        </configuration>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>