From f4eb38f9fe3dd3ccf1767abe6a79b91535bfc839 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 25 May 2023 08:19:06 +0200 Subject: [PATCH 1/3] 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 (cherry picked from commit 0f071a7bcee1f551652b2ae017f3e0e134c7eb74) --- .bazelversion | 2 +- .../tst/org/eclipse/jgit/api/ArchiveCommandTest.java | 8 ++------ tools/BUILD | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.bazelversion b/.bazelversion index 0062ac971..6abaeb2f9 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 f2cceac4b..411eab3e7 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 @@ private void archiveHeadAllFilesWithCompression(String fmt) throws Exception { File archive = new File(getTemporaryDirectory(), "archive." + format); - archive(git, archive, fmt, new HashMap() {{ - put("compression-level", 1); - }}); + archive(git, archive, fmt, Map.of("compression-level", 1)); int sizeCompression1 = getNumBytes(archive); - archive(git, archive, fmt, new HashMap() {{ - 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 1e671087d..dd081d917 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", From a80130d655a6f0973c1783ffa4cf280b2c434696 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 25 May 2023 08:49:44 +0200 Subject: [PATCH 2/3] Bazel: Fix remote build execution for Java 17 Bazel build and test with remote17 configuration was actually executed locally, and not remotely. Rename remote configuration setting for Java 11 from remote to remote11 and derive the common remote configuration settings for remote11 and remote17 configurations. Also remove deprecated --host_javabase and --javabase options. Test Plan: Verify that the remote build for Java 17 is actually executed remotely: $ bazel test --config=remote17 --remote_instance_name=$PROJECT_NAME \ org.eclipse.jgit.test/... Change-Id: I10ad8c1d28c92fed9e465c2d36770ed4fb2940c3 --- .bazelrc | 10 ++++++---- tools/remote-bazelrc | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bazelrc b/.bazelrc index e6c3dc6ab..5e1df6291 100644 --- a/.bazelrc +++ b/.bazelrc @@ -11,10 +11,11 @@ build --tool_java_language_version=11 build --tool_java_runtime_version=remotejdk_11 # Builds and executes on RBE using remotejdk_11 -build:remote --java_language_version=11 -build:remote --java_runtime_version=remotejdk_11 -build:remote --tool_java_language_version=11 -build:remote --tool_java_runtime_version=remotejdk_11 +build:remote11 --java_language_version=11 +build:remote11 --java_runtime_version=remotejdk_11 +build:remote11 --tool_java_language_version=11 +build:remote11 --tool_java_runtime_version=remotejdk_11 +build:remote11 --config=remote # Builds using remote_jdk17, executes using remote_jdk11 or local_jdk build:java17 --java_language_version=17 @@ -27,6 +28,7 @@ build:remote17 --java_language_version=17 build:remote17 --java_runtime_version=remotejdk_17 build:remote17 --tool_java_language_version=17 build:remote17 --tool_java_runtime_version=remotejdk_17 +build:remote17 --config=remote test --build_tests_only test --test_output=errors diff --git a/tools/remote-bazelrc b/tools/remote-bazelrc index 58f794e18..0c558f813 100644 --- a/tools/remote-bazelrc +++ b/tools/remote-bazelrc @@ -30,8 +30,6 @@ build:remote --disk_cache= # Set several flags related to specifying the platform, toolchain and java # properties. -build:remote --host_javabase=@rbe_jdk11//java:jdk -build:remote --javabase=@rbe_jdk11//java:jdk build:remote --crosstool_top=@rbe_jdk11//cc:toolchain build:remote --extra_toolchains=@rbe_jdk11//config:cc-toolchain build:remote --extra_execution_platforms=@rbe_jdk11//config:platform From 6f4f7e911fffd9221449c7f781ad66c29cc616b7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 9 Jun 2023 10:52:45 +0200 Subject: [PATCH 3/3] Update Orbit to R20230531010532 for 2023-06 Change-Id: I844efc4bec153931f0a7b3c694bade4f5b166295 --- .../org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.17.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.18.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.19.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.20.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.21.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.22.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.23.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.24.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.25.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.26.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.27.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.28.tpd | 2 +- .../{S20230516204213.tpd => R20230531010532-2023-06.tpd} | 4 ++-- 25 files changed, 38 insertions(+), 38 deletions(-) rename org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/{S20230516204213.tpd => R20230531010532-2023-06.tpd} (94%) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 1ada7c11e..04ff3f5af 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd index 78161df50..2560b0cb0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd @@ -1,6 +1,6 @@ target "jgit-4.17" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2020-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index edbcb9c66..156cfd66d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd index 2083edd4c..de0655fe9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd @@ -1,6 +1,6 @@ target "jgit-4.18" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2020-12/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index ab8a6900b..14b15fae5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd index 11dd59741..9f1802ded 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd @@ -1,6 +1,6 @@ target "jgit-4.19-staging" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2021-03/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index a63b81c83..0d7b240e7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd index 36785e4a5..97a5e8226 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd @@ -1,6 +1,6 @@ target "jgit-4.20" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2021-06/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 0d19b4d0e..94f671db8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd index fa94da9a7..be434747b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd @@ -1,6 +1,6 @@ target "jgit-4.21" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2021-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 41f4f47bd..e14dd3013 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd index 7cef33268..2f8f60ec9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd @@ -1,6 +1,6 @@ target "jgit-4.22" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2021-12/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 6afaf05ae..5455f076e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd index f76808ba3..a4a1c5287 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd @@ -1,6 +1,6 @@ target "jgit-4.23" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2022-03/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 128102d5d..c383bce28 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd index b6f0624f2..980e7f99b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd @@ -1,6 +1,6 @@ target "jgit-4.24" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2022-06/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 1d6747a48..185b543b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd index e283a4108..c6f636efb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd @@ -1,6 +1,6 @@ target "jgit-4.25" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2022-09/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index aa992e534..811eb849d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd index 830e13c3e..1e2c19a80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd @@ -1,6 +1,6 @@ target "jgit-4.26" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2022-12/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index dd7f15fc7..a1e02e7cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd index e37f9fa03..bbb4baf5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd @@ -1,6 +1,6 @@ target "jgit-4.27" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/releases/2023-03/" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 2c899e8cd..cd8f781a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd index 0b359acfd..46185ca91 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd @@ -1,6 +1,6 @@ target "jgit-4.28" with source configurePhase -include "orbit/S20230516204213.tpd" +include "orbit/R20230531010532-2023-06.tpd" include "maven/dependencies.tpd" location "https://download.eclipse.org/staging/2023-06" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20230516204213.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd similarity index 94% rename from org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20230516204213.tpd rename to org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd index 8c6032bc6..089981c95 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20230516204213.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd @@ -1,7 +1,7 @@ -target "S20230516204213" with source configurePhase +target "R20230531010532-2023-06" with source configurePhase // see https://download.eclipse.org/tools/orbit/downloads/ -location "https://download.eclipse.org/tools/orbit/downloads/drops/S20230516204213/repository" { +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" { com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820]