You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/10 10:12:11 UTC

[maven-changes-plugin] branch MCHANGES-401 updated (01d36d3 -> df2d45b)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch MCHANGES-401
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git.


 discard 01d36d3  [MCHANGES-401] Update code to Java 7
     add 46b6db1  Revert "Use default configuration for Jenkins build"
     add 654a8db  [MCHNGES-402] Upgrade Wagon to 2.4 and httpcomponents
     add a33811d  [MCHANGES-403] Remove use of internal Sun SSL provider
     add d9ef345  [MCHANGES-403] Run Jenkins build with default configuration
     new df2d45b  [MCHANGES-401] Update code syntax to Java 7 and fix warnings

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (01d36d3)
            \
             N -- N -- N   refs/heads/MCHANGES-401 (df2d45b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            | 14 ++++-----
 .../plugins/announcement/AnnouncementMojo.java     | 16 +++++------
 .../mailsender/ProjectJavamailMailSender.java      | 18 +++---------
 .../plugins/changes/AbstractChangesReport.java     |  6 ++--
 .../plugins/changes/ChangesValidatorMojo.java      |  3 +-
 .../apache/maven/plugins/changes/IssueType.java    |  5 +---
 .../changes/schema/XmlValidationHandler.java       |  2 --
 .../maven/plugins/jira/ClassicJiraDownloader.java  | 33 +++++++++-------------
 .../org/apache/maven/plugins/jira/JiraMojo.java    | 20 ++++++-------
 .../org/apache/maven/plugins/jira/JiraXML.java     |  6 +---
 .../maven/plugins/jira/RestJiraDownloader.java     | 17 ++++++-----
 .../org/apache/maven/plugins/trac/TracMojo.java    |  4 +--
 .../apache/maven/plugins/changes/ActionTest.java   |  8 ------
 .../apache/maven/plugins/changes/ReleaseTest.java  | 12 +-------
 .../apache/maven/plugins/issues/IssueTestCase.java |  4 ---
 .../maven/plugins/jira/JiraUnicodeTestCase.java    |  6 ++--
 .../maven/plugins/jira/MockJiraDownloader.java     |  1 -
 17 files changed, 63 insertions(+), 112 deletions(-)


[maven-changes-plugin] 01/01: [MCHANGES-401] Update code syntax to Java 7 and fix warnings

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MCHANGES-401
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git

commit df2d45b05fec19dcc040338b2c9c9b0811f5245f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Feb 10 10:47:08 2020 +0100

    [MCHANGES-401] Update code syntax to Java 7 and fix warnings
---
 .../plugins/announcement/AnnouncementMojo.java     |  18 ++--
 .../plugins/changes/AbstractChangesReport.java     |  14 +--
 .../maven/plugins/changes/ChangesCheckMojo.java    |   6 +-
 .../apache/maven/plugins/changes/ChangesMojo.java  |   8 +-
 .../plugins/changes/ChangesReportGenerator.java    |   6 +-
 .../plugins/changes/ChangesValidatorMojo.java      |   3 +-
 .../maven/plugins/changes/FeedGenerator.java       |   6 +-
 .../apache/maven/plugins/changes/IssueAdapter.java |   9 +-
 .../apache/maven/plugins/changes/IssueType.java    |   5 +-
 .../apache/maven/plugins/changes/ReleaseUtils.java |   6 +-
 .../schema/DefaultChangesSchemaValidator.java      |   4 +-
 .../changes/schema/XmlValidationHandler.java       |   8 +-
 .../maven/plugins/github/GitHubDownloader.java     |   4 +-
 .../apache/maven/plugins/github/GitHubMojo.java    |   2 +-
 .../issues/AbstractIssueManagementSystem.java      |   2 +-
 .../org/apache/maven/plugins/issues/Issue.java     |   6 +-
 .../apache/maven/plugins/issues/IssueUtils.java    |   6 +-
 .../maven/plugins/issues/IssuesReportHelper.java   |   2 +-
 .../maven/plugins/jira/ClassicJiraDownloader.java  |  33 +++----
 .../org/apache/maven/plugins/jira/JiraHelper.java  |   4 +-
 .../org/apache/maven/plugins/jira/JiraMojo.java    |  22 ++---
 .../org/apache/maven/plugins/jira/JiraXML.java     |  40 ++++-----
 .../maven/plugins/jira/ParameterQueryBuilder.java  | 100 ++++++++++-----------
 .../maven/plugins/jira/RestJiraDownloader.java     |  31 ++++---
 .../resource/loader/ProjectResourceLoader.java     |   4 +-
 .../apache/maven/plugins/trac/TracDownloader.java  |   4 +-
 .../org/apache/maven/plugins/trac/TracMojo.java    |   8 +-
 .../apache/maven/plugins/changes/ActionTest.java   |  14 +--
 .../plugins/changes/ChangesCheckMojoTestCase.java  |   2 -
 .../maven/plugins/changes/ChangesXMLTest.java      |   1 -
 .../maven/plugins/changes/FeedGeneratorTest.java   |   2 +-
 .../apache/maven/plugins/changes/ReleaseTest.java  |  16 +---
 .../plugins/changes/ReleaseUtilsTestCase.java      |   5 +-
 .../plugins/github/GitHubDownloaderTestCase.java   |   6 +-
 .../plugins/issues/IssueManagementSystemTest.java  |   9 +-
 .../apache/maven/plugins/issues/IssueTestCase.java |   6 --
 .../maven/plugins/issues/IssueUtilsTestCase.java   |   2 +-
 .../maven/plugins/jira/JiraUnicodeTestCase.java    |   7 +-
 .../maven/plugins/jira/MockJiraDownloader.java     |   1 -
 39 files changed, 177 insertions(+), 255 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
index ef7b4c5..8766de6 100644
--- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
+++ b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
@@ -266,7 +266,7 @@ public class AnnouncementMojo
      *
      * @since 2.4
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String filter;
 
     /**
@@ -293,7 +293,7 @@ public class AnnouncementMojo
      *
      * @since 2.1
      */
-    @Parameter( property = "changes.jiraPassword", defaultValue = "" )
+    @Parameter( property = "changes.jiraPassword" )
     private String jiraPassword;
 
     /**
@@ -301,7 +301,7 @@ public class AnnouncementMojo
      *
      * @since 2.1
      */
-    @Parameter( property = "changes.jiraUser", defaultValue = "" )
+    @Parameter( property = "changes.jiraUser" )
     private String jiraUser;
 
     /**
@@ -350,7 +350,7 @@ public class AnnouncementMojo
      *
      * @since 2.4
      */
-    @Parameter( property = "changes.webUser", defaultValue = "" )
+    @Parameter( property = "changes.webUser" )
     private String webUser;
 
     /**
@@ -358,7 +358,7 @@ public class AnnouncementMojo
      *
      * @since 2.4
      */
-    @Parameter( property = "changes.webPassword", defaultValue = "" )
+    @Parameter( property = "changes.webPassword" )
     private String webPassword;
 
     /**
@@ -371,7 +371,7 @@ public class AnnouncementMojo
      *
      * @since 2.5
      */
-    @Parameter( property = "changes.versionPrefix", defaultValue = "" )
+    @Parameter( property = "changes.versionPrefix" )
     private String versionPrefix;
 
     /**
@@ -405,7 +405,7 @@ public class AnnouncementMojo
      *
      * @since 2.4
      */
-    @Parameter( property = "changes.tracPassword", defaultValue = "" )
+    @Parameter( property = "changes.tracPassword" )
     private String tracPassword;
 
     /**
@@ -421,7 +421,7 @@ public class AnnouncementMojo
      *
      * @since 2.4
      */
-    @Parameter( property = "changes.tracUser", defaultValue = "" )
+    @Parameter( property = "changes.tracUser" )
     private String tracUser;
 
     // =======================================//
@@ -490,7 +490,7 @@ public class AnnouncementMojo
         {
             if ( issueManagementSystems == null )
             {
-                issueManagementSystems = new ArrayList<String>();
+                issueManagementSystems = new ArrayList<>();
             }
 
             if ( issueManagementSystems.isEmpty() )
diff --git a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
index cb2d3ee..b4b9ea5 100644
--- a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
+++ b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
@@ -161,7 +161,7 @@ public abstract class AbstractChangesReport
         {
             DecorationModel model = new DecorationModel();
             model.setBody( new Body() );
-            Map<String, String> attributes = new HashMap<String, String>();
+            Map<String, String> attributes = new HashMap<>();
             attributes.put( "outputEncoding", getOutputEncoding() );
             Locale locale = Locale.getDefault();
             SiteRenderingContext siteContext = siteRenderer.createContextForSkin( getSkinArtifactFile(), attributes,
@@ -186,17 +186,7 @@ public abstract class AbstractChangesReport
             siteRenderer.copyResources( siteContext, new File( project.getBasedir(), "src/site/resources" ),
                                         outputDirectory );
         }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
-        catch ( MavenReportException e )
+        catch ( RendererException | IOException | MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
                 + " report generation.", e );
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java b/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
index 2b9c0e4..1c60d0e 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
@@ -163,11 +163,11 @@ public class ChangesCheckMojo
             {
                 // Try to find the specified locale on this system
                 Locale[] locales = Locale.getAvailableLocales();
-                for ( int i = 0; i < locales.length; i++ )
+                for ( Locale value : locales )
                 {
-                    if ( locales[i].toString().equals( locale ) )
+                    if ( value.toString().equals( locale ) )
                     {
-                        usedLocale = locales[i];
+                        usedLocale = value;
                         break;
                     }
                 }
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java b/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
index 3f0cfa1..16576f5 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
@@ -424,11 +424,7 @@ public class ChangesMojo
                 xmlStreamReader.close();
                 xmlStreamReader = null;
             }
-            catch ( IOException e )
-            {
-                throw new MavenReportException( "Exception during filtering changes file : " + e.getMessage(), e );
-            }
-            catch ( MavenFilteringException e )
+            catch ( IOException | MavenFilteringException e )
             {
                 throw new MavenReportException( "Exception during filtering changes file : " + e.getMessage(), e );
             }
@@ -465,7 +461,7 @@ public class ChangesMojo
         throws MavenReportException
     {
         final String pluginResourcesBase = "org/apache/maven/plugins/changes";
-        String resourceNames[] = { "images/add.gif", "images/fix.gif", "images/icon_help_sml.gif", "images/remove.gif",
+        String[] resourceNames = { "images/add.gif", "images/fix.gif", "images/icon_help_sml.gif", "images/remove.gif",
             "images/rss.png", "images/update.gif" };
         try
         {
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
index 233679c..8fe0e62 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
@@ -91,7 +91,7 @@ public class ChangesReportGenerator
 
     public ChangesReportGenerator()
     {
-        issueLinksPerSystem = new HashMap<String, String>();
+        issueLinksPerSystem = new HashMap<>();
     }
 
     public ChangesReportGenerator( List<Release> releaseList )
@@ -316,7 +316,7 @@ public class ChangesReportGenerator
     {
 
         // Create a Map with key : dueTo name, value : dueTo email
-        Map<String, String> namesEmailMap = new LinkedHashMap<String, String>();
+        Map<String, String> namesEmailMap = new LinkedHashMap<>();
 
         // Only add the dueTo specified as attributes, if it has either a dueTo or a dueToEmail
         if ( StringUtils.isNotEmpty( action.getDueTo() ) || StringUtils.isNotEmpty( action.getDueToEmail() ) )
@@ -634,7 +634,7 @@ public class ChangesReportGenerator
     private String parseIssueLink( String issue, String system )
     {
         String parseLink;
-        String issueLink = (String) this.issueLinksPerSystem.get( system );
+        String issueLink = this.issueLinksPerSystem.get( system );
         parseLink = issueLink.replaceFirst( ISSUE_TOKEN, issue );
         if ( parseLink.contains( URL_TOKEN ) )
         {
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java b/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java
index b71b56f..b79e353 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -71,7 +70,7 @@ public class ChangesValidatorMojo
      * @see org.apache.maven.plugin.Mojo#execute()
      */
     public void execute()
-        throws MojoExecutionException, MojoFailureException
+        throws MojoExecutionException
     {
         // Run only at the execution root
         if ( runOnlyAtExecutionRoot && !isThisTheExecutionRoot() )
diff --git a/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java b/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
index b6fcf0b..af0030e 100644
--- a/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
@@ -206,15 +206,13 @@ public class FeedGenerator
         }
         catch ( FeedException ex )
         {
-            IOException ioex = new IOException( ex.getMessage() );
-            ioex.initCause( ex );
-            throw ioex;
+            throw new IOException( ex.getMessage(), ex );
         }
     }
 
     private List<SyndEntry> getEntries( final List<Release> releases )
     {
-        final List<SyndEntry> entries = new ArrayList<SyndEntry>( 1 );
+        final List<SyndEntry> entries = new ArrayList<>( 1 );
 
         if ( releases.size() > 0 )
         {
diff --git a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
index baf8f55..ef090a3 100644
--- a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
+++ b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
@@ -67,7 +67,7 @@ public class IssueAdapter
     public List<Release> getReleases( List<Issue> issues )
     {
         // A Map of releases keyed by fixVersion
-        Map<String, Release> releasesMap = new HashMap<String, Release>();
+        Map<String, Release> releasesMap = new HashMap<>();
 
         // Loop through all issues looking for fixVersions
         for ( Issue issue : issues )
@@ -95,12 +95,7 @@ public class IssueAdapter
         }
 
         // Extract the releases from the Map to a List
-        List<Release> releasesList = new ArrayList<Release>();
-        for ( Release release : releasesMap.values() )
-        {
-            releasesList.add( release );
-        }
-        return releasesList;
+        return new ArrayList<>( releasesMap.values() );
     }
 
     /**
diff --git a/src/main/java/org/apache/maven/plugins/changes/IssueType.java b/src/main/java/org/apache/maven/plugins/changes/IssueType.java
index f7f5609..ed112d2 100644
--- a/src/main/java/org/apache/maven/plugins/changes/IssueType.java
+++ b/src/main/java/org/apache/maven/plugins/changes/IssueType.java
@@ -30,13 +30,10 @@ public enum IssueType
 
     private String configurationKey;
 
-    // Checkstyle will complain about private modifier
-    //CHECKSTYLE_OFF: RedundantModifier
-    private IssueType( String configurationKey )
+    IssueType( String configurationKey )
     {
         this.configurationKey = configurationKey;
     }
-    //CHECKSTYLE_ON
 
     public String configurationKey()
     {
diff --git a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
index 03113d4..fbf29f2 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
@@ -146,7 +146,7 @@ public class ReleaseUtils
             return firstReleases;
         }
 
-        List<Release> mergedReleases = new ArrayList<Release>();
+        List<Release> mergedReleases = new ArrayList<>();
 
         // Loop through the releases from the first issue tracker, merging in
         // actions from releases with the same version from the second issue
@@ -198,7 +198,7 @@ public class ReleaseUtils
             return releases;
         }
 
-        final List<Release> mergedReleases = new ArrayList<Release>();
+        final List<Release> mergedReleases = new ArrayList<>();
 
         if ( releases != null )
         {
@@ -240,7 +240,7 @@ public class ReleaseUtils
 
     public static String toString( List<Release> releases )
     {
-        List<String> releaseStrings = new ArrayList<String>( releases.size() );
+        List<String> releaseStrings = new ArrayList<>( releases.size() );
         for ( Release release : releases )
         {
             releaseStrings.add( toString( release ) );
diff --git a/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java b/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
index 1eb93b5..a86135b 100644
--- a/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
@@ -51,7 +51,7 @@ public class DefaultChangesSchemaValidator
 
     public static final String CHANGES_SCHEMA_PATH = "META-INF/changes/xsd/";
 
-    private Map<String, Schema> compiledSchemas = new HashMap<String, Schema>();
+    private Map<String, Schema> compiledSchemas = new HashMap<>();
 
     public XmlValidationHandler validateXmlWithSchema( File file, String schemaVersion, boolean failOnValidationError )
         throws SchemaValidatorException
@@ -101,7 +101,7 @@ public class DefaultChangesSchemaValidator
     {
         if ( this.compiledSchemas.containsKey( schemaPath ) )
         {
-            return (Schema) this.compiledSchemas.get( schemaPath );
+            return this.compiledSchemas.get( schemaPath );
         }
         Schema schema = this.compileJAXPSchema( schemaPath );
 
diff --git a/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java b/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
index bfcfa6c..b7ae15f 100644
--- a/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
+++ b/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
@@ -38,11 +38,11 @@ public class XmlValidationHandler
    
     private boolean parsingError = false;
 
-    private List<SAXParseException> errors = new ArrayList<SAXParseException>();
+    private List<SAXParseException> errors = new ArrayList<>();
 
-    private List<SAXParseException> fatalErrors = new ArrayList<SAXParseException>();
+    private List<SAXParseException> fatalErrors = new ArrayList<>();
 
-    private List<SAXParseException> warnings = new ArrayList<SAXParseException>();
+    private List<SAXParseException> warnings = new ArrayList<>();
 
     private boolean failOnValidationError;
 
@@ -85,7 +85,6 @@ public class XmlValidationHandler
      * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
      */
     public void warning( SAXParseException excp )
-        throws SAXException
     {
         this.warnings.add( excp );
     }
@@ -94,7 +93,6 @@ public class XmlValidationHandler
      * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
      */
     public void startElement( String uri, String localName, String qName, Attributes attributes )
-        throws SAXException
     {
         // nothing
     }
diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java b/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
index 9f7c57b..cdd3a78 100644
--- a/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
@@ -182,10 +182,10 @@ public class GitHubDownloader
     public List<Issue> getIssueList()
         throws IOException
     {
-        List<Issue> issueList = new ArrayList<Issue>();
+        List<Issue> issueList = new ArrayList<>();
 
         IssueService service = new IssueService( client );
-        Map<String, String> issueFilter = new HashMap<String, String>();
+        Map<String, String> issueFilter = new HashMap<>();
 
         if ( includeOpenIssues )
         {
diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java b/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
index caa5cbf..cdd11fe 100644
--- a/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
+++ b/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
@@ -53,7 +53,7 @@ public class GitHubMojo
     /**
      * Valid Github columns.
      */
-    private static Map<String, Integer> githubColumns = new HashMap<String, Integer>();
+    private static Map<String, Integer> githubColumns = new HashMap<>();
 
     static
     {
diff --git a/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java b/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
index 05dbb58..5e63c7c 100644
--- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
+++ b/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
@@ -43,7 +43,7 @@ public abstract class AbstractIssueManagementSystem
 
     protected AbstractIssueManagementSystem()
     {
-        issueTypeMap = new HashMap<String, IssueType>();
+        issueTypeMap = new HashMap<>();
     }
 
     /*
diff --git a/src/main/java/org/apache/maven/plugins/issues/Issue.java b/src/main/java/org/apache/maven/plugins/issues/Issue.java
index 4e42175..09c24d6 100644
--- a/src/main/java/org/apache/maven/plugins/issues/Issue.java
+++ b/src/main/java/org/apache/maven/plugins/issues/Issue.java
@@ -89,7 +89,7 @@ public class Issue
     {
         if ( comments == null )
         {
-            comments = new ArrayList<String>();
+            comments = new ArrayList<>();
         }
         comments.add( comment );
     }
@@ -103,7 +103,7 @@ public class Issue
     {
         if ( components == null )
         {
-            components = new ArrayList<String>();
+            components = new ArrayList<>();
         }
         components.add( component );
     }
@@ -127,7 +127,7 @@ public class Issue
     {
         if ( fixVersions == null )
         {
-            fixVersions = new ArrayList<String>();
+            fixVersions = new ArrayList<>();
         }
         fixVersions.add( fixVersion );
     }
diff --git a/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java b/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
index 01d22b2..23a7a5b 100644
--- a/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
+++ b/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
@@ -46,7 +46,7 @@ public class IssueUtils
     public static List<Issue> filterIssuesWithVersionPrefix( List<Issue> issues, String prefix )
         throws MojoExecutionException
     {
-        List<Issue> filteredIssues = new ArrayList<Issue>();
+        List<Issue> filteredIssues = new ArrayList<>();
         boolean isFound = false;
         Issue issue;
 
@@ -89,7 +89,7 @@ public class IssueUtils
     public static List<Issue> getIssuesForVersion( List<Issue> issues, String version )
         throws MojoExecutionException
     {
-        List<Issue> issuesForVersion = new ArrayList<Issue>();
+        List<Issue> issuesForVersion = new ArrayList<>();
         boolean isFound = false;
         Issue issue;
         String releaseVersion = version;
@@ -121,7 +121,7 @@ public class IssueUtils
 
     public static String toString( List<Issue> issues )
     {
-        List<String> issueStrings = new ArrayList<String>( issues.size() );
+        List<String> issueStrings = new ArrayList<>( issues.size() );
         for ( Issue issue : issues )
         {
             issueStrings.add( issue.toString() );
diff --git a/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java b/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
index 11c171c..9ca1d2a 100644
--- a/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
+++ b/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
@@ -91,7 +91,7 @@ public class IssuesReportHelper
                                               Map<String, Integer> deprecatedColumns, Log log )
     {
         DualHashBidiMap bidiColumns = null;
-        List<Integer> columnIds = new ArrayList<Integer>();
+        List<Integer> columnIds = new ArrayList<>();
         String[] columnNamesArray = columnNames.split( "," );
 
         if ( deprecatedColumns != null )
diff --git a/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java b/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java
index 596edfd..ee0e33c 100644
--- a/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java
@@ -63,10 +63,8 @@ public final class ClassicJiraDownloader
     /**
      * Execute the query on the JIRA server.
      *
-     * @throws Exception on error
      */
     public void doExecute()
-        throws Exception
     {
         try
         {
@@ -148,20 +146,17 @@ public final class ClassicJiraDownloader
         }
         else
         {
-            // CHECKSTYLE_OFF: LineLength
             // create the URL for getting the proper issues from JIRA
-            String jqlQuery =
-                new JqlQueryBuilder( log ).project( jiraProject ).fixVersion( getFixFor() ).fixVersionIds( fixVersionIds ).statusIds( statusIds ).priorityIds( priorityIds ).resolutionIds( resolutionIds ).components( component ).typeIds( typeIds ).sortColumnNames( sortColumnNames ).build();
-
-            String url =
-                new UrlBuilder( jiraUrl,
-                                "sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml" ).addParameter( "tempMax",
-                                                                                                              nbEntriesMax ).addParameter( "reset",
-                                                                                                                                           "true" ).addParameter( "jqlQuery",
-                                                                                                                                                                  jqlQuery ).build();
-
-            // CHECKSTYLE_ON: LineLength
-            return url;
+            String jqlQuery = new JqlQueryBuilder( log ).project( jiraProject ).fixVersion( getFixFor() )
+                .fixVersionIds( fixVersionIds ).statusIds( statusIds ).priorityIds( priorityIds )
+                .resolutionIds( resolutionIds ).components( component ).typeIds( typeIds )
+                .sortColumnNames( sortColumnNames )
+                .build();
+
+            return new UrlBuilder( jiraUrl, "sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml" )
+                        .addParameter( "tempMax", nbEntriesMax ).addParameter( "reset", "true" )
+                        .addParameter( "jqlQuery", jqlQuery )
+                        .build();
         }
     }
 
@@ -193,10 +188,10 @@ public final class ClassicJiraDownloader
                 fullURL += "&fixfor=" + getFixFor();
             }
 
-            // CHECKSTYLE_OFF: LineLength
-            String createdFilter =
-                new ParameterQueryBuilder( log ).fixVersionIds( fixVersionIds ).statusIds( statusIds ).priorityIds( priorityIds ).resolutionIds( resolutionIds ).components( component ).typeIds( typeIds ).sortColumnNames( sortColumnNames ).filter( filter ).build();
-            // CHECKSTYLE_ON: LineLength
+            String createdFilter = new ParameterQueryBuilder( log ).fixVersionIds( fixVersionIds )
+                    .statusIds( statusIds ).priorityIds( priorityIds ).resolutionIds( resolutionIds )
+                    .components( component ).typeIds( typeIds ).sortColumnNames( sortColumnNames ).filter( filter )
+                    .build();
 
             if ( createdFilter.charAt( 0 ) != '&' )
             {
diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java b/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
index 9f97eae..d50bc85 100644
--- a/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
+++ b/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
@@ -84,7 +84,7 @@ public class JiraHelper
             }
         }
 
-        HashMap<String, String> urlMap = new HashMap<String, String>( 4 );
+        HashMap<String, String> urlMap = new HashMap<>( 4 );
 
         urlMap.put( "url", jiraUrl );
 
@@ -186,7 +186,7 @@ public class JiraHelper
             throw new IllegalArgumentException( "Invalid browse URL" );
         }
 
-        HashMap<String, String> urlMap = new HashMap<String, String>( 4 );
+        HashMap<String, String> urlMap = new HashMap<>( 4 );
         urlMap.put( "url", jiraUrl );
         urlMap.put( "project", project );
 
diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java b/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
index 4777ee2..1d9c317 100644
--- a/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
@@ -51,7 +51,7 @@ public class JiraMojo
     /**
      * Valid JIRA columns.
      */
-    private static final Map<String, Integer> JIRA_COLUMNS = new HashMap<String, Integer>( 16 );
+    private static final Map<String, Integer> JIRA_COLUMNS = new HashMap<>( 16 );
 
     static
     {
@@ -109,14 +109,14 @@ public class JiraMojo
      * Sets the component(s) that you want to limit your report to include. Multiple values can be separated by commas
      * (such as 10011,10012). If this is set to empty - that means all components will be included.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String component;
 
     /**
      * Defines the filter parameters to restrict which issues are retrieved from JIRA. The filter parameter uses the
      * same format of url parameters that is used in a JIRA search.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter()
     private String filter;
 
     /**
@@ -126,7 +126,7 @@ public class JiraMojo
      *
      * @since 2.0
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String fixVersionIds;
 
     /**
@@ -140,13 +140,13 @@ public class JiraMojo
     /**
      * Defines the JIRA password for authentication into a private JIRA installation.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String jiraPassword;
 
     /**
      * Defines the JIRA username for authentication into a private JIRA installation.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String jiraUser;
 
     /**
@@ -175,7 +175,7 @@ public class JiraMojo
      * <code>Critical</code>, <code>Major</code>, <code>Minor</code> and <code>Trivial</code>. Multiple values can be
      * separated by commas. If this is set to empty - that means all priorities will be included.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String priorityIds;
 
     /**
@@ -252,7 +252,7 @@ public class JiraMojo
      *
      * @since 2.0
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String typeIds;
 
     /**
@@ -265,19 +265,19 @@ public class JiraMojo
      *
      * @since 2.4
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String versionPrefix;
 
     /**
      * Defines the http password for basic authentication into the JIRA webserver.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String webPassword;
 
     /**
      * Defines the http user for basic authentication into the JIRA webserver.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String webUser;
 
     /*
diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraXML.java b/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
index 1bb2e22..b3592fe 100644
--- a/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
+++ b/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
@@ -39,7 +39,6 @@ import org.apache.maven.plugins.issues.Issue;
 import org.codehaus.plexus.util.IOUtil;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -65,7 +64,7 @@ public class JiraXML
 
     private final Log log;
 
-    private SimpleDateFormat sdf = null;
+    private SimpleDateFormat sdf;
 
     /**
      * @param log not null.
@@ -87,7 +86,7 @@ public class JiraXML
             sdf = new SimpleDateFormat( datePattern, Locale.ENGLISH );
         }
 
-        this.issueList = new ArrayList<Issue>( 16 );
+        this.issueList = new ArrayList<>( 16 );
     }
 
     /**
@@ -134,30 +133,30 @@ public class JiraXML
     }
 
     public void startElement( String namespaceURI, String sName, String qName, Attributes attrs )
-        throws SAXException
     {
-        if ( qName.equals( "item" ) )
+        switch ( qName )
         {
-            issue = new Issue();
+            case "item":
+                issue = new Issue();
 
-            currentParent = "item";
-        }
-        else if ( qName.equals( "key" ) )
-        {
-            String id = attrs.getValue( "id" );
-            if ( id != null )
-            {
-                issue.setId( id.trim() );
-            }
-        }
-        else if ( qName.equals( "build-info" ) )
-        {
-            currentParent = "build-info";
+                currentParent = "item";
+                break;
+            case "key":
+                String id = attrs.getValue( "id" );
+                if ( id != null )
+                {
+                    issue.setId( id.trim() );
+                }
+                break;
+            case "build-info":
+                currentParent = "build-info";
+                break;
+            default:
+                // none
         }
     }
 
     public void endElement( String namespaceURI, String sName, String qName )
-        throws SAXException
     {
         if ( qName.equals( "item" ) )
         {
@@ -252,7 +251,6 @@ public class JiraXML
     }
 
     public void characters( char[] buf, int offset, int len )
-        throws SAXException
     {
         currentElement.append( buf, offset, len );
     }
diff --git a/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java b/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
index 074d449..22f3a5a 100644
--- a/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
+++ b/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
@@ -44,16 +44,16 @@ public class ParameterQueryBuilder
     private StringBuilder query = new StringBuilder();
 
     /** Mapping containing all allowed JIRA priority values. */
-    private final Map<String, String> priorityMap = new HashMap<String, String>( 8 );
+    private final Map<String, String> priorityMap = new HashMap<>( 8 );
 
     /** Mapping containing all allowed JIRA resolution values. */
-    private final Map<String, String> resolutionMap = new HashMap<String, String>( 8 );
+    private final Map<String, String> resolutionMap = new HashMap<>( 8 );
 
     /** Mapping containing all allowed JIRA status values. */
-    private final Map<String, String> statusMap = new HashMap<String, String>( 8 );
+    private final Map<String, String> statusMap = new HashMap<>( 8 );
 
     /** Mapping containing all allowed JIRA type values. */
-    private final Map<String, String> typeMap = new HashMap<String, String>( 8 );
+    private final Map<String, String> typeMap = new HashMap<>( 8 );
 
     public ParameterQueryBuilder( Log log )
     {
@@ -262,57 +262,49 @@ public class ParameterQueryBuilder
                     lowerColumnName = lowerColumnName.substring( 0, lowerColumnName.length() - 3 ).trim();
                 }
 
-                if ( "key".equals( lowerColumnName ) )
+                switch ( lowerColumnName )
                 {
-                    fieldName = "issuekey";
-                }
-                else if ( "summary".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "status".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "resolution".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "assignee".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "reporter".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "type".equals( lowerColumnName ) )
-                {
-                    fieldName = "issuetype";
-                }
-                else if ( "priority".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "version".equals( lowerColumnName ) )
-                {
-                    fieldName = "versions";
-                }
-                else if ( "fix version".equals( lowerColumnName ) )
-                {
-                    fieldName = "fixVersions";
-                }
-                else if ( "component".equals( lowerColumnName ) )
-                {
-                    fieldName = "components";
-                }
-                else if ( "created".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
-                }
-                else if ( "updated".equals( lowerColumnName ) )
-                {
-                    fieldName = lowerColumnName;
+                    case "key":
+                        fieldName = "issuekey";
+                        break;
+                    case "summary":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "status":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "resolution":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "assignee":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "reporter":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "type":
+                        fieldName = "issuetype";
+                        break;
+                    case "priority":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "version":
+                        fieldName = "versions";
+                        break;
+                    case "fix version":
+                        fieldName = "fixVersions";
+                        break;
+                    case "component":
+                        fieldName = "components";
+                        break;
+                    case "created":
+                        fieldName = lowerColumnName;
+                        break;
+                    case "updated":
+                        fieldName = lowerColumnName;
+                        break;
+                    default:
+                        // skip
                 }
                 if ( fieldName != null )
                 {
diff --git a/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java b/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
index bfe3dd3..69fa03b 100644
--- a/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
@@ -76,8 +76,6 @@ public class RestJiraDownloader
 
     private List<String> resolvedPriorityIds;
 
-    private String jiraProject;
-
     /**
      * 
      */
@@ -102,12 +100,12 @@ public class RestJiraDownloader
         jsonFactory = new MappingJsonFactory();
         // 2012-07-17T06:26:47.723-0500
         dateFormat = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSSZ" );
-        resolvedFixVersionIds = new ArrayList<String>();
-        resolvedStatusIds = new ArrayList<String>();
-        resolvedComponentIds = new ArrayList<String>();
-        resolvedTypeIds = new ArrayList<String>();
-        resolvedResolutionIds = new ArrayList<String>();
-        resolvedPriorityIds = new ArrayList<String>();
+        resolvedFixVersionIds = new ArrayList<>();
+        resolvedStatusIds = new ArrayList<>();
+        resolvedComponentIds = new ArrayList<>();
+        resolvedTypeIds = new ArrayList<>();
+        resolvedResolutionIds = new ArrayList<>();
+        resolvedPriorityIds = new ArrayList<>();
     }
 
     public void doExecute()
@@ -116,7 +114,7 @@ public class RestJiraDownloader
 
         Map<String, String> urlMap = JiraHelper.getJiraUrlAndProjectName( project.getIssueManagement().getUrl() );
         String jiraUrl = urlMap.get( "url" );
-        jiraProject = urlMap.get( "project" );
+        String jiraProject = urlMap.get( "project" );
 
         WebClient client = setupWebClient( jiraUrl );
 
@@ -137,10 +135,12 @@ public class RestJiraDownloader
 
         resolveIds( client, jiraProject );
 
-        // CHECKSTYLE_OFF: LineLength
-        String jqlQuery =
-            new JqlQueryBuilder( log ).urlEncode( false ).project( jiraProject ).fixVersion( getFixFor() ).fixVersionIds( resolvedFixVersionIds ).statusIds( resolvedStatusIds ).priorityIds( resolvedPriorityIds ).resolutionIds( resolvedResolutionIds ).components( resolvedComponentIds ).typeIds( resolvedTypeIds ).sortColumnNames( sortColumnNames ).filter( filter ).build();
-        // CHECKSTYLE_ON: LineLength
+        String jqlQuery = new JqlQueryBuilder( log ).urlEncode( false ).project( jiraProject )
+            .fixVersion( getFixFor() ).fixVersionIds( resolvedFixVersionIds ).statusIds( resolvedStatusIds )
+            .priorityIds( resolvedPriorityIds ).resolutionIds( resolvedResolutionIds )
+            .components( resolvedComponentIds ).typeIds( resolvedTypeIds ).sortColumnNames( sortColumnNames )
+            .filter( filter )
+            .build();
 
         StringWriter searchParamStringWriter = new StringWriter();
         JsonGenerator gen = jsonFactory.createGenerator( searchParamStringWriter );
@@ -250,7 +250,7 @@ public class RestJiraDownloader
     }
 
     private String resolveOneItem( JsonNode items, String what, String nameOrId )
-        throws IOException, MojoExecutionException, MojoFailureException
+        throws MojoFailureException
     {
         for ( int cx = 0; cx < items.size(); cx++ )
         {
@@ -275,7 +275,7 @@ public class RestJiraDownloader
 
     private void buildIssues( JsonNode issuesNode, String jiraUrl, String jiraProject )
     {
-        issueList = new ArrayList<Issue>();
+        issueList = new ArrayList<>();
         for ( int ix = 0; ix < issuesNode.size(); ix++ )
         {
             JsonNode issueNode = issuesNode.get( ix );
@@ -604,7 +604,6 @@ public class RestJiraDownloader
     }
 
     public List<Issue> getIssueList()
-        throws MojoExecutionException
     {
         return issueList;
     }
diff --git a/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java b/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
index 1f4bc60..c4e9153 100644
--- a/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
+++ b/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
@@ -51,7 +51,7 @@ public class ProjectResourceLoader
      * Used to map the path that a template was found on so that we can properly check the modification times of the
      * files.
      */
-    private Hashtable<String, String> templatePaths = new Hashtable<String, String>();
+    private Hashtable<String, String> templatePaths = new Hashtable<>();
 
     public void init( ExtendedProperties configuration )
     {
@@ -64,7 +64,7 @@ public class ProjectResourceLoader
 
         rsvc.getLog().info( "path :" + path );
 
-        paths = new ArrayList<String>();
+        paths = new ArrayList<>();
 
         paths.add( path );
 
diff --git a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
index c32ebae..9483454 100644
--- a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
@@ -67,7 +67,7 @@ public class TracDownloader
 
         issue.setKey( String.valueOf( ticketObj[0] ) );
 
-        issue.setLink( getUrl() + "/ticket/" + String.valueOf( ticketObj[0] ) );
+        issue.setLink( getUrl() + "/ticket/" + ticketObj[0] );
 
         issue.setCreated( parseDate( String.valueOf( ticketObj[1] ) ) );
 
@@ -130,7 +130,7 @@ public class TracDownloader
 
         Object[] params = new Object[] { qstr };
         Object[] queryResult;
-        ArrayList<Issue> issueList = new ArrayList<Issue>();
+        ArrayList<Issue> issueList = new ArrayList<>();
         try
         {
             queryResult = (Object[]) client.execute( "ticket.query", params );
diff --git a/src/main/java/org/apache/maven/plugins/trac/TracMojo.java b/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
index 48dac11..135ad66 100644
--- a/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
+++ b/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
@@ -50,12 +50,12 @@ public class TracMojo
     /**
      * Deprecated Trac columns.
      */
-    private static final Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String, Integer>();
+    private static final Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<>();
 
     /**
      * Valid Trac columns.
      */
-    private static final Map<String, Integer> TRAC_COLUMNS = new HashMap<String, Integer>();
+    private static final Map<String, Integer> TRAC_COLUMNS = new HashMap<>();
 
     static
     {
@@ -109,13 +109,13 @@ public class TracMojo
     /**
      * Defines the Trac password for authentication into a private Trac installation.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String tracPassword;
 
     /**
      * Defines the Trac username for authentication into a private Trac installation.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter
     private String tracUser;
 
     /* --------------------------------------------------------------------- */
diff --git a/src/test/java/org/apache/maven/plugins/changes/ActionTest.java b/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
index e622cde..6991190 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
@@ -35,21 +35,9 @@ public class ActionTest
         super( testName );
     }
 
-    protected void setUp()
-        throws Exception
-    {
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
-    }
-
     public static Test suite()
     {
-        TestSuite suite = new TestSuite( ActionTest.class );
-
-        return suite;
+        return new TestSuite( ActionTest.class );
     }
 
     public void testGetSetAction()
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
index 3d83784..cd5ddc9 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
@@ -37,7 +37,6 @@ public class ChangesCheckMojoTestCase
 {
     @Test
     public void testIsValidDate()
-        throws Exception
     {
         String pattern;
 
@@ -66,7 +65,6 @@ public class ChangesCheckMojoTestCase
 
     @Test
     public void testIsValidateWithLocale()
-        throws Exception
     {
         String pattern, locale = null;
 
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java b/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
index 2807023..af733a8 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
@@ -133,7 +133,6 @@ public class ChangesXMLTest
     }
 
     public void testParseChangesFile()
-        throws Exception
     {
         File changesFile = new File( getBasedir() + "/src/test/unit/changes.xml" );
         ChangesXML changesXML = new ChangesXML( changesFile, new MockLog() );
diff --git a/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java b/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
index a700a4f..9bbd005 100644
--- a/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
@@ -77,7 +77,7 @@ public class FeedGeneratorTest
 
         Release release = new Release();
         release.setVersion( "1.0" );
-        List<Release> releases = new ArrayList<Release>( 1 );
+        List<Release> releases = new ArrayList<>( 1 );
 
         try
         {
diff --git a/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java b/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
index ec07095..1d91406 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
@@ -39,21 +39,9 @@ public class ReleaseTest
         super( testName );
     }
 
-    protected void setUp()
-        throws Exception
-    {
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
-    }
-
     public static Test suite()
     {
-        TestSuite suite = new TestSuite( ReleaseTest.class );
-
-        return suite;
+        return new TestSuite( ReleaseTest.class );
     }
 
     public void testGetSetVersion()
@@ -72,7 +60,7 @@ public class ReleaseTest
 
     public void testGetSetAction()
     {
-        List<Action> actionList = new ArrayList<Action>();
+        List<Action> actionList = new ArrayList<>();
 
         release.setActions( actionList );
 
diff --git a/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java b/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
index 39b470d..0629405 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
@@ -37,13 +37,12 @@ public class ReleaseUtilsTestCase
     extends TestCase
 {
     public void testMergeReleases()
-        throws Exception
     {
         Log log = new SilentLog();
         ReleaseUtils releaseUtils = new ReleaseUtils( log );
 
-        List<Release> firstReleases = new ArrayList<Release>();
-        List<Release> secondReleases = new ArrayList<Release>();
+        List<Release> firstReleases = new ArrayList<>();
+        List<Release> secondReleases = new ArrayList<>();
         List<Release> mergedReleases;
 
         mergedReleases = releaseUtils.mergeReleases( firstReleases, secondReleases );
diff --git a/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java b/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
index 38858b5..8f0a95d 100644
--- a/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
@@ -85,8 +85,8 @@ public class GitHubDownloaderTestCase
         SettingsDecrypter decrypter = mock( SettingsDecrypter.class );
         SettingsDecryptionResult result = mock( SettingsDecryptionResult.class );
         Log log = mock( Log.class );
-        when( result.getProblems() ).thenReturn( Arrays.<SettingsProblem>asList( new DefaultSettingsProblem( "Ups "
-            + server.getId(), Severity.ERROR, null, -1, -1, null ) ) );
+        when( result.getProblems() ).thenReturn( Collections.<SettingsProblem>singletonList(
+                new DefaultSettingsProblem( "Ups " + server.getId(), Severity.ERROR, null, -1, -1, null ) ) );
         when( result.getServer() ).thenReturn( server );
         when( decrypter.decrypt( any( SettingsDecryptionRequest.class ) ) ).thenReturn( result );
 
@@ -95,7 +95,7 @@ public class GitHubDownloaderTestCase
         verify( log ).error( "Ups github-server", null );
         ArgumentCaptor<SettingsDecryptionRequest> argument = ArgumentCaptor.forClass( SettingsDecryptionRequest.class );
         verify( decrypter ).decrypt( argument.capture() );
-        List<Server> servers = ( (DefaultSettingsDecryptionRequest) argument.getValue() ).getServers();
+        List<Server> servers = argument.getValue().getServers();
         assertEquals( 1, servers.size() );
         assertSame( server, servers.get( 0 ) );
     }
diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java b/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
index b714a28..22b526b 100644
--- a/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
+++ b/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
@@ -38,7 +38,7 @@ public class IssueManagementSystemTest
 
     private MockIssueManagementSystem ims;
 
-    private class MockIssueManagementSystem
+    private static class MockIssueManagementSystem
         extends AbstractIssueManagementSystem
     {
 
@@ -52,14 +52,13 @@ public class IssueManagementSystemTest
 
     @Override
     protected void setUp()
-        throws Exception
     {
         ims = new MockIssueManagementSystem();
     }
 
     public void testApplyingValidCustomIssueTypes()
     {
-        Map<String, String> issueTypes = new HashMap<String, String>();
+        Map<String, String> issueTypes = new HashMap<>();
         issueTypes.put( "add", "Story,Epic" );
         issueTypes.put( "fix", "Defect" );
         issueTypes.put( "update", "Improvement" );
@@ -76,7 +75,7 @@ public class IssueManagementSystemTest
 
     public void testApplyingInvalidCustomIssueTypes()
     {
-        Map<String, String> issueTypes = new HashMap<String, String>();
+        Map<String, String> issueTypes = new HashMap<>();
         issueTypes.put( "new", "Story,Epic" );
 
         try
@@ -84,7 +83,7 @@ public class IssueManagementSystemTest
             ims.applyConfiguration( issueTypes );
             fail( "Exception not thrown for invalid group name" );
         }
-        catch ( MojoExecutionException e )
+        catch ( MojoExecutionException ignored )
         {
 
         }
diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java b/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
index 4870e8f..b4b0780 100644
--- a/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
@@ -35,16 +35,10 @@ public class IssueTestCase
     Issue issue;
 
     protected void setUp()
-        throws Exception
     {
         issue = new Issue();
     }
 
-    protected void tearDown()
-        throws Exception
-    {
-    }
-
     public void testGetSetAssignee()
     {
         issue.setAssignee( "assignee" );
diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java b/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
index 9fae6bb..b792660 100644
--- a/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
@@ -49,7 +49,7 @@ public class IssueUtilsTestCase
         issue_2.setId( "2" );
         issue_2.addFixVersion( "1.0" );
 
-        List<Issue> issueList = new ArrayList<Issue>();
+        List<Issue> issueList = new ArrayList<>();
         issueList.add( issue_1 );
         issueList.add( issue_2 );
 
diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java b/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
index 9d799da..22a9f92 100644
--- a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
@@ -24,13 +24,14 @@ import java.io.InputStream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugins.jira.JiraMojo;
 import org.apache.maven.project.MavenProject;
 import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
  * @version $Id$
  */
@@ -59,9 +60,9 @@ public class JiraUnicodeTestCase
         setVariableValueToObject( mojo, "project", project );
         setVariableValueToObject( mojo, "mavenSession", session );
         InputStream testJiraXmlStream = JiraUnicodeTestCase.class.getResourceAsStream( "unicode-jira-results.xml" );
-        String jiraXml = null;
+        String jiraXml;
         try {
-            jiraXml = IOUtils.toString(testJiraXmlStream, "utf-8");
+            jiraXml = IOUtils.toString(testJiraXmlStream, UTF_8 );
         } finally {
             testJiraXmlStream.close();
         }
diff --git a/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java b/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java
index 8e2a5c3..69a7896 100644
--- a/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java
+++ b/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java
@@ -38,7 +38,6 @@ public class MockJiraDownloader
 {
     @Override
     public void doExecute()
-        throws Exception
     {
         // do nothing
     }