diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-12-11 14:41:04 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-12-11 14:41:04 +0100 |
| commit | 5959ab11168b8f83be904efcabfd2270aac1921f (patch) | |
| tree | 99bda5c9fc8d9e9c3b6c7a5e36662a614a0dfe71 | |
| parent | ba7f9c06125fb2075007faf2f7e822014a71c4fe (diff) | |
| parent | 4cb80f897fff0c411fe195a14bc8ab522230c102 (diff) | |
| download | jgit-5959ab11168b8f83be904efcabfd2270aac1921f.tar.gz jgit-5959ab11168b8f83be904efcabfd2270aac1921f.zip | |
Merge branch 'stable-5.6'
* 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>
| -rw-r--r-- | org.eclipse.jgit.benchmarks/.classpath | 11 | ||||
| -rw-r--r-- | org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/org.eclipse.jgit.benchmarks/.classpath b/org.eclipse.jgit.benchmarks/.classpath index 438d155e31..8b345f2237 100644 --- a/org.eclipse.jgit.benchmarks/.classpath +++ b/org.eclipse.jgit.benchmarks/.classpath @@ -19,17 +19,6 @@ <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"/> diff --git a/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs index b276e89ac2..74bb483964 100644 --- a/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs @@ -28,6 +28,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled 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 +87,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn 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 |