commit 6599d2b48f27b861aca143c09a31b5dbefa52b2d
author Edwin Kempin <edwin.kempin@gmail.com> Wed Sep 10 09:47:18 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 10 09:47:19 2014 +0000
tree 5e0df159ab26f31c69c18b8856fcb290aa968006
parent aa190453f189064ecf2674d18f5d338e04010ef1
parent c9009d4ffa5b6a124fa36b393a13b6de29ceab83

Merge "If login fails, report "login" errors instead of "logout" errors"

pom.xml

diff --git a/pom.xml b/pom.xml
index 77182c6..76f30ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.googlesource.gerrit.plugins.its</groupId>
-    <artifactId>its-base-parent</artifactId>
-    <version>2.9-SNAPSHOT</version>
-  </parent>
+  <groupId>com.googlesource.gerrit.plugins.its</groupId>
   <artifactId>its-jira</artifactId>
   <packaging>jar</packaging>
+  <version>2.11-SNAPSHOT</version>
   <name>Gerrit Code Review - Atlassian Jira support</name>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
@@ -89,8 +86,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
         <configuration>
           <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+          <createDependencyReducedPom>false</createDependencyReducedPom>
           <artifactSet>
             <excludes>
               <exclude>com.gerritforge:*</exclude>
@@ -179,6 +178,11 @@
 
   <dependencies>
     <dependency>
+      <groupId>com.googlesource.gerrit.plugins.its</groupId>
+      <artifactId>its-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.xmlrpc</groupId>
       <artifactId>xmlrpc-client</artifactId>
       <version>3.1.3</version>

src/main/java/com/googlesource/gerrit/plugins/hooks/jira/InitJira.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/InitJira.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/InitJira.java
index 0fdf455..fe36872 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/InitJira.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/InitJira.java
@@ -19,11 +19,11 @@
 import java.util.Arrays;
 
 import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.pgm.init.AllProjectsConfig;
-import com.google.gerrit.pgm.init.AllProjectsNameOnInitProvider;
-import com.google.gerrit.pgm.init.InitFlags;
-import com.google.gerrit.pgm.init.Section;
-import com.google.gerrit.pgm.util.ConsoleUI;
+import com.google.gerrit.pgm.init.api.AllProjectsConfig;
+import com.google.gerrit.pgm.init.api.AllProjectsNameOnInitProvider;
+import com.google.gerrit.pgm.init.api.InitFlags;
+import com.google.gerrit.pgm.init.api.Section;
+import com.google.gerrit.pgm.init.api.ConsoleUI;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 

src/main/java/com/googlesource/gerrit/plugins/hooks/jira/JiraItsFacade.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/JiraItsFacade.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/JiraItsFacade.java
index e567297..b510891 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/JiraItsFacade.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/jira/JiraItsFacade.java
@@ -68,7 +68,7 @@
 
   @Override
   public String name() {
-    return "Jira";
+    return pluginName;
   }
 
   @Override