From: Matthias Sohn <matthias.sohn@sap.com>
Date: Sat, 6 Oct 2018 17:14:35 +0000 (+0200)
Subject: Merge branch 'stable-5.1'
X-Git-Tag: v5.2.0.201811281532-m3~117
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1133faff8ca980b688e79a3fcadd1641ff6b3bcd;p=jgit.git

Merge branch 'stable-5.1'

* stable-5.1:
  Prepare 5.1.3-SNAPSHOT builds
  JGit v5.1.2.201810061102-r
  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
  Revert "Configure WindowCache settings to use in JGit CLI"

Change-Id: I833d30d6de75b097377872c000b2ef5a1b96cf89
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

1133faff8ca980b688e79a3fcadd1641ff6b3bcd
diff --cc org.eclipse.jgit.junit/.settings/.api_filters
index e5de787fa6,e5de787fa6..0000000000
deleted file mode 100644,100644
--- a/org.eclipse.jgit.junit/.settings/.api_filters
+++ /dev/null
@@@ -1,35 -1,35 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<component id="org.eclipse.jgit.junit" version="2">
--    <resource path="src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java" type="org.eclipse.jgit.junit.LocalDiskRepositoryTestCase">
--        <filter comment="Don't care about non-API in tests." id="643842064">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="LocalDiskRepositoryTestCase"/>
--                <message_argument value="createBareRepository()"/>
--            </message_arguments>
--        </filter>
--        <filter comment="Don't care about non-API in tests." id="643842064">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="LocalDiskRepositoryTestCase"/>
--                <message_argument value="createRepository(boolean, boolean)"/>
--            </message_arguments>
--        </filter>
--        <filter comment="Don't care about non-API in tests." id="643842064">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="LocalDiskRepositoryTestCase"/>
--                <message_argument value="createWorkRepository()"/>
--            </message_arguments>
--        </filter>
--    </resource>
--    <resource path="src/org/eclipse/jgit/junit/RepositoryTestCase.java" type="org.eclipse.jgit.junit.RepositoryTestCase">
--        <filter comment="Don't care about non-API in tests." id="627060751">
--            <message_arguments>
--                <message_argument value="FileRepository"/>
--                <message_argument value="RepositoryTestCase"/>
--                <message_argument value="db"/>
--            </message_arguments>
--        </filter>
--    </resource>
--</component>
diff --cc org.eclipse.jgit/.settings/.api_filters
index cc68ac9a46,282d7e8962..e4b7ba7794
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,11 -1,27 +1,27 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
 -    <resource path="META-INF/MANIFEST.MF">
 -        <filter id="924844039">
 -            <message_arguments>
 -                <message_argument value="5.1.2"/>
 -                <message_argument value="5.1.0"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
+     <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry">
+         <filter id="1109393411">
+             <message_arguments>
+                 <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>
 +    <resource path="src/org/eclipse/jgit/revwalk/DepthWalk.java" type="org.eclipse.jgit.revwalk.DepthWalk">
 +        <filter id="404000815">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 +                <message_argument value="getDeepenSince()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
  </component>