]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.6' 98/154298/1
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 11 Dec 2019 13:41:04 +0000 (14:41 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 11 Dec 2019 13:41:04 +0000 (14:41 +0100)
* stable-5.6:
  Prepare 5.6.1-SNAPSHOT builds
  JGit v5.6.0.201912101111-r

Change-Id: I7824278560d828e1c6e2d540e3372e19507a39c0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit.benchmarks/.classpath
org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs

index 438d155e3184d4a4ce77f8d66407a4f927b7c0d0,438d155e3184d4a4ce77f8d66407a4f927b7c0d0..8b345f223736d83b99c547390cf5b29e2c259a74
        <classpathentry kind="src" path=".apt_generated">
                <attributes>
                        <attribute name="optional" value="true"/>
--                      <attribute name="maven.pomderived" value="true"/>
--                      <attribute name="ignore_optional_problems" value="true"/>
--                      <attribute name="m2e-apt" value="true"/>
--              </attributes>
--      </classpathentry>
--      <classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
--              <attributes>
--                      <attribute name="optional" value="true"/>
--                      <attribute name="maven.pomderived" value="true"/>
--                      <attribute name="ignore_optional_problems" value="true"/>
--                      <attribute name="m2e-apt" value="true"/>
                </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>
index b276e89ac2e7620d867217925a16bb3136f9b643,b276e89ac2e7620d867217925a16bb3136f9b643..74bb483964cfc58aaec7b3ff28e2da4fccc3c4fe
@@@ -28,6 -28,6 +28,7 @@@ org.eclipse.jdt.core.compiler.problem.d
  org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
  org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
  org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
++org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
  org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
  org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
  org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@@ -86,6 -86,6 +87,7 @@@ org.eclipse.jdt.core.compiler.problem.r
  org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
  org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
  org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
++org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
  org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
  org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
  org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled