| commit | a7faba399fc56e1dd72837f797369611832e2cb4 | [log] [tgz] |
|---|---|---|
| author | Sasa Zivkov <sasa.zivkov@sap.com> | Tue Nov 05 15:55:11 2013 +0100 |
| committer | Sasa Zivkov <sasa.zivkov@sap.com> | Tue Nov 05 16:00:35 2013 +0100 |
| tree | 66e258fd2afe844890ae91a328db2d10f30df44d | |
| parent | 06b178fe6c4d1eb3057f2c22b63caff33009528a [diff] |
Fix build of hooks-its. It wasn't building after the referenced gerrit-plugin-api version was increased to 2.8-SNAPSHOT. Change-Id: I76faf98e336d9156abbdfa48a466d0a189d804dc
diff --git a/hooks-its/pom.xml b/hooks-its/pom.xml index 19dd5d3..3d0a3e8 100644 --- a/hooks-its/pom.xml +++ b/hooks-its/pom.xml
@@ -37,11 +37,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.google.gerrit</groupId> - <artifactId>gerrit-pgm</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocityVersion}</version>
diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionRequest.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionRequest.java index c829569..bd81cb1 100644 --- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionRequest.java +++ b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/ActionRequest.java
@@ -16,10 +16,9 @@ import java.util.Arrays; -import javax.annotation.Nullable; - import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import com.google.gerrit.common.Nullable; /** * An action to take for an {@code ChangeEvent}.
diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Condition.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Condition.java index 61aa365..5fc79a8 100644 --- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Condition.java +++ b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Condition.java
@@ -18,10 +18,9 @@ import java.util.List; import java.util.Set; -import javax.annotation.Nullable; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.gerrit.common.Nullable; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted;
diff --git a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Property.java b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Property.java index e8cc634..8b582d6 100644 --- a/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Property.java +++ b/hooks-its/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/Property.java
@@ -14,10 +14,9 @@ package com.googlesource.gerrit.plugins.hooks.workflow; -import javax.annotation.Nullable; - import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import com.google.gerrit.common.Nullable; /** * A property to match against {@code Condition}s.