You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ch...@apache.org on 2015/12/17 05:03:15 UTC
[1/2] maven-scm git commit: SCM-812: Fixed.
Repository: maven-scm
Updated Branches:
refs/heads/master a1c59eca2 -> 5f02c5260
SCM-812: Fixed.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/c6044479
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/c6044479
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/c6044479
Branch: refs/heads/master
Commit: c60444794a596cb0ea7cb36c0239441b87c5709f
Parents: bf98f96
Author: Chris Graham <ch...@apache.org>
Authored: Thu Dec 17 15:00:37 2015 +1100
Committer: Chris Graham <ch...@apache.org>
Committed: Thu Dec 17 15:00:37 2015 +1100
----------------------------------------------------------------------
.../scm/provider/jazz/command/checkin/JazzCheckInCommand.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c6044479/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
index fddf196..421bdf3 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
@@ -205,7 +205,9 @@ public class JazzCheckInCommand
getLogger() );
// Add the change set alias
JazzScmProviderRepository jazzRepo = (JazzScmProviderRepository) repo;
- command.addArgument( changeSetAlias.toString() );
+ // SCM-812 - Jazz SCM Alias Id's roll over to zero, not 1000 as advertised.
+ // So, we need to add the changeSetAlias with leading zeros.
+ command.addArgument( StringUtils.leftPad(changeSetAlias.toString(), 4, "0") );
// Add the work item number
command.addArgument( jazzRepo.getWorkItem() );
return command;
[2/2] maven-scm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/maven-scm
Posted by ch...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-scm
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/5f02c526
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/5f02c526
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/5f02c526
Branch: refs/heads/master
Commit: 5f02c5260c554c2071a058d246b1f8770af7f774
Parents: c604447 a1c59ec
Author: Chris Graham <ch...@apache.org>
Authored: Thu Dec 17 15:01:51 2015 +1100
Committer: Chris Graham <ch...@apache.org>
Committed: Thu Dec 17 15:01:51 2015 +1100
----------------------------------------------------------------------
pom.xml | 2 +-
src/site/apt/scm-url-format.apt | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------