commit 7d000beb9bb7cb1d7b629e660530ade9fb692f31
author Martin Fick <mfick@codeaurora.org> Fri Aug 09 12:45:40 2019 -0600
committer Martin Fick <mfick@codeaurora.org> Fri Aug 09 13:21:46 2019 -0600
tree 96d71026a92258584e89a443605b7e7fdd60907c
parent d1554fe62086e077d5d37be323f715a0ee784378

Fixes to build, run, and test on Gerrit 3.0

Update the pom for 3.0
Update the registering of DynamicBeans.
Update the test script to handle the new change push format.

Change-Id: I552bb19841eb586431e926643a01fba696f338cd

BUILD

diff --git a/BUILD b/BUILD
index 5164a47..614546f 100644
--- a/BUILD
+++ b/BUILD
@@ -9,8 +9,6 @@
         "Implementation-Title: Task Plugin",
         "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/task",
         "Gerrit-Module: com.googlesource.gerrit.plugins.task.Modules$Module",
-        "Gerrit-SshModule: com.googlesource.gerrit.plugins.task.Modules$SshModule",
-        "Gerrit-HttpModule: com.googlesource.gerrit.plugins.task.Modules$HttpModule",
     ],
     resources = glob(["src/main/resources/**/*"]),
 )

pom.xml

diff --git a/pom.xml b/pom.xml
index ed03985..8a9ac3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,12 @@
   <groupId>com.googlesource.gerrit.plugins.task</groupId>
   <artifactId>task</artifactId>
   <packaging>jar</packaging>
-  <version>3.0-SNAPSHOT</version>
+  <version>3.0</version>
   <name>task</name>
 
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>3.0-SNAPSHOT</Gerrit-ApiVersion>
+    <Gerrit-ApiVersion>3.0.0</Gerrit-ApiVersion>
   </properties>
 
   <build>
@@ -40,8 +40,6 @@
           <archive>
             <manifestEntries>
               <Gerrit-Module>com.googlesource.gerrit.plugins.task.Modules$Module</Gerrit-Module>
-              <Gerrit-HttpModule>com.googlesource.gerrit.plugins.task.Modules$HttpModule</Gerrit-HttpModule>
-              <Gerrit-SshModule>com.googlesource.gerrit.plugins.task.Modules$SshModule</Gerrit-SshModule>
               <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
               <Implementation-URL>http://code.google.com/p/gerrit/</Implementation-URL>
 

src/main/java/com/googlesource/gerrit/plugins/task/Modules.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java b/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java
index a3e4fb6..1eab7e4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/Modules.java
@@ -33,19 +33,8 @@
       bind(ChangeAttributeFactory.class)
           .annotatedWith(Exports.named("task"))
           .to(TaskAttributeFactory.class);
-    }
-  }
 
-  public static class SshModule extends AbstractModule {
-    @Override
-    protected void configure() {
       bind(DynamicBean.class).annotatedWith(Exports.named(Query.class)).to(MyOptions.class);
-    }
-  }
-
-  public static class HttpModule extends AbstractModule {
-    @Override
-    protected void configure() {
       bind(DynamicBean.class).annotatedWith(Exports.named(QueryChanges.class)).to(MyOptions.class);
     }
   }

test/check_task_statuses.sh

diff --git a/test/check_task_statuses.sh b/test/check_task_statuses.sh
index 31e2d46..44bb05b 100755
--- a/test/check_task_statuses.sh
+++ b/test/check_task_statuses.sh
@@ -34,7 +34,7 @@
 }
 
 get_change_num() { # < gerrit_push_response > changenum
-    local url=$(awk '/New Changes:/ { getline; print $2 }')
+    local url=$(awk '$NF ~ /\[NEW\]/ { print $2 }')
     echo "${url##*\/}" | tr -d -c '[:digit:]'
 }