Author: olamy
Date: Wed Oct 10 13:42:54 2012
New Revision: 1396599
URL: http://svn.apache.org/viewvc?rev=1396599&view=rev
Log:
accept empty String value posting a patch can be done with emty user (ie
anonymous)
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java?rev=1396599&r1=1396598&r2=1396599&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java
Wed Oct 10 13:42:54 2012
@@ -88,13 +88,13 @@ public abstract class AbstractPatchMojo
@Parameter ( defaultValue = "", property = "patch.serverUrl" )
protected String serverUrl;
- @Parameter ( property = "patch.user", defaultValue = "" )
+ @Parameter ( property = "patch.user" )
protected String user;
- @Parameter ( property = "patch.password", defaultValue = "" )
+ @Parameter ( property = "patch.password" )
protected String password;
- @Parameter ( property = "patch.issueSystem", defaultValue = "" )
+ @Parameter ( property = "patch.issueSystem" )
protected String issueSystem;
@Parameter ( property = "patch.patchSystem", defaultValue =
"${project.patchManagement.system}" )
@@ -195,7 +195,7 @@ public abstract class AbstractPatchMojo
String value = project.getIssueManagement() == null ? "" :
project.getIssueManagement().getUrl();
// cli must win !
- if ( StringUtils.isNotEmpty( serverUrl ) )
+ if ( serverUrl != null )
{
return serverUrl;
}
@@ -209,7 +209,7 @@ public abstract class AbstractPatchMojo
{
String value = summary;
- if ( StringUtils.isNotEmpty( summary ) )
+ if ( summary != null )
{
return summary;
}
@@ -223,7 +223,7 @@ public abstract class AbstractPatchMojo
{
String value = description;
- if ( StringUtils.isNotEmpty( description ) )
+ if ( description != null )
{
return description;
}
@@ -262,7 +262,7 @@ public abstract class AbstractPatchMojo
}
// cli must win !
- if ( StringUtils.isNotEmpty( user ) )
+ if ( user != null )
{
return user;
}
@@ -292,7 +292,7 @@ public abstract class AbstractPatchMojo
}
// cli must win !
- if ( StringUtils.isNotEmpty( password ) )
+ if ( password != null )
{
return password;
}
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java?rev=1396599&r1=1396598&r2=1396599&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java
Wed Oct 10 13:42:54 2012
@@ -48,17 +48,19 @@ public class PostPatchMojo
if ( StringUtils.isEmpty( patchContent ) )
{
getLog().info( "No patch content found so skip posting patch" );
+ return;
}
- PatchTrackerRequest patchTrackerRequest = buidPatchTrackerRequest(
true );
-
- patchTrackerRequest.setPatchContent( patchContent );
-
- getLog().debug( patchTrackerRequest.toString() );
-
try
{
PatchTracker patchTracker = getPatchTracker();
+
+ PatchTrackerRequest patchTrackerRequest = buidPatchTrackerRequest(
true );
+
+ patchTrackerRequest.setPatchContent( patchContent );
+
+ getLog().debug( patchTrackerRequest.toString() );
+
PatchTrackerResult result = patchTracker.createPatch(
patchTrackerRequest, getLog() );
getLog().info( "issue created with id:" + result.getPatchId() + ",
url:" + result.getPatchUrl() );
}
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java?rev=1396599&r1=1396598&r2=1396599&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
(original)
+++
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/PatchTracker.java
Wed Oct 10 13:42:54 2012
@@ -23,7 +23,7 @@ import org.apache.maven.plugin.logging.L
/**
* provide some services around a patch tracker.
- * A patch tracker can be an issue tracker (jira) or a patch reviewer
(reviewboar)
+ * A patch tracker can be an issue tracker (jira), a patch reviewer
(reviewboar) or Jenkins to test the patch
*
* @author Olivier Lamy
*/
