Adapt plugin to latest master Switch to snapshot API until a release contains latest master changes. Change-Id: I0196b79f8f998cf5945590d870ca03d6811ff74c
diff --git a/WORKSPACE b/WORKSPACE index 5a8242f..4231546 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -12,4 +12,4 @@ "gerrit_api", ) -gerrit_api() +gerrit_api(version = "3.3.0-SNAPSHOT")
diff --git a/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRights.java b/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRights.java index 4ce78f2..974b231 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRights.java +++ b/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRights.java
@@ -14,11 +14,11 @@ package com.ericsson.gerrit.plugins.projectgroupstructure; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.extensions.annotations.PluginData;
diff --git a/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRightsIT.java b/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRightsIT.java index c3f3338..1c2f3cd 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRightsIT.java +++ b/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/DefaultAccessRightsIT.java
@@ -21,14 +21,14 @@ import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.CachedProjectConfig; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.projects.ProjectInput; import com.google.gerrit.extensions.restapi.Url; -import com.google.gerrit.server.project.CachedProjectConfig; import com.google.gerrit.server.project.ProjectConfig; import com.google.gerrit.server.project.ProjectState; import com.google.inject.Inject;