Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,12 +23,10 @@ import java.text.NumberFormat; import java.text.ParsePosition; import java.util.HashMap; import java.util.Map; -import java.util.StringTokenizer; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.maven.plugin.logging.Log; -import org.apache.maven.wagon.proxy.ProxyInfo; /** * A helper class with common JIRA related functionality. @@ -144,47 +142,6 @@ public class JiraHelper return jiraId; } - /** - * Check if the specified host is in the list of non proxy hosts. - * <p/> - * Method copied from org.apache.maven.wagon.proxy.ProxyUtils. Can be deleted when maven-changes-plugin references a - * more recent version of maven-project - * - * @param proxy the proxy info object contains set of properties. - * @param targetHost the target hostname - * @return true if the hostname is in the list of non proxy hosts, false otherwise. - */ - public static boolean validateNonProxyHosts( ProxyInfo proxy, String targetHost ) - { - String tHost = targetHost; - if ( tHost == null ) - { - tHost = ""; - } - if ( proxy == null ) - { - return false; - } - String nonProxyHosts = proxy.getNonProxyHosts(); - if ( nonProxyHosts == null ) - { - return false; - } - - StringTokenizer tokenizer = new StringTokenizer( nonProxyHosts, "|" ); - - while ( tokenizer.hasMoreTokens() ) - { - String pattern = tokenizer.nextToken(); - pattern = pattern.replaceAll( "\\.", "\\\\." ).replaceAll( "\\*", ".*" ); - if ( tHost.matches( pattern ) ) - { - return true; - } - } - return false; - } - private JiraHelper() { // utility class @@ -237,6 +194,8 @@ public class JiraHelper } /** + * @param url URL. + * @return the base URL. * @since 2.8 */ public static String getBaseUrl( String url )
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,14 +27,14 @@ import java.util.Map; 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; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.changes.AbstractChangesReport; +import org.apache.maven.plugins.changes.ProjectUtils; +import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.issues.IssueUtils; +import org.apache.maven.plugins.issues.IssuesReportGenerator; +import org.apache.maven.plugins.issues.IssuesReportHelper; import org.apache.maven.reporting.MavenReportException; import org.apache.maven.settings.Settings; Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraXML.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraXML.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraXML.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraXML.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,8 +34,8 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.issues.Issue; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.issues.Issue; import org.codehaus.plexus.util.IOUtil; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -94,7 +94,7 @@ public class JiraXML * Parse the given xml file. The list of issues can then be retrieved with {@link #getIssueList()}. * * @param xmlPath the file to pares. - * @throws MojoExecutionException + * @throws MojoExecutionException in case of errors. * @since 2.4 */ public void parseXML( File xmlPath ) Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -111,7 +111,7 @@ public class JqlQueryBuilder * with a JQL query that is valid, but returns nothing. Unless they both only reference the same fixVersion * * @param fixVersion a single fix version - * @return + * @return the builder. */ public JiraQueryBuilder fixVersion( String fixVersion ) { @@ -124,7 +124,7 @@ public class JqlQueryBuilder * with a JQL query that is valid, but returns nothing. Unless they both only reference the same fixVersion * * @param fixVersionIds a comma-separated list of version ids. - * @return + * @return the builder. */ public JiraQueryBuilder fixVersionIds( String fixVersionIds ) { @@ -136,7 +136,7 @@ public class JqlQueryBuilder * Add a sequence of version IDs already in a list. * * @param fixVersionIds the version ids. - * @return + * @return the builder. */ public JiraQueryBuilder fixVersionIds( List<String> fixVersionIds ) { Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -36,7 +36,7 @@ import org.apache.cxf.transports.http.co import org.apache.cxf.transports.http.configuration.ProxyServerType; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.issues.Issue; +import org.apache.maven.plugins.issues.Issue; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; @@ -84,6 +84,8 @@ public class RestJiraDownloader public static class NoRest extends Exception { + private static final long serialVersionUID = 6970088805270319624L; + public NoRest() { // blank on purpose. @@ -116,65 +118,55 @@ public class RestJiraDownloader String jiraUrl = urlMap.get( "url" ); jiraProject = urlMap.get( "project" ); - // This classloader juggling is a workaround for a classic Maven 2 class loader management bug. - ClassLoader ccl = Thread.currentThread().getContextClassLoader(); - try - { - Thread.currentThread().setContextClassLoader( WebClient.class.getClassLoader() ); - WebClient client = setupWebClient( jiraUrl ); + WebClient client = setupWebClient( jiraUrl ); - // We use version 2 of the REST API, that first appeared in JIRA 5 - // Check if version 2 of the REST API is supported - // http://docs.atlassian.com/jira/REST/5.0/ - // Note that serverInfo can always be accessed without authentication - client.replacePath( "/rest/api/2/serverInfo" ); - client.accept( MediaType.APPLICATION_JSON ); - Response siResponse = client.get(); - if ( siResponse.getStatus() != Response.Status.OK.getStatusCode() ) - { - throw new NoRest( "This JIRA server does not support version 2 of the REST API, " - + "which maven-changes-plugin requires." ); - } - - doSessionAuth( client ); - - 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 - - StringWriter searchParamStringWriter = new StringWriter(); - JsonGenerator gen = jsonFactory.createGenerator( searchParamStringWriter ); - gen.writeStartObject(); - gen.writeStringField( "jql", jqlQuery ); - gen.writeNumberField( "maxResults", nbEntriesMax ); - gen.writeArrayFieldStart( "fields" ); - // Retrieve all fields. If that seems slow, we can reconsider. - gen.writeString( "*all" ); - gen.writeEndArray(); - gen.writeEndObject(); - gen.close(); - client.replacePath( "/rest/api/2/search" ); - client.type( MediaType.APPLICATION_JSON_TYPE ); - client.accept( MediaType.APPLICATION_JSON_TYPE ); - Response searchResponse = client.post( searchParamStringWriter.toString() ); - if ( searchResponse.getStatus() != Response.Status.OK.getStatusCode() ) - { - reportErrors( searchResponse ); - } - - JsonNode issueTree = getResponseTree( searchResponse ); - assert issueTree.isObject(); - JsonNode issuesNode = issueTree.get( "issues" ); - assert issuesNode.isArray(); - buildIssues( issuesNode, jiraUrl, jiraProject ); + // We use version 2 of the REST API, that first appeared in JIRA 5 + // Check if version 2 of the REST API is supported + // http://docs.atlassian.com/jira/REST/5.0/ + // Note that serverInfo can always be accessed without authentication + client.replacePath( "/rest/api/2/serverInfo" ); + client.accept( MediaType.APPLICATION_JSON ); + Response siResponse = client.get(); + if ( siResponse.getStatus() != Response.Status.OK.getStatusCode() ) + { + throw new NoRest( "This JIRA server does not support version 2 of the REST API, " + + "which maven-changes-plugin requires." ); } - finally + + doSessionAuth( client ); + + 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 + + StringWriter searchParamStringWriter = new StringWriter(); + JsonGenerator gen = jsonFactory.createGenerator( searchParamStringWriter ); + gen.writeStartObject(); + gen.writeStringField( "jql", jqlQuery ); + gen.writeNumberField( "maxResults", nbEntriesMax ); + gen.writeArrayFieldStart( "fields" ); + // Retrieve all fields. If that seems slow, we can reconsider. + gen.writeString( "*all" ); + gen.writeEndArray(); + gen.writeEndObject(); + gen.close(); + client.replacePath( "/rest/api/2/search" ); + client.type( MediaType.APPLICATION_JSON_TYPE ); + client.accept( MediaType.APPLICATION_JSON_TYPE ); + Response searchResponse = client.post( searchParamStringWriter.toString() ); + if ( searchResponse.getStatus() != Response.Status.OK.getStatusCode() ) { - Thread.currentThread().setContextClassLoader( ccl ); + reportErrors( searchResponse ); } + + JsonNode issueTree = getResponseTree( searchResponse ); + assert issueTree.isObject(); + JsonNode issuesNode = issueTree.get( "issues" ); + assert issuesNode.isArray(); + buildIssues( issuesNode, jiraUrl, jiraProject ); } private JsonNode getResponseTree( Response response ) Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.resource.loader; +package org.apache.maven.plugins.resource.loader; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.trac; +package org.apache.maven.plugins.trac; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.trac; * under the License. */ -import org.apache.maven.plugin.issues.Issue; +import org.apache.maven.plugins.issues.Issue; import org.apache.maven.project.MavenProject; import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClient; @@ -73,25 +73,26 @@ public class TracDownloader issue.setUpdated( parseDate( String.valueOf( ticketObj[2] ) ) ); - Map attributes = (Map) ticketObj[3]; + @SuppressWarnings( "unchecked" ) + Map<String, String> attributes = (Map<String, String>) ticketObj[3]; - issue.setType( (String) attributes.get( "type" ) ); + issue.setType( attributes.get( "type" ) ); - issue.setSummary( (String) attributes.get( "summary" ) ); + issue.setSummary( attributes.get( "summary" ) ); - issue.setStatus( (String) attributes.get( "status" ) ); + issue.setStatus( attributes.get( "status" ) ); - issue.setResolution( (String) attributes.get( "resolution" ) ); + issue.setResolution( attributes.get( "resolution" ) ); - issue.setAssignee( (String) attributes.get( "owner" ) ); + issue.setAssignee( attributes.get( "owner" ) ); - issue.addFixVersion( (String) attributes.get( "milestone" ) ); + issue.addFixVersion( attributes.get( "milestone" ) ); - issue.setPriority( (String) attributes.get( "priority" ) ); + issue.setPriority( attributes.get( "priority" ) ); - issue.setReporter( (String) attributes.get( "reporter" ) ); + issue.setReporter( attributes.get( "reporter" ) ); - issue.addComponent( (String) attributes.get( "component" ) ); + issue.addComponent( attributes.get( "component" ) ); return issue; } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.trac; +package org.apache.maven.plugins.trac; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ package org.apache.maven.plugin.trac; * under the License. */ -import org.apache.maven.plugin.changes.IssueType; -import org.apache.maven.plugin.issues.AbstractIssueManagementSystem; +import org.apache.maven.plugins.changes.IssueType; +import org.apache.maven.plugins.issues.AbstractIssueManagementSystem; /** * The Trac issue management system. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracMojo.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracMojo.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.trac; +package org.apache.maven.plugins.trac; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,13 +26,13 @@ import java.util.Locale; import java.util.Map; import java.util.ResourceBundle; -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.IssuesReportGenerator; -import org.apache.maven.plugin.issues.IssuesReportHelper; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.changes.AbstractChangesReport; +import org.apache.maven.plugins.changes.ProjectUtils; +import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.issues.IssuesReportGenerator; +import org.apache.maven.plugins.issues.IssuesReportHelper; import org.apache.maven.reporting.MavenReportException; import org.apache.xmlrpc.XmlRpcException; @@ -50,14 +50,12 @@ public class TracMojo /** * Deprecated Trac columns. */ - @SuppressWarnings( "checkstyle:staticvariablename" ) - private static Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String, Integer>(); + private static final Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String, Integer>(); /** * Valid Trac columns. */ - @SuppressWarnings( "checkstyle:staticvariablename" ) - private static Map<String, Integer> TRAC_COLUMNS = new HashMap<String, Integer>(); + private static final Map<String, Integer> TRAC_COLUMNS = new HashMap<String, Integer>(); static { Modified: maven/plugins/trunk/maven-changes-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/META-INF/plexus/components.xml Sat Feb 25 22:36:31 2017 @@ -35,7 +35,7 @@ under the License. </property> <property> <name>file.resource.loader.class</name> - <value>org.apache.maven.plugin.resource.loader.ProjectResourceLoader</value> + <value>org.apache.maven.plugins.resource.loader.ProjectResourceLoader</value> </property> </properties> </configuration> Modified: maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/include-announcement-file.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/include-announcement-file.apt.vm?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/include-announcement-file.apt.vm (original) +++ maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/include-announcement-file.apt.vm Sat Feb 25 22:36:31 2017 @@ -57,7 +57,7 @@ Include an Announcement File in Your Pac </goals> <configuration> <announcementFile>CHANGES.txt</announcementFile> - <outputDirectory>\${project.build.outputDirectory}/META-INF</outputDirectory> + <announcementDirectory>\${project.build.outputDirectory}/META-INF</announcementDirectory> </configuration> </execution> </executions> Modified: maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt.vm?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt.vm (original) +++ maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt.vm Sat Feb 25 22:36:31 2017 @@ -68,7 +68,7 @@ Using a Custom Announcement Template Next you want to create your own template. A wise thing is to start with the default one that is included in the plugin. You can download it from Subversion - {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugin/announcement/announcement.vm}here}}. + {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugins/announcement/announcement.vm}here}}. It will provide you with examples on how to iterate over the actions of a release among other things. Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.announcement; +package org.apache.maven.plugins.announcement; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,6 +22,7 @@ package org.apache.maven.plugin.announce import java.io.File; import java.io.FileReader; +import org.apache.maven.plugins.announcement.AnnouncementMojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; @@ -57,7 +58,7 @@ public class AnnouncementMojoTest setVariableValueToObject( mojo, "version", "1.1" ); setVariableValueToObject( mojo, "template", "announcement.vm" ); setVariableValueToObject( mojo, "templateDirectory", - "/src/main/resources/org/apache/maven/plugin/announcement/" ); + "/src/main/resources/org/apache/maven/plugins/announcement/" ); setVariableValueToObject( mojo, "basedir", getBasedir() ); setVariableValueToObject( mojo, "introduction", "Nice library" ); mojo.execute(); Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ActionTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ActionTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ActionTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ActionTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,6 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; + +import org.apache.maven.plugins.changes.ChangesCheckMojo; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,6 +22,7 @@ package org.apache.maven.plugin.changes; import java.io.File; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.changes.ChangesValidatorMojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; /** Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,6 +20,8 @@ package org.apache.maven.plugin.changes; */ import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.changes.ChangesXML; +import org.apache.maven.plugins.changes.ChangesXMLRuntimeException; import org.apache.maven.plugins.changes.model.Action; import org.apache.maven.plugins.changes.model.Release; import org.codehaus.plexus.PlexusTestCase; @@ -138,11 +140,10 @@ public class ChangesXMLTest assertNotNull( changesXML.getChangesDocument() ); assertEquals( "Changes report Project", changesXML.getTitle() ); - List releases = changesXML.getReleaseList(); + List<Release> releases = changesXML.getReleaseList(); assertEquals( 2, releases.size() ); - for ( Object release1 : releases ) + for ( Release release : releases ) { - Release release = (Release) release1; if ( "1.0".equals( release.getVersion() ) ) { Action action = release.getActions().get( 0 ); @@ -160,7 +161,7 @@ public class ChangesXMLTest try { - ChangesXML changesXML = new ChangesXML( changesFile, new MockLog() ); + new ChangesXML( changesFile, new MockLog() ); fail( "Should have thrown a ChangesXMLRuntimeException due to the invalid changes.xml file" ); } catch ( ChangesXMLRuntimeException e ) Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,6 +29,7 @@ import java.util.Locale; import junit.framework.TestCase; +import org.apache.maven.plugins.changes.FeedGenerator; import org.apache.maven.plugins.changes.model.Release; /** Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,7 +9,7 @@ package org.apache.maven.plugin.changes; * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -19,10 +19,12 @@ package org.apache.maven.plugin.changes; * under the License. */ -import org.apache.maven.plugin.issues.Issue; -import org.apache.maven.plugin.issues.IssueManagementSystem; -import org.apache.maven.plugin.jira.JIRAIssueManagmentSystem; +import org.apache.maven.plugins.changes.IssueAdapter; +import org.apache.maven.plugins.changes.IssueType; import org.apache.maven.plugins.changes.model.Action; +import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.issues.IssueManagementSystem; +import org.apache.maven.plugins.jira.JIRAIssueManagmentSystem; import junit.framework.TestCase; Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,6 +26,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.maven.plugins.changes.model.Action; import org.apache.maven.plugins.changes.model.Release; public class ReleaseTest @@ -71,7 +72,7 @@ public class ReleaseTest public void testGetSetAction() { - List actionList = new ArrayList(); + List<Action> actionList = new ArrayList<Action>(); release.setActions( actionList ); Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.changes; +package org.apache.maven.plugins.changes; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,9 @@ import java.util.List; import junit.framework.TestCase; import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugin.testing.SilentLog; +import org.apache.maven.plugins.changes.ReleaseUtils; import org.apache.maven.plugins.changes.model.Release; +import org.apache.maven.plugin.testing.SilentLog; /** * @author Dennis Lundberg Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java Sat Feb 25 22:36:31 2017 @@ -11,11 +11,12 @@ * specific language governing permissions and limitations under the License. */ -package org.apache.maven.plugin.github; +package org.apache.maven.plugins.github; import junit.framework.TestCase; import org.apache.maven.model.IssueManagement; -import org.apache.maven.plugin.issues.Issue; +import org.apache.maven.plugins.github.GitHubDownloader; +import org.apache.maven.plugins.issues.Issue; import org.apache.maven.project.MavenProject; import org.eclipse.egit.github.core.User; Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.issues; +package org.apache.maven.plugins.issues; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.issues.AbstractIssueManagementSystem; import junit.framework.TestCase; Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,6 @@ -package org.apache.maven.plugin.issues; +package org.apache.maven.plugins.issues; + +import org.apache.maven.plugins.issues.Issue; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.issues; +package org.apache.maven.plugins.issues; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,6 +21,8 @@ package org.apache.maven.plugin.issues; import junit.framework.TestCase; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.issues.IssueUtils; import java.util.ArrayList; import java.util.List; @@ -51,7 +53,7 @@ public class IssueUtilsTestCase issueList.add( issue_1 ); issueList.add( issue_2 ); - List filteredIssues; + List<Issue> filteredIssues; try { filteredIssues = IssueUtils.filterIssuesWithVersionPrefix( issueList, null ); Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,8 @@ import junit.framework.TestCase; import java.util.Map; +import org.apache.maven.plugins.jira.JiraHelper; + /** * Tests for the JiraHelper class. * Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraMojoTest.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraMojoTest.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraMojoTest.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,7 @@ package org.apache.maven.plugin.jira; * under the License. */ +import org.apache.maven.plugins.jira.JiraMojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; /** Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,6 +24,11 @@ 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; /** @@ -47,6 +52,12 @@ public class JiraUnicodeTestCase assertTrue( pom.exists() ); JiraMojo mojo = (JiraMojo) lookupMojo( "jira-report", pom ); + MavenProject project = new JiraUnicodeTestProjectStub(); + MavenSession session = newMavenSession( project ); + DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession(); + repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( "target/local-repo" ) ); + setVariableValueToObject( mojo, "project", project ); + setVariableValueToObject( mojo, "mavenSession", session ); InputStream testJiraXmlStream = JiraUnicodeTestCase.class.getResourceAsStream( "unicode-jira-results.xml" ); String jiraXml = null; try { Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,8 @@ import java.util.Collections; import java.util.List; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; +import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; +import org.apache.maven.artifact.repository.MavenArtifactRepository; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; @@ -38,8 +39,11 @@ public class JiraUnicodeTestProjectStub @Override public List<ArtifactRepository> getRemoteArtifactRepositories() { - ArtifactRepository repository = - new DefaultArtifactRepository( "central", "http://repo1.maven.org/maven2";, new DefaultRepositoryLayout() ); + ArtifactRepositoryPolicy policy = + new ArtifactRepositoryPolicy( true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, + ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE ); + ArtifactRepository repository = new MavenArtifactRepository( "central", "http://repo1.maven.org/maven2";, + new DefaultRepositoryLayout(), policy, policy ); return Collections.singletonList( repository ); } Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,6 +21,8 @@ package org.apache.maven.plugin.jira; import junit.framework.TestCase; import org.apache.maven.plugin.logging.SystemStreamLog; +import org.apache.maven.plugins.jira.JiraQueryBuilder; +import org.apache.maven.plugins.jira.JqlQueryBuilder; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,9 @@ import java.io.StringReader; import java.util.List; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.issues.Issue; +import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.jira.AbstractJiraDownloader; +import org.apache.maven.plugins.jira.JiraXML; import org.xml.sax.InputSource; /** Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java Sat Feb 25 22:36:31 2017 @@ -1,4 +1,6 @@ -package org.apache.maven.plugin.jira; +package org.apache.maven.plugins.jira; + +import org.apache.maven.plugins.jira.UrlBuilder; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-changes-plugin/src/test/unit/jira-plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/unit/jira-plugin-config.xml?rev=1784411&r1=1784410&r2=1784411&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/unit/jira-plugin-config.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/unit/jira-plugin-config.xml Sat Feb 25 22:36:31 2017 @@ -25,10 +25,8 @@ under the License. <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration> - <localRepository>${localRepository}</localRepository> - <project implementation="org.apache.maven.plugin.jira.JiraUnicodeTestProjectStub"/> - <outputDirectory>target/jira-test-output</outputDirectory> - <columnNames>Key,Summary,Status,Resolution,Assignee,Description</columnNames> + <outputDirectory>target/jira-test-output</outputDirectory> + <columnNames>Key,Summary,Status,Resolution,Assignee,Description</columnNames> </configuration> </plugin> </plugins>
