]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.1' into stable-5.2 51/148851/2
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 3 Sep 2019 21:41:03 +0000 (23:41 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 3 Sep 2019 22:08:21 +0000 (00:08 +0200)
* stable-5.1:
  Prepare 5.1.12-SNAPSHOT builds
  JGit v5.1.11.201909031202-r
  Prepare 4.11.10-SNAPSHOT builds
  JGit v4.11.9.201909030838-r
  Bazel: Update bazlets to the latest master revision
  Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file
  BatchRefUpdate: repro racy atomic update, and fix it
  Delete unused FileTreeIteratorWithTimeControl
  Fix RacyGitTests#testRacyGitDetection
  Change RacyGitTests to create a racy git situation in a stable way
  Silence API warnings

Change-Id: Iac5dc9683cea97db04d20f27c10f2e103d3ae7b5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
WORKSPACE
org.eclipse.jgit/.settings/.api_filters

diff --cc WORKSPACE
index 1796d3e8d691f0c13b4f40534fe442c2bd0b94ae,02de72021425667b968a23b22fdbfc5ec118e3b7..67b08d2a4dd5aae4b1478020cca41ac8a1ca373a
+++ b/WORKSPACE
@@@ -1,21 -1,8 +1,21 @@@
  workspace(name = "jgit")
  
 +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 +
 +http_archive(
 +    name = "bazel_skylib",
 +    sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d",
 +    strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b",
 +    urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
 +)
 +
 +load("@bazel_skylib//lib:versions.bzl", "versions")
 +
 +versions.check(minimum_bazel_version = "0.19.0")
 +
  load("//tools:bazlets.bzl", "load_bazlets")
  
- load_bazlets(commit = "8528a0df69dadf6311d8d3f81c1b693afda8bcf1")
+ load_bazlets(commit = "09a035e98077dce549d5f6a7472d06c4b8f792d2")
  
  load(
      "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
index cbb9de113de163c21a5ac4910e6c1c5f68072c1c,c62afb31edee202b53931da3ca8e675f54698ba2..857fcac17df6f00d503cbc67d037862b23386e8a
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
 -        <filter id="337768515">
++    <resource path="src/org/eclipse/jgit/gitrepo/RepoCommand.java" type="org.eclipse.jgit.gitrepo.RepoCommand$DefaultRemoteReader">
++        <filter id="338792546">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.gitrepo.RepoCommand.DefaultRemoteReader"/>
++                <message_argument value="readFile(String, String, String)"/>
++            </message_arguments>
++        </filter>
++        <filter id="338792546">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.gitrepo.RepoCommand.DefaultRemoteReader"/>
++                <message_argument value="readFileFromRepo(Repository, String, String)"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/gitrepo/RepoCommand.java" type="org.eclipse.jgit.gitrepo.RepoCommand$RemoteReader">
++        <filter id="403804204">
+             <message_arguments>
 -                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
++                <message_argument value="org.eclipse.jgit.gitrepo.RepoCommand.RemoteReader"/>
++                <message_argument value="readFileWithMode(String, String, String)"/>
+             </message_arguments>
+         </filter>
++    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
          <filter id="1142947843">
              <message_arguments>
                  <message_argument value="5.1.9"/>
              </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="403804204">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
++                <message_argument value="getDeepenNotFlag()"/>
++            </message_arguments>
++        </filter>
++        <filter id="404000815">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
++                <message_argument value="getDeepenNots()"/>
++            </message_arguments>
++        </filter>
++        <filter id="404000815">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
++                <message_argument value="getDeepenSince()"/>
++            </message_arguments>
++        </filter>
++    </resource>
      <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
          <filter id="336658481">
              <message_arguments>
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/transport/GitProtocolConstants.java" type="org.eclipse.jgit.transport.GitProtocolConstants">
 -        <filter id="337768515">
++    <resource path="src/org/eclipse/jgit/transport/RemoteSession.java" type="org.eclipse.jgit.transport.RemoteSession">
++        <filter id="404000815">
+             <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.GitProtocolConstants"/>
++                <message_argument value="org.eclipse.jgit.transport.RemoteSession"/>
++                <message_argument value="getFtpChannel()"/>
+             </message_arguments>
+         </filter>
+     </resource>
      <resource path="src/org/eclipse/jgit/transport/TransferConfig.java" type="org.eclipse.jgit.transport.TransferConfig">
          <filter id="1159725059">
              <message_arguments>
              </message_arguments>
          </filter>
      </resource>
++    <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection">
++        <filter id="403804204">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/>
++                <message_argument value="getHeaderFields(String)"/>
++            </message_arguments>
++        </filter>
++    </resource>
      <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator">
          <filter id="1142947843">
              <message_arguments>