Initial update to the JIRA v6 API (fixes #6, aptly numbered).

Some changes were inspired by PR #9 which was closed by author @treymarc.

This disables the ApprovalFunctionTest, because junit was failing
due to ClassNotFoundException looking for UserKeyStore. This will likely
require implementing some kind of compatibility layer due to the User
API changes between JIRA 5 and 6.

Some plugins and dependencies have also been updated to their latest versions.

Author: Joe Hansche

.classpath

@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>gerrit-plugin</name>
-  <comment>Integrates Atlassian JIRA with Gerrit code review. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
+	<name>gerrit-plugin</name>
+	<comment>Integrates Atlassian JIRA with Gerrit code review. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.project

@@ -46,7 +46,7 @@ Features
 * Workflow condition to require that an issue must (or must not) have any
   open reviews
 * Workflow condition to require that an issue must (or must not) have a certain
-  approval score (e.g., CRVW == 2, or ! VRIF < 0)
+  approval score (e.g., Code-Review == 2, or ! Verified < 0)
 * Workflow function to perform a Gerrit review
   * This is just an argument to the `gerrit review [ChangeId] ..` command, so
     it could be something like `--verified +1` to give a +1 score;

README.md

@@ -80,25 +80,25 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.jira</groupId>
             <artifactId>jira-tests</artifactId>
-            <version>${jira.version}</version>
+            <version>${jira.test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.jira</groupId>
             <artifactId>jira-func-tests</artifactId>
-            <version>${jira.version}</version>
+            <version>${jira.test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
 
@@ -112,20 +112,20 @@
         <dependency>
             <groupId>com.atlassian.templaterenderer</groupId>
             <artifactId>atlassian-template-renderer-api</artifactId>
-            <version>1.1.1</version>
+            <version>${atlas.template.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- Not automatically provided in <5.0 -->
             <groupId>com.atlassian.util.concurrent</groupId>
             <artifactId>atlassian-util-concurrent</artifactId>
-            <version>2.3.0</version>
+            <version>${atlas.concurrent.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.plugins.rest</groupId>
             <artifactId>atlassian-rest-common</artifactId>
-            <version>1.0.2</version>
+            <version>${jira.rest.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -152,12 +152,12 @@
             <!-- Using this for gerrit integration -->
             <groupId>com.sonyericsson.hudson.plugins.gerrit</groupId>
             <artifactId>gerrit-events</artifactId>
-            <version>1.3.1</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.2.2</version>
+            <version>1.3</version>
         </dependency>
     </dependencies>
 
@@ -171,6 +171,7 @@
                 <configuration>
                     <productVersion>${jira.version}</productVersion>
                     <productDataVersion>${jira.version}</productDataVersion>
+                    <log4jProperties>src/aps/resources/log4j.properties</log4jProperties>
 
                     <products>
                         <product>
@@ -194,6 +195,10 @@
         <jira.version>5.0</jira.version>
         <jira.test.version>5.0</jira.test.version>
         <jira.data.version>5.0</jira.data.version>
+        <jira.rest.version>1.0.2</jira.rest.version>
+        <atlas.template.version>1.1.1</atlas.template.version>
+        <atlas.concurrent.version>2.3.0</atlas.concurrent.version>
+        <atlas.sal.version>2.0.16</atlas.sal.version>
         <amps.version>3.10.3</amps.version>
     </properties>
 
@@ -214,6 +219,22 @@
                 <skip.func.tests>true</skip.func.tests>
             </properties>
         </profile>
+        <profile>
+            <id>jira6</id>
+            <properties>
+                <jira.version>6.1.1</jira.version>
+                <jira.test.version>6.2-20131016.081905</jira.test.version>
+                <jira.data.version>6.2-20131016.081905</jira.data.version>
+                <jira.rest.version>2.9.0-REST-252-m01</jira.rest.version>
+                <atlas.template.version>2.0.0-m4</atlas.template.version>
+                <atlas.concurrent.version>2.4.1</atlas.concurrent.version>
+                <atlas.sal.version>2.11.0-SAL-236-m03</atlas.sal.version>
+                <amps.version>4.2.10</amps.version>
+                <plugin.testrunner.version>1.1.2</plugin.testrunner.version>
+                <skip.tests>true</skip.tests>
+                <skip.func.tests>true</skip.func.tests>
+            </properties>
+        </profile>
     </profiles>
 
     <distributionManagement>