Make work with Gerrit core stable-2.10 branch. The stable-2.10 branch for this plugin was forked from master which failed to build against Gerrit core stable-2.10. This change is a fix to to make this plugin build and work against Gerrit stable-2.10 The scenarios were manually verified: 1. Buck built the plugin and ran all tests without failure 2. Maven built and ran all tests without failure 3. Built a dependent its-plugin against its-base and verified that it work as expected. I used the its-storyboard plugin to test. Change-Id: Ie492e9021bd61500fb2e2868f0951c0564bf82bd
diff --git a/pom.xml b/pom.xml index 08dacb8..411534b 100644 --- a/pom.xml +++ b/pom.xml
@@ -22,7 +22,7 @@ <groupId>com.googlesource.gerrit.plugins.its</groupId> <artifactId>its-base</artifactId> <packaging>jar</packaging> - <version>2.11-SNAPSHOT</version> + <version>2.10-SNAPSHOT</version> <name>Gerrit Code Review - Issue tracker support</name> <properties>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/its/InitIts.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/its/InitIts.java index 4c59b5c..d816801 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/hooks/its/InitIts.java +++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/its/InitIts.java
@@ -16,11 +16,11 @@ import com.google.common.base.Strings; import com.google.gerrit.common.data.RefConfigSection; -import com.google.gerrit.pgm.init.api.AllProjectsConfig; -import com.google.gerrit.pgm.init.api.AllProjectsNameOnInitProvider; -import com.google.gerrit.pgm.init.api.InitStep; -import com.google.gerrit.pgm.init.api.Section; -import com.google.gerrit.pgm.init.api.ConsoleUI; +import com.google.gerrit.pgm.init.AllProjectsConfig; +import com.google.gerrit.pgm.init.AllProjectsNameOnInitProvider; +import com.google.gerrit.pgm.init.InitStep; +import com.google.gerrit.pgm.init.Section; +import com.google.gerrit.pgm.util.ConsoleUI; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.Config; @@ -61,7 +61,7 @@ @Override public void postRun() throws IOException, ConfigInvalidException { - Config cfg = allProjectsConfig.load().getConfig(); + Config cfg = allProjectsConfig.load(); ui.message("\n"); ui.header(itsDisplayName + " Integration");