Update to jira 5.0

startsiden · Mar 7, 2012 · 4fefa78 · 4fefa78
1 parent 59f855e
commit 4fefa78
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,14 +25,14 @@
     <dependencies>
         <dependency>
             <groupId>com.atlassian.jira</groupId>
-            <artifactId>atlassian-jira</artifactId>
+            <artifactId>jira-api</artifactId>
             <version>${jira.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.6</version>
+            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -71,11 +71,11 @@
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
                 <artifactId>maven-jira-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8</version>
                 <extensions>true</extensions>
                 <configuration>
                     <productVersion>${jira.version}</productVersion>
-                    <productDataVersion>${jira.data.version}</productDataVersion>
+                    <productDataVersion>${jira.version}</productDataVersion>
                     <log4jProperties>src/log4j.properties</log4jProperties>
                 </configuration>
             </plugin>
@@ -106,8 +106,8 @@
     </build>
 
     <properties>
-        <jira.version>4.3.2</jira.version>
-        <jira.data.version>4.3</jira.data.version>
+        <jira.version>5.0</jira.version>
+        <amps.version>3.8</amps.version>
     </properties>
 
 </project>
diff --git a/src/main/java/com/abctech/jira/github/feedreader/JSONFeedParser.java b/src/main/java/com/abctech/jira/github/feedreader/JSONFeedParser.java
@@ -1,6 +1,5 @@
 package com.abctech.jira.github.feedreader;
 
-import com.sun.mail.iap.ConnectionException;
 import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;

diff --git a/src/main/java/com/abctech/jira/github/issuetabpanels/changes/GithubTabPanel.java b/src/main/java/com/abctech/jira/github/issuetabpanels/changes/GithubTabPanel.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.atlassian.crowd.embedded.api.User;
 import com.atlassian.jira.util.velocity.VelocityRequestContextFactory;
 import com.atlassian.plugin.webresource.WebResourceManager;
 import com.atlassian.sal.api.pluginsettings.PluginSettingsFactory;
@@ -12,7 +13,6 @@
 import com.atlassian.jira.issue.Issue;
 import com.atlassian.jira.plugin.issuetabpanel.AbstractIssueTabPanel;
 import com.atlassian.jira.security.PermissionManager;
-import com.opensymphony.user.User;
 
 import com.abctech.jira.github.feedreader.Feed;
 import com.abctech.jira.github.feedreader.JSONFeedParser;

diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
@@ -9,6 +9,7 @@
         <description>Show Github commits related to an issue in an issue tab panel.</description>
         <label>Github</label>
         <resource type="velocity" name="view" location="templates/issuetabpanels/github-view.vm"/>
+        <supports-ajax-load>true</supports-ajax-load>
     </issue-tabpanel>
     <web-item key="github-setup-link" name="GitHub setup link on administrators page"
               section="system.admin/globalsettings" weight="95">