summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2023-05-25 08:19:06 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2023-05-29 18:39:59 +0200
commit0f071a7bcee1f551652b2ae017f3e0e134c7eb74 (patch)
treea585e493ddc3a9d2822bfcb4ab2373fc473bd05c
parenta9520419e222fe26a42575d1568a041d7e2bd0e5 (diff)
downloadjgit-0f071a7bcee1f551652b2ae017f3e0e134c7eb74.tar.gz
jgit-0f071a7bcee1f551652b2ae017f3e0e134c7eb74.zip
Bump bazel vesion to 6.2.0
Also demote severity level for bug pattern: PreferredInterfaceType, aka MutableConstantField: [1] from error to warning. Also fix DoubleBraceInitialization error prone bug pattern [2]. [1] https://errorprone.info/bugpattern/PreferredInterfaceType [2] https://errorprone.info/bugpattern/DoubleBraceInitialization Change-Id: I04b7d0792e67cbc51e3939bd47c2ea13a685cf0d
-rw-r--r--.bazelversion2
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java8
-rw-r--r--tools/BUILD2
3 files changed, 4 insertions, 8 deletions
diff --git a/.bazelversion b/.bazelversion
index 0062ac9718..6abaeb2f90 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-5.0.0
+6.2.0
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java
index f2cceac4b3..411eab3e7e 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java
@@ -261,14 +261,10 @@ public class ArchiveCommandTest extends RepositoryTestCase {
File archive = new File(getTemporaryDirectory(),
"archive." + format);
- archive(git, archive, fmt, new HashMap<String, Object>() {{
- put("compression-level", 1);
- }});
+ archive(git, archive, fmt, Map.of("compression-level", 1));
int sizeCompression1 = getNumBytes(archive);
- archive(git, archive, fmt, new HashMap<String, Object>() {{
- put("compression-level", 9);
- }});
+ archive(git, archive, fmt, Map.of("compression-level", 9));
int sizeCompression9 = getNumBytes(archive);
assertTrue(sizeCompression1 > sizeCompression9);
diff --git a/tools/BUILD b/tools/BUILD
index 1e671087d6..dd081d9178 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -68,7 +68,7 @@ java_package_configuration(
"-Xep:LiteralClassName:ERROR",
"-Xep:MissingFail:ERROR",
"-Xep:MissingOverride:ERROR",
- "-Xep:MutableConstantField:ERROR",
+ "-Xep:MutableConstantField:WARN",
"-Xep:NarrowingCompoundAssignment:ERROR",
"-Xep:NonAtomicVolatileUpdate:ERROR",
"-Xep:NonOverridingEquals:ERROR",