From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 11 Jun 2019 21:09:19 +0000 (+0200)
Subject: Merge branch 'master' into stable-5.4
X-Git-Tag: v5.4.0.201906121030-r~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c177c6f4c53eb8d42bc3de81a8d914949e6ab5aa;p=jgit.git

Merge branch 'master' into stable-5.4

* master:
  Handle missing "ours" stage in WorkingTreeIterator.hasCrLfInIndex()
  Config: Add helper method to check for empty value
  ErrorProne: Increase severity of FutureReturnValueIgnored to ERROR
  FS_Win32: Add missing parentheses on if-blocks
  Upgrade spotbugs to 3.1.12
  Abbreviated{Long}ObjectId: Make operator precedence explicit
  GC: Update TODO comments
  FS_POSIX: Fix reference comparison of Boolean.FALSE
  Increase bazel timeout for long running tests
  Use bazelisk to switch between used bazel version
  Bump minimum Bazel version to 0.26.1
  Bazel: Bump skylib library version to 0.8.0
  Retry loading config when locked by another process
  Make pull --rebase on an unborn branch do a checkout
  Warn if configured cookie file is missing
  Handle escaped CR-LF in git config files
  DescribeCommand: use glob match instead of path match
  Fix off-by-one error in RebaseTodoFile when reading a todo file
  Consistently use "!isEmpty()" to detect non-empty list
  TransportHttp: Check for non-empty list with "!isEmpty()" rather than
    "size() > 0"
  TransportHttp: Fix comparison of size with ">= 0"
  NetscapeCookieFileTest: Split HttpCookiesMatcher to own class
  Bazel: Add missing dependency on mockito for TransportHttpTest
  Determine hard-linking and nlink support per FileStore
  Support reading and writing cookies.
  Repository: Add getIdentifier() method to avoid instanceof operator
  Update to Orbit R20190602212107
  PacketLineIn: Deprecate the END constant
  PacketLineIn: Add an iterator over strings in the input stream
  Replace most usages of PacketLineIn.END with PacketLineIn.end()
  PacketLineIn: Deprecate DELIM constant
  Replace trivial reference comparison of PacketLineIn.{DELIM,END}
  PacketLineIn: Rename isDelim to isDelimiter
  ProtocolV2ParserTest: Fix typo in comment
  Upgrade Bouncy Castle to 1.61
  Update to Orbit R20190531194818 and rollback update to Ant 1.10.6
  cli: Add the --always option to describe
  DescribeCommand: Support the "always" option
  cli: Add the --tags option to describe
  DescribeCommand: Consistenly omit the default value
  Remove excess blank line in FileUtilsTest
  PacketLineIn: Add helper methods to check for END and DELIM
  UploadPackTest: Rename variable to avoid hiding class member
  UploadPackTest: Add missing <> operator on instantiation of ArrayList
  BitmapCalculator: javadoc fixes
  RevWalkUtils: add progress callback to findBranchesReachableFrom
  Upgrade maven-source-plugin to 3.1.0
  Upgrade maven-jar-plugin to 3.1.2
  Upgrade jacoco-maven-plugin to 0.8.4
  BitmapCalculator and its test: add missing license header
  RevWalk: new method createReachabilityChecker()

Change-Id: I4d76c7c0dbe6411c842f3468b709f7df51789c08
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

c177c6f4c53eb8d42bc3de81a8d914949e6ab5aa
diff --cc org.eclipse.jgit/.settings/.api_filters
index 6719570e05,ed36dde8b3..fc326d4462
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -94,6 -46,6 +102,26 @@@
              </message_arguments>
          </filter>
      </resource>
++    <resource path="src/org/eclipse/jgit/transport/HttpConfig.java" type="org.eclipse.jgit.transport.HttpConfig">
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.HttpConfig"/>
++                <message_argument value="COOKIE_FILE_CACHE_LIMIT_KEY"/>
++            </message_arguments>
++        </filter>
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.HttpConfig"/>
++                <message_argument value="COOKIE_FILE_KEY"/>
++            </message_arguments>
++        </filter>
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.HttpConfig"/>
++                <message_argument value="SAVE_COOKIES_KEY"/>
++            </message_arguments>
++        </filter>
++    </resource>
      <resource path="src/org/eclipse/jgit/transport/Transport.java" type="org.eclipse.jgit.transport.Transport">
          <filter comment="Marked as final since overriding a deprecated stub is likely a mistake" id="421654647">
              <message_arguments>
diff --cc tools/BUILD
index f0342ad75a,abf6c9dc0b..38daececbe
--- a/tools/BUILD
+++ b/tools/BUILD
@@@ -34,52 -32,52 +34,52 @@@ java_package_configuration
          "-Xep:ClassCanBeStatic:ERROR",
          "-Xep:ClassNewInstance:WARN",
          "-Xep:DefaultCharset:ERROR",
 -        "-Xep:DoubleCheckedLocking:WARN",
 -        "-Xep:ElementsCountedInLoop:WARN",
 -        "-Xep:EqualsHashCode:WARN",
 -        "-Xep:EqualsIncompatibleType:WARN",
 +        "-Xep:DoubleCheckedLocking:ERROR",
 +        "-Xep:ElementsCountedInLoop:ERROR",
 +        "-Xep:EqualsHashCode:ERROR",
 +        "-Xep:EqualsIncompatibleType:ERROR",
          "-Xep:ExpectedExceptionChecker:ERROR",
          "-Xep:Finally:WARN",
 -        "-Xep:FloatingPointLiteralPrecision:WARN",
 -        "-Xep:FragmentInjection:WARN",
 -        "-Xep:FragmentNotInstantiable:WARN",
 -        "-Xep:FunctionalInterfaceClash:WARN",
 +        "-Xep:FloatingPointLiteralPrecision:ERROR",
 +        "-Xep:FragmentInjection:ERROR",
 +        "-Xep:FragmentNotInstantiable:ERROR",
 +        "-Xep:FunctionalInterfaceClash:ERROR",
-         "-Xep:FutureReturnValueIgnored:WARN",
+         "-Xep:FutureReturnValueIgnored:ERROR",
 -        "-Xep:GetClassOnEnum:WARN",
 -        "-Xep:ImmutableAnnotationChecker:WARN",
 +        "-Xep:GetClassOnEnum:ERROR",
 +        "-Xep:ImmutableAnnotationChecker:ERROR",
          "-Xep:ImmutableEnumChecker:WARN",
 -        "-Xep:IncompatibleModifiers:WARN",
 -        "-Xep:InjectOnConstructorOfAbstractClass:WARN",
 -        "-Xep:InputStreamSlowMultibyteRead:WARN",
 -        "-Xep:IterableAndIterator:WARN",
 -        "-Xep:JUnit3FloatingPointComparisonWithoutDelta:WARN",
 -        "-Xep:JUnitAmbiguousTestClass:WARN",
 -        "-Xep:LiteralClassName:WARN",
 +        "-Xep:IncompatibleModifiers:ERROR",
 +        "-Xep:InjectOnConstructorOfAbstractClass:ERROR",
 +        "-Xep:InputStreamSlowMultibyteRead:ERROR",
 +        "-Xep:IterableAndIterator:ERROR",
 +        "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR",
 +        "-Xep:JUnitAmbiguousTestClass:ERROR",
 +        "-Xep:LiteralClassName:ERROR",
          "-Xep:MissingFail:ERROR",
 -        "-Xep:MissingOverride:WARN",
 -        "-Xep:MutableConstantField:WARN",
 +        "-Xep:MissingOverride:ERROR",
 +        "-Xep:MutableConstantField:ERROR",
          "-Xep:NarrowingCompoundAssignment:WARN",
 -        "-Xep:NonAtomicVolatileUpdate:WARN",
 +        "-Xep:NonAtomicVolatileUpdate:ERROR",
          "-Xep:NonOverridingEquals:WARN",
 -        "-Xep:NullableConstructor:WARN",
 -        "-Xep:NullablePrimitive:WARN",
 -        "-Xep:NullableVoid:WARN",
 +        "-Xep:NullableConstructor:ERROR",
 +        "-Xep:NullablePrimitive:ERROR",
 +        "-Xep:NullableVoid:ERROR",
          "-Xep:OperatorPrecedence:WARN",
 -        "-Xep:OverridesGuiceInjectableMethod:WARN",
 -        "-Xep:PreconditionsInvalidPlaceholder:WARN",
 -        "-Xep:ProtoFieldPreconditionsCheckNotNull:WARN",
 -        "-Xep:ProtocolBufferOrdinal:WARN",
 -        "-Xep:RequiredModifiers:WARN",
 +        "-Xep:OverridesGuiceInjectableMethod:ERROR",
 +        "-Xep:PreconditionsInvalidPlaceholder:ERROR",
 +        "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR",
 +        "-Xep:ProtocolBufferOrdinal:ERROR",
 +        "-Xep:RequiredModifiers:ERROR",
          "-Xep:ShortCircuitBoolean:WARN",
 -        "-Xep:SimpleDateFormatConstant:WARN",
 -        "-Xep:StaticGuardedByInstance:WARN",
 -        "-Xep:SynchronizeOnNonFinalField:WARN",
 -        "-Xep:TruthConstantAsserts:WARN",
 -        "-Xep:TypeParameterShadowing:WARN",
 +        "-Xep:SimpleDateFormatConstant:ERROR",
 +        "-Xep:StaticGuardedByInstance:ERROR",
 +        "-Xep:SynchronizeOnNonFinalField:ERROR",
 +        "-Xep:TruthConstantAsserts:ERROR",
 +        "-Xep:TypeParameterShadowing:ERROR",
          "-Xep:TypeParameterUnusedInFormals:WARN",
 -        "-Xep:URLEqualsHashCode:WARN",
 -        "-Xep:UnsynchronizedOverridesSynchronized:WARN",
 -        "-Xep:WaitNotInLoop:WARN",
 +        "-Xep:URLEqualsHashCode:ERROR",
 +        "-Xep:UnsynchronizedOverridesSynchronized:ERROR",
 +        "-Xep:WaitNotInLoop:ERROR",
      ],
      packages = ["error_prone_packages"],
  )