From 76b979248d8681ddd9e4d63e4e4f37ecb2dc26c5 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Sat, 15 Apr 2023 10:18:19 +0200 Subject: ProjectState: simplify the 'getPluginConfig' method The method was shortened and simplified to the single point of return. In addition 2 calls to `getPluginConfigs` cache (exists and get) were reduced to a single get and check if return is `null`. Release-Notes: skip Change-Id: Ibfaaa11bddb1e7811733b1641848d899aeafb1fe --- java/com/google/gerrit/server/project/ProjectState.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java index 6352f669f7..b350f3c7e0 100644 --- a/java/com/google/gerrit/server/project/ProjectState.java +++ b/java/com/google/gerrit/server/project/ProjectState.java @@ -475,19 +475,19 @@ public class ProjectState { * {@code PluginConfig#withInheritance(ProjectState.Factory)} */ public PluginConfig getPluginConfig(String pluginName) { - if (getConfig().getPluginConfigs().containsKey(pluginName)) { - Config config = new Config(); + Config config = new Config(); + String cachedPluginConfig = getConfig().getPluginConfigs().get(pluginName); + if (cachedPluginConfig != null) { try { - config.fromText(getConfig().getPluginConfigs().get(pluginName)); + config.fromText(cachedPluginConfig); } catch (ConfigInvalidException e) { // This is OK to propagate as IllegalStateException because it's a programmer error. // The config was converted to a String using Config#toText. So #fromText must not // throw a ConfigInvalidException throw new IllegalStateException("invalid plugin config for " + pluginName, e); } - return PluginConfig.create(pluginName, config, getConfig()); } - return PluginConfig.create(pluginName, new Config(), getConfig()); + return PluginConfig.create(pluginName, config, getConfig()); } public Optional getBranchOrderSection() { -- cgit v1.2.3 From cc386031455272cc57b20174469353677e279d9c Mon Sep 17 00:00:00 2001 From: Darius Jokilehto Date: Fri, 21 Apr 2023 14:53:45 +0100 Subject: Log external ID differential cache loader failure We've investigated this issue and tried different ways of getting this to fail, but haven't been successful. We've investigated the algorithm, but haven't found any faults. We also considered concurrency, but as we lock the cache before calling the differential loader, we're not sure how that could be the issue. We've managed to recreate the issue by fudging the input to the private method, where we pass a key to `additions` that is already present in the cache, but we don't see how that would be possible from the public `load` entrypoint. In order to continue the investigation we require more information, we have opted to add some further logs when the differential cache loader errors. We now log the tip of the external ID cache as well as the external ID ref on disk. We also log the set of additions, to confirm a key clash. Bug: Issue 16384 Release-Notes: skip Change-Id: I3836f28285b4fdcfd2e26720bdbf82cf046960c7 --- .../server/account/externalids/ExternalIdCacheLoader.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java b/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java index 27672bdcf6..43e316a978 100644 --- a/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java +++ b/java/com/google/gerrit/server/account/externalids/ExternalIdCacheLoader.java @@ -43,7 +43,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; @@ -184,8 +186,17 @@ public class ExternalIdCacheLoader { } } - AllExternalIds allExternalIds = - buildAllExternalIds(repo, oldExternalIds, additions, removals); + AllExternalIds allExternalIds; + try { + allExternalIds = buildAllExternalIds(repo, oldExternalIds, additions, removals); + } catch (IllegalArgumentException e) { + Set additionKeys = + additions.keySet().stream().map(AnyObjectId::getName).collect(Collectors.toSet()); + logger.atSevere().withCause(e).log( + "Failed to load external ID cache. Repository ref is %s, cache ref is %s, additions are %s", + extIdRef.getObjectId().getName(), parentWithCacheValue.getId().getName(), additionKeys); + throw e; + } reloadCounter.increment(true); reloadDifferential.record(System.nanoTime() - start, TimeUnit.NANOSECONDS); return allExternalIds; -- cgit v1.2.3 From 439acc98b025713614aec5419b54345bc6efee64 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Fri, 28 Apr 2023 16:26:10 -0700 Subject: Bump JGit to 45de4fa $ git log --no-decorate --oneline --no-merges ^5ae8d28 45de4fa 45de4fa2c Update jetty to 10.0.15 and use it from Maven central directly fbfc6df10 Update bouncycastle to 1.73 6b831000c [errorprone] Fix MissingOverride error 64615b44e PackReverseIndexWriter: write out version 1 reverse index file 7d3f893d3 IntList: add #sort using quick sort for O(n log n) runtime. 9932f9b41 [bazel] Move ToolTestCase to src folder (6.2) 2fd050c56 GcConcurrentTest: @Ignore flaky testInterruptGc 2aaa56113 Fix CommitTemplateConfigTest 70bc5aad3 Fix after_open config and Snapshotting RefDir tests to work with bazel 61d4e3134 [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory f3a3a2e87 Demote severity of some error prone bug patterns to warnings 46732d6af [bazel] Fix version number of bcpg-jdk18on 032eef5b1 Parse pull.rebase=preserve as alias for pull.rebase=merges bf201be0b Use bouncycastle libraries directly from Maven Central 064691e90 UploadPack: Fix NPE when traversing a tag chain 4117bf9d7 Add missing @since tag for BatchRefUpdate#getRefDatabase b9b90d1d3 Add missing since tag for SshBasicTestBase 4f662a26f Add missing since tag for SshTestHarness#publicKey2 631858183 Silence API errors 96d9e3eb1 Prevent infinite loop rescanning the pack list on PackMismatchException f371bfb3e Remove blank in maven.config f1a9adf7d PackedBatchRefUpdate#execute: reduce nesting of try-catch blocks 8f8bc703e PackedBatchRefUpdate: Handle the case where loose refs fail to pack f73efea21 Remove blank in maven.config e06ce5960 Add protocol configuration to Amazon S3 transport 0e9708803 [pgm] Implement git tag --contains option 060dcf1cc ListTagCommand: implement git tag --contains 5cc9ecde8 RevWalk: use generation number to optimize getMergedInto() 89f7378da DfsPackFile: Extract block aligment code d3ba40c80 Ensure parsed RevCommitCG has derived data from commit-graph 3589c5cd1 PatchApplierTest: specify charset to avoid warning 5a6e35608 GcConcurrentTest: @Ignore flaky testInterruptGc 903645835 PatchApplier: Check for existence of src/dest files before any operation c5617711a Revert "RefDirectory: Throw exception if CAS of packed ref list fails" 17fac8a27 Downgrade maven-site-plugin to 3.12.1 fc613e26d Use wagon-ssh-external to deploy Maven site 23b9693a7 DirCache: support option index.skipHash Change-Id: Ifd09164ab53a9d6175f66e9d6c9c3dbe4cf593a5 Release-Notes: Bump JGit to 45de4fa (cherry picked from commit 62f04b24a99cf97deaa92d7e811083015362bc8c) --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index 5ae8d28faa..45de4fa2cb 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit 5ae8d28faaf6168921f673c89a4e6d601ffad78d +Subproject commit 45de4fa2cb638a8e20fa27b3d88435a697bb9df8 -- cgit v1.2.3 From fed074e014b3f2cc59a7e8fae4567fcfc1fba55c Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 3 May 2023 08:24:27 -0700 Subject: Bump JGit to 74fa245b3 $ git log --oneline --no-merges 45de4fa2c...74fa245b3 99535cd87 Update Maven plugins 3d90c4a43 Add TransportHttp#getAdditionalHeaders 731dfd4c5 Add 4.27 (2023-03) and 4.28 (2023-06) target platforms 06cfebd06 Fix inProcessPackedRefsLock not shared with copies of the instance 84461e808 Update slf4j to 1.7.36 and consume it directly from Maven Central 18cb13c4e Update assertj-core to 3.24.2 140a8b365 Update plexus-compiler to 2.13.0 f3cb30f83 Update Apache commons-codec to 1.15 6890b8ffa Update org.apache.commons:commons-compress to 1.23.0 ee2143f74 Update javaEWAH to 1.2.3 and use it directly from Maven central 4244aec37 Update org.eclipse.jdt:ecj to 3.33.0 076b8e763 Add missing @since tag to IntComparator 93e3147e5 Update to jakarta.servlet:jakarta.servlet-api:4.0.4 8c0c96e0a Support rebasing independent branches 8bc13fb79 Support cherry-picking a root commit 3ed4cdda6 AddCommand: ability to switch off renormalization Release-Notes: Fix JGit bug with SnapshottingRefDirectory packed-refs inprocess lock Change-Id: I4cf9ed9f04ff05dc62857877cdb9d21f22bc3f6e (cherry picked from commit 2ca07b5f1f5e27f42585de7425a601b491e3732b) --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index 45de4fa2cb..74fa245b3c 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit 45de4fa2cb638a8e20fa27b3d88435a697bb9df8 +Subproject commit 74fa245b3c3ccf13afcbec7911c7c8459e48527d -- cgit v1.2.3 From e0dcd19e96955c6d526538f60d4b1e1a8107bfcb Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 4 May 2023 13:24:21 +0200 Subject: Align commons-compress and tukaani-xz versions with jgit In change If9713cf185 JGit module was updated to 78c9b9260a, that also updated the version of commons-compress to 1.21 and the version of tukaani-xz to 1.9. In change Ida8c587526 JGit module was updated to a1901305b2, that also updated the version of commons-compress to 1.22. However the versions of those libraries were missed to be updated in Gerrit. Update commons-compress version to 1.22 and tukaani-xz version to 1.9. Release-Notes: Update commons-compress to 1.22 and tukaani-xz to 1.9. Change-Id: I4103f08027581c9be8655d90864489f0ab3616ed --- WORKSPACE | 4 ++-- tools/nongoogle.bzl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b3bf30b8f4..591ec1223f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -292,8 +292,8 @@ maven_jar( # When upgrading commons-compress, also upgrade tukaani-xz maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.18", - sha1 = "1191f9f2bc0c47a8cce69193feb1ff0a8bcb37d5", + artifact = "org.apache.commons:commons-compress:1.22", + sha1 = "691a8b4e6cf4248c3bc72c8b719337d5cb7359fa", ) maven_jar( diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index a6f4c675b3..984aed8668 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -55,8 +55,8 @@ def declare_nongoogle_deps(): # Transitive dependency of commons-compress maven_jar( name = "tukaani-xz", - artifact = "org.tukaani:xz:1.8", - sha1 = "c4f7d054303948eb6a4066194253886c8af07128", + artifact = "org.tukaani:xz:1.9", + sha1 = "1ea4bec1a921180164852c65006d928617bd2caf", ) maven_jar( -- cgit v1.2.3 From da82726b90346762052ac812a1142720e640cacc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 15 Sep 2022 12:06:07 +0200 Subject: Update bouncycastle to 1.72 The recent versions fixed number of defects and added new features: [1]. Most notably it also fixed number of issues with Ed25519 keys and signed certificates: - OpenSSH: Fixed padding in generated Ed25519 private keys. - Support has been added for generating Ed25519/Ed448 signed certificates. - Bouncycastle 1.69 added bcutil as a new artefact which bcpkix depends on - 1.71: the new jdk18on jars are compiled to work with anything starting from Java 1.8 - JGit 6.4.0 uses bouncycastle 1.72 This commit also includes the update done in change Id86bdb188. [1] https://www.bouncycastle.org/releasenotes.html Bug: Issue 12089 Release-Notes: Update bouncycastle to 1.72 Change-Id: I846f51d83de5e0fec27022a7bc2927260f4465be (cherry picked from commit 15f581a383365c850ebec78a8f5dc427bd2ae951) --- WORKSPACE | 20 +++++++++++++------- java/com/google/gerrit/acceptance/BUILD | 1 + lib/bouncycastle/BUILD | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b3bf30b8f4..af35854923 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -742,24 +742,30 @@ maven_jar( ) # When updating Bouncy Castle, also update it in bazlets. -BC_VERS = "1.61" +BC_VERS = "1.72" maven_jar( name = "bcprov", - artifact = "org.bouncycastle:bcprov-jdk15on:" + BC_VERS, - sha1 = "00df4b474e71be02c1349c3292d98886f888d1f7", + artifact = "org.bouncycastle:bcprov-jdk18on:" + BC_VERS, + sha1 = "d8dc62c28a3497d29c93fee3e71c00b27dff41b4", ) maven_jar( name = "bcpg", - artifact = "org.bouncycastle:bcpg-jdk15on:" + BC_VERS, - sha1 = "422656435514ab8a28752b117d5d2646660a0ace", + artifact = "org.bouncycastle:bcpg-jdk18on:" + BC_VERS, + sha1 = "1a36a1740d07869161f6f0d01fae8d72dd1d8320", ) maven_jar( name = "bcpkix", - artifact = "org.bouncycastle:bcpkix-jdk15on:" + BC_VERS, - sha1 = "89bb3aa5b98b48e584eee2a7401b7682a46779b4", + artifact = "org.bouncycastle:bcpkix-jdk18on:" + BC_VERS, + sha1 = "bb3fdb5162ccd5085e8d7e57fada4d8eaa571f5a", +) + +maven_jar( + name = "bcutil", + artifact = "org.bouncycastle:bcutil-jdk18on:" + BC_VERS, + sha1 = "41f19a69ada3b06fa48781120d8bebe1ba955c77", ) maven_jar( diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index d03d0310c3..12c6837c15 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -55,6 +55,7 @@ DEPLOY_ENV = [ "//lib/bouncycastle:bcpg", "//lib/bouncycastle:bcpkix", "//lib/bouncycastle:bcprov", + "//lib/bouncycastle:bcutil", "//prolog:gerrit-prolog-common", ] diff --git a/lib/bouncycastle/BUILD b/lib/bouncycastle/BUILD index 43ba6e1cec..6a87d73c1b 100644 --- a/lib/bouncycastle/BUILD +++ b/lib/bouncycastle/BUILD @@ -21,6 +21,13 @@ java_library( exports = ["@bcpkix//jar"], ) +java_library( + name = "bcutil", + data = ["//lib:LICENSE-bouncycastle"], + visibility = ["//visibility:public"], + exports = ["@bcutil//jar"], +) + java_library( name = "bcprov-neverlink", data = ["//lib:LICENSE-bouncycastle"], @@ -44,3 +51,11 @@ java_library( visibility = ["//visibility:public"], exports = ["@bcpkix//jar"], ) + +java_library( + name = "bcutil-neverlink", + data = ["//lib:LICENSE-bouncycastle"], + neverlink = 1, + visibility = ["//visibility:public"], + exports = ["@bcutil//jar"], +) -- cgit v1.2.3 From 2ca5ed5037506d19cef2e37a3818a4b61f76eaa4 Mon Sep 17 00:00:00 2001 From: Prudhvi Akhil Alahari Date: Wed, 8 Feb 2023 19:34:54 +0530 Subject: Move creation of PerThreadCache to SshCommand Change Ia0b5d8c10d, only added PerThreadCache in SSH query command. We want most SSH commands to benefit from PerThreadCache same as all the REST APIs use this cache. Move creation of PerThreadCache to SshCommand so that the cache is available to most commands, including plugins. We have some plugin use cases where this helps with performance either because of the extra project caching or the extra ref caching enabled by this. Release-Notes: Improved performance for plugin-provided SSH commands that perform multiple permission checks or ref lookups for the same project Change-Id: I5ade18ecab14bf419a23759dfe4ab0beeaf83ea9 --- java/com/google/gerrit/server/query/change/OutputStreamQuery.java | 3 +-- java/com/google/gerrit/sshd/SshCommand.java | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java index 716cf106d2..961404adb7 100644 --- a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java +++ b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java @@ -30,7 +30,6 @@ import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.index.query.QueryResult; import com.google.gerrit.server.DynamicOptions; import com.google.gerrit.server.account.AccountAttributeLoader; -import com.google.gerrit.server.cache.PerThreadCache; import com.google.gerrit.server.config.TrackingFooters; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; @@ -211,7 +210,7 @@ public class OutputStreamQuery { return; } - try (PerThreadCache ignored = PerThreadCache.create()) { + try { final QueryStatsAttribute stats = new QueryStatsAttribute(); stats.runTimeMilliseconds = TimeUtil.nowMs(); diff --git a/java/com/google/gerrit/sshd/SshCommand.java b/java/com/google/gerrit/sshd/SshCommand.java index 9df263b860..a4e427d1eb 100644 --- a/java/com/google/gerrit/sshd/SshCommand.java +++ b/java/com/google/gerrit/sshd/SshCommand.java @@ -23,6 +23,7 @@ import com.google.gerrit.server.DynamicOptions; import com.google.gerrit.server.InvalidDeadlineException; import com.google.gerrit.server.RequestInfo; import com.google.gerrit.server.RequestListener; +import com.google.gerrit.server.cache.PerThreadCache; import com.google.gerrit.server.cancellation.RequestCancelledException; import com.google.gerrit.server.cancellation.RequestStateContext; import com.google.gerrit.server.config.GerritServerConfig; @@ -62,7 +63,8 @@ public abstract class SshCommand extends BaseCommand { public void start(ChannelSession channel, Environment env) throws IOException { startThread( () -> { - try (DynamicOptions pluginOptions = new DynamicOptions(injector, dynamicBeans)) { + try (PerThreadCache ignored = PerThreadCache.create(); + DynamicOptions pluginOptions = new DynamicOptions(injector, dynamicBeans)) { parseCommandLine(pluginOptions); stdout = toPrintWriter(out); stderr = toPrintWriter(err); -- cgit v1.2.3 From 33111cee4917cb4eb62f74877c139f41d8538eff Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Mon, 8 May 2023 10:47:22 +0000 Subject: Set version to 3.5.6 Release-Notes: skip Change-Id: I083135b51015f951b5944f0fef3a153db12307be --- tools/maven/gerrit-acceptance-framework_pom.xml | 2 +- tools/maven/gerrit-extension-api_pom.xml | 2 +- tools/maven/gerrit-plugin-api_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index 2fe03ec84e..16bd04bd9e 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 3.5.6-SNAPSHOT + 3.5.6 jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index 18921424c8..b46fa85a39 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 3.5.6-SNAPSHOT + 3.5.6 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index 2687bc79b2..57c5cb9788 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 3.5.6-SNAPSHOT + 3.5.6 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index d7f1726436..047252ee81 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 3.5.6-SNAPSHOT + 3.5.6 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 45246e8998..d295f60dc1 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "3.5.6-SNAPSHOT" +GERRIT_VERSION = "3.5.6" -- cgit v1.2.3 From ce03e2eeb43eabf1035b1269ef1aa3ed6f47d972 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Mon, 8 May 2023 11:03:33 +0000 Subject: Set version to 3.5.7-SNAPSHOT Release-Notes: skip Change-Id: I377e864359a34d7949300ca2ee71936c69ed8dcf --- tools/maven/gerrit-acceptance-framework_pom.xml | 2 +- tools/maven/gerrit-extension-api_pom.xml | 2 +- tools/maven/gerrit-plugin-api_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index 16bd04bd9e..8440404870 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 3.5.6 + 3.5.7-SNAPSHOT jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index b46fa85a39..90a194efc5 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 3.5.6 + 3.5.7-SNAPSHOT jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index 57c5cb9788..e390053e27 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 3.5.6 + 3.5.7-SNAPSHOT jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 047252ee81..4fc6ff4e32 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 3.5.6 + 3.5.7-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index d295f60dc1..82f4d12cf4 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "3.5.6" +GERRIT_VERSION = "3.5.7-SNAPSHOT" -- cgit v1.2.3