You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/05/01 14:40:23 UTC
svn commit: r1098295 - in /maven/plugins/trunk/maven-changes-plugin: ./
src/main/java/org/apache/maven/plugin/issues/
src/main/java/org/apache/maven/plugin/jira/
src/test/java/org/apache/maven/plugin/issues/
Author: dennisl
Date: Sun May 1 12:40:23 2011
New Revision: 1098295
URL: http://svn.apache.org/viewvc?rev=1098295&view=rev
Log:
[MCHANGES-210] Update to Java 5
- Start using generics in IssueUtils
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1098295&r1=1098294&r2=1098295&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sun May 1 12:40:23 2011
@@ -317,6 +317,15 @@ under the License.
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <compilerArgument>-Xlint:all</compilerArgument>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.0.1</version>
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java?rev=1098295&r1=1098294&r2=1098295&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java Sun May 1 12:40:23 2011
@@ -44,10 +44,10 @@ public class IssueUtils
* @throws org.apache.maven.plugin.MojoExecutionException
* If no issues could be found for the supplied prefix
*/
- public static List filterIssuesWithVersionPrefix( List issues, String prefix )
+ public static List<Issue> filterIssuesWithVersionPrefix( List<Issue> issues, String prefix )
throws MojoExecutionException
{
- List filteredIssues = new ArrayList();
+ List<Issue> filteredIssues = new ArrayList<Issue>();
boolean isFound = false;
Issue issue = null;
@@ -90,10 +90,10 @@ public class IssueUtils
* @throws org.apache.maven.plugin.MojoExecutionException
* If no issues could be found for the supplied version
*/
- public static List getIssuesForVersion( List issues, String version )
+ public static List<Issue> getIssuesForVersion( List<Issue> issues, String version )
throws MojoExecutionException
{
- List issuesForVersion = new ArrayList();
+ List<Issue> issuesForVersion = new ArrayList<Issue>();
boolean isFound = false;
Issue issue = null;
String releaseVersion = version;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=1098295&r1=1098294&r2=1098295&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Sun May 1 12:40:23 2011
@@ -31,6 +31,7 @@ import org.apache.commons.httpclient.Use
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.maven.plugin.issues.Issue;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Proxy;
@@ -719,7 +720,7 @@ public abstract class AbstractJiraDownlo
}
}
- public List getIssueList()
+ public List<Issue> getIssueList()
{
if ( output.isFile() )
{
@@ -731,7 +732,7 @@ public abstract class AbstractJiraDownlo
else
{
getLog().warn( "JIRA file " + output.getPath() + " doesn't exist." );
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1098295&r1=1098294&r2=1098295&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Sun May 1 12:40:23 2011
@@ -29,6 +29,7 @@ import java.util.ResourceBundle;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.plugin.changes.AbstractChangesReport;
import org.apache.maven.plugin.changes.ProjectUtils;
+import org.apache.maven.plugin.issues.Issue;
import org.apache.maven.plugin.issues.IssueUtils;
import org.apache.maven.plugin.issues.IssuesReportGenerator;
import org.apache.maven.plugin.issues.IssuesReportHelper;
@@ -316,7 +317,7 @@ public class JiraMojo
configureIssueDownloader( issueDownloader );
issueDownloader.doExecute();
- List issueList = issueDownloader.getIssueList();
+ List<Issue> issueList = issueDownloader.getIssueList();
if ( StringUtils.isNotEmpty( versionPrefix ) )
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java?rev=1098295&r1=1098294&r2=1098295&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java Sun May 1 12:40:23 2011
@@ -46,7 +46,7 @@ import org.xml.sax.helpers.DefaultHandle
public class JiraXML
extends DefaultHandler
{
- private final List issueList;
+ private final List<Issue> issueList;
private final StringBuffer currentElement = new StringBuffer( 1024 );
@@ -83,7 +83,7 @@ public class JiraXML
sdf = new SimpleDateFormat( datePattern, Locale.ENGLISH );
}
- this.issueList = new ArrayList( 16 );
+ this.issueList = new ArrayList<Issue>( 16 );
}
/**
@@ -237,7 +237,7 @@ public class JiraXML
currentElement.append( buf, offset, len );
}
- public List getIssueList()
+ public List<Issue> getIssueList()
{
return Collections.unmodifiableList( this.issueList );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java?rev=1098295&r1=1098294&r2=1098295&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java Sun May 1 12:40:23 2011
@@ -47,7 +47,7 @@ public class IssueUtilsTestCase
issue_2.setId( "2" );
issue_2.addFixVersion( "1.0" );
- List issueList = new ArrayList();
+ List<Issue> issueList = new ArrayList<Issue>();
issueList.add( issue_1 );
issueList.add( issue_2 );