commit 1e31bd1a018c7a46d6b25ffa0a34026b994417e3
author Martin Fick <mfick@codeaurora.org> Thu Aug 24 11:40:41 2017 -0600
committer Martin Fick <mogulguy10@gmail.com> Sat Sep 30 09:56:11 2017 -0600
tree e6e8af0a51a48c82c6092cee55019e1fe322b388
parent ba4721ff7183ee5a61c34fd336ae274f3f474fc8

build with 2.9

Also fix test script bug when the target dir does not exist.

Change-Id: Ic7f74c8b98f90d14c25ef5fe692898ace272429d

pom.xml

diff --git a/pom.xml b/pom.xml
index 3207839..a9037a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <artifactId>events</artifactId>
   <name>events</name>
   <packaging>jar</packaging>
-  <version>2.7</version>
+  <version>2.9</version>
 
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>

src/main/java/com/googlesource/gerrit/plugins/events/StreamEvents.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/events/StreamEvents.java b/src/main/java/com/googlesource/gerrit/plugins/events/StreamEvents.java
index fa2c70c..9fa186f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/events/StreamEvents.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/events/StreamEvents.java
@@ -37,7 +37,7 @@
 import org.slf4j.LoggerFactory;
 
 @RequiresCapability(GlobalCapability.STREAM_EVENTS)
-@CommandMetaData(name = "stream", descr = "Monitor events occurring in real time")
+@CommandMetaData(name = "stream", description = "Monitor events occurring in real time")
 public final class StreamEvents extends BaseCommand {
   private static final Logger log = LoggerFactory.getLogger(StreamEvents.class);
 

src/main/java/com/googlesource/gerrit/plugins/events/TrimCommand.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/events/TrimCommand.java b/src/main/java/com/googlesource/gerrit/plugins/events/TrimCommand.java
index ecf5a16..79a08c8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/events/TrimCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/events/TrimCommand.java
@@ -24,7 +24,7 @@
 @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
 @CommandMetaData(
   name = "trim",
-  descr = "Trim old events up to and including trim-id from EventStore"
+  description = "Trim old events up to and including trim-id from EventStore"
 )
 final class TrimCommand extends SshCommand {
   @Option(

test/test_events_plugin.sh

diff --git a/test/test_events_plugin.sh b/test/test_events_plugin.sh
index 9af3d4a..465295e 100755
--- a/test/test_events_plugin.sh
+++ b/test/test_events_plugin.sh
@@ -173,9 +173,10 @@
 
 parseArgs "$@"
 
-TEST_DIR=$(readlink -f "$MYDIR/../target/test")
+TEST_DIR=$MYDIR/../target/test
 rm -rf "$TEST_DIR"
 mkdir -p "$TEST_DIR"
+TEST_DIR=$(readlink -f "$TEST_DIR")
 
 GITURL=ssh://$SERVER:29418/$PROJECT
 DEST_REF=$REF_BRANCH
@@ -230,8 +231,8 @@
 type=change-merged
 capture_events 2
 submit "$ch1,1"
-result_type "$GROUP" "ref-updated"
-result_type "$GROUP" "$type" 2
+result_type "$GROUP" "$type"
+result_type "$GROUP" "ref-updated" 2
 
 type=merge-failed
 capture_events