diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt index 67ced54eae..0341980a22 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -53,7 +53,7 @@ Java 9 and later are supported, but some adjustments must be done, because Java 8 is still the default: * Add JRE, e.g.: directory: /usr/lib64/jvm/java-9-openjdk, name: java-9-openjdk-9 -* Change execution environemnt for gerrit project to: JavaSE-9 (java-9-openjdk-9) +* Change execution environment for gerrit project to: JavaSE-9 (java-9-openjdk-9) * Check that compiler compliance level in gerrit project is set to: 9 * Add this parameter to VM argument for gerrit_daemin launcher: ---- diff --git a/WORKSPACE b/WORKSPACE index b31bc50911..949a89b911 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1047,8 +1047,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.1", - sha1 = "b4e00ab47019103d69b6c9dcfdcbd3bfda00f86e", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2", + sha1 = "f48725523c0b3402f869214433602f8d3f4c737c", ) maven_jar( diff --git a/java/com/google/gerrit/server/restapi/project/GetAccess.java b/java/com/google/gerrit/server/restapi/project/GetAccess.java index 744c8b2905..e53f474f50 100644 --- a/java/com/google/gerrit/server/restapi/project/GetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/GetAccess.java @@ -89,7 +89,7 @@ public class GetAccess implements RestReadView { private final AllProjectsName allProjectsName; private final ProjectJson projectJson; private final ProjectCache projectCache; - private final MetaDataUpdate.Server metaDataUpdateFactory; + private final Provider metaDataUpdateFactory; private final GroupBackend groupBackend; private final WebLinks webLinks; private final ProjectConfig.Factory projectConfigFactory; @@ -100,7 +100,7 @@ public class GetAccess implements RestReadView { PermissionBackend permissionBackend, AllProjectsName allProjectsName, ProjectCache projectCache, - MetaDataUpdate.Server metaDataUpdateFactory, + Provider metaDataUpdateFactory, ProjectJson projectJson, GroupBackend groupBackend, WebLinks webLinks, @@ -140,7 +140,7 @@ public class GetAccess implements RestReadView { PermissionBackend.ForProject perm = permissionBackend.currentUser().project(projectName); ProjectConfig config; - try (MetaDataUpdate md = metaDataUpdateFactory.create(projectName)) { + try (MetaDataUpdate md = metaDataUpdateFactory.get().create(projectName)) { config = projectConfigFactory.read(md); info.configWebLinks = new ArrayList<>(); diff --git a/java/com/google/gerrit/server/restapi/project/PutDescription.java b/java/com/google/gerrit/server/restapi/project/PutDescription.java index 2c4377d93b..b65f0d3963 100644 --- a/java/com/google/gerrit/server/restapi/project/PutDescription.java +++ b/java/com/google/gerrit/server/restapi/project/PutDescription.java @@ -32,6 +32,7 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectConfig; import com.google.gerrit.server.project.ProjectResource; import com.google.inject.Inject; +import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -40,14 +41,14 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException; @Singleton public class PutDescription implements RestModifyView { private final ProjectCache cache; - private final MetaDataUpdate.Server updateFactory; + private final Provider updateFactory; private final PermissionBackend permissionBackend; private final ProjectConfig.Factory projectConfigFactory; @Inject PutDescription( ProjectCache cache, - MetaDataUpdate.Server updateFactory, + Provider updateFactory, PermissionBackend permissionBackend, ProjectConfig.Factory projectConfigFactory) { this.cache = cache; @@ -70,7 +71,7 @@ public class PutDescription implements RestModifyView, GerritConfigListener { private final ProjectCache cache; private final PermissionBackend permissionBackend; - private final MetaDataUpdate.Server updateFactory; + private final Provider updateFactory; private final AllProjectsName allProjects; private final AllUsersName allUsers; private final ProjectConfig.Factory projectConfigFactory; @@ -68,7 +69,7 @@ public class SetParent SetParent( ProjectCache cache, PermissionBackend permissionBackend, - MetaDataUpdate.Server updateFactory, + Provider updateFactory, AllProjectsName allProjects, AllUsersName allUsers, ProjectConfig.Factory projectConfigFactory, @@ -99,7 +100,7 @@ public class SetParent String parentName = MoreObjects.firstNonNull(Strings.emptyToNull(input.parent), allProjects.get()); validateParentUpdate(rsrc.getProjectState().getNameKey(), user, parentName, checkIfAdmin); - try (MetaDataUpdate md = updateFactory.create(rsrc.getNameKey())) { + try (MetaDataUpdate md = updateFactory.get().create(rsrc.getNameKey())) { ProjectConfig config = projectConfigFactory.read(md); Project project = config.getProject(); project.setParentName(parentName); diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index eeb5d37fb0..73e7ecacb1 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V6_7: return "blacktop/elasticsearch:6.7.2"; case V6_8: - return "blacktop/elasticsearch:6.8.2"; + return "blacktop/elasticsearch:6.8.4"; case V7_0: return "blacktop/elasticsearch:7.0.1"; case V7_1: @@ -61,7 +61,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V7_3: return "blacktop/elasticsearch:7.3.2"; case V7_4: - return "blacktop/elasticsearch:7.4.1"; + return "blacktop/elasticsearch:7.4.2"; } throw new IllegalStateException("No tests for version: " + version.name()); }