More code analysis fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517623 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/it/report-aggregated-changes-generation/module1/pom.xml b/src/it/report-aggregated-changes-generation/module1/pom.xml
index 0b86a41..78fc2d5 100644
--- a/src/it/report-aggregated-changes-generation/module1/pom.xml
+++ b/src/it/report-aggregated-changes-generation/module1/pom.xml
@@ -27,8 +27,7 @@
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin-test1</artifactId>
+ <artifactId>maven-changes-plugin-test1</artifactId>
<version>99.0</version>
<name>Module1</name>
<packaging>jar</packaging>
diff --git a/src/it/report-aggregated-changes-generation/module2/pom.xml b/src/it/report-aggregated-changes-generation/module2/pom.xml
index a55a3e4..68751be 100644
--- a/src/it/report-aggregated-changes-generation/module2/pom.xml
+++ b/src/it/report-aggregated-changes-generation/module2/pom.xml
@@ -27,8 +27,7 @@
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin-test2</artifactId>
+ <artifactId>maven-changes-plugin-test2</artifactId>
<version>99.0</version>
<name>Module2</name>
<packaging>jar</packaging>
diff --git a/src/it/report-aggregated-changes-generation/module3/pom.xml b/src/it/report-aggregated-changes-generation/module3/pom.xml
index b70d148..66f9bac 100644
--- a/src/it/report-aggregated-changes-generation/module3/pom.xml
+++ b/src/it/report-aggregated-changes-generation/module3/pom.xml
@@ -27,8 +27,7 @@
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin-test3</artifactId>
+ <artifactId>maven-changes-plugin-test3</artifactId>
<version>99.0</version>
<name>Module3</name>
<packaging>jar</packaging>
diff --git a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
index 24fa204..c28765c 100644
--- a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
+++ b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
@@ -463,7 +463,7 @@
{
ChangesXML changesXML = new ChangesXML( getXmlPath(), getLog() );
List<Release> changesReleases = releaseUtils.convertReleaseList( changesXML.getReleaseList() );
- releases = releaseUtils.mergeReleases( releases, changesReleases );
+ releases = releaseUtils.mergeReleases( null, changesReleases );
getLog().info( "Including issues from file " + getXmlPath() + " in announcement..." );
}
else
@@ -626,7 +626,7 @@
* @throws ResourceNotFoundException, VelocityException, IOException
*/
public void processTemplate( Context context, File outputDirectory, String template, String announcementFile )
- throws ResourceNotFoundException, VelocityException, MojoExecutionException
+ throws VelocityException, MojoExecutionException
{
File f;
diff --git a/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java b/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
index 58611b1..6b15147 100644
--- a/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
+++ b/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
@@ -329,7 +329,6 @@
private void determineProxy( String jiraUrl, HttpClient client )
{
// see whether there is any proxy defined in maven
- Proxy proxy = null;
getProxyInfo( jiraUrl );
diff --git a/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java b/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
index 8bc7f41..feea928 100644
--- a/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
+++ b/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
@@ -160,7 +160,7 @@
String tHost = targetHost;
if ( tHost == null )
{
- tHost = new String();
+ tHost = "";
}
if ( proxy == null )
{
diff --git a/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java b/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
index 0f514df..4078c53 100644
--- a/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
+++ b/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
@@ -69,8 +69,6 @@
paths.add( path );
- int sz = paths.size();
-
for (String path1 : paths) {
rsvc.getLog().info("ProjectResourceLoader : adding path '" + path1 + "'");
}
diff --git a/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
index 2fb10da..131e610 100644
--- a/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
+++ b/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
@@ -123,7 +123,7 @@
qstr = query;
}
- Object[] params = new Object[] { new String( qstr ) };
+ Object[] params = new Object[] {qstr};
Object[] queryResult;
ArrayList<Issue> issueList = new ArrayList<Issue>();
try
diff --git a/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java b/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
index bc0cf13..544126b 100644
--- a/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
@@ -70,7 +70,7 @@
try
{
- filteredIssues = IssueUtils.filterIssuesWithVersionPrefix( issueList, "yourPrefix-" );
+ IssueUtils.filterIssuesWithVersionPrefix( issueList, "yourPrefix-" );
fail("No issues should be found.");
}
catch ( MojoExecutionException e )
