This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-scm.
commit 6e4404f797730d3e653a59b4f2527874b2012540 Merge: 4286f66 205d69b Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 26 11:46:22 2017 +0200 Updated version 1.5 from 'upstream/1.5' with Debian dir 87252d546f68d210fb7d38d71e94fc0509e936ed .gitignore | 9 + maven-scm-api/pom.xml | 2 +- .../org/apache/maven/scm/AbstractScmVersion.java | 5 +- .../main/java/org/apache/maven/scm/ChangeFile.java | 2 +- .../main/java/org/apache/maven/scm/ChangeSet.java | 34 +- .../org/apache/maven/scm/CommandParameters.java | 7 +- .../main/java/org/apache/maven/scm/ScmFile.java | 10 +- .../main/java/org/apache/maven/scm/ScmFileSet.java | 13 +- .../java/org/apache/maven/scm/ScmFileStatus.java | 7 + .../main/java/org/apache/maven/scm/ScmResult.java | 4 +- .../apache/maven/scm/command/add/AddScmResult.java | 17 +- .../apache/maven/scm/command/blame/BlameLine.java | 36 ++ .../maven/scm/command/blame/BlameScmResult.java | 14 +- .../maven/scm/command/branch/BranchScmResult.java | 18 +- .../changelog/AbstractChangeLogCommand.java | 1 + .../scm/command/changelog/ChangeLogScmResult.java | 2 + .../maven/scm/command/changelog/ChangeLogSet.java | 19 +- .../command/checkin/AbstractCheckInCommand.java | 1 + .../scm/command/checkin/CheckInScmResult.java | 23 +- .../command/checkout/AbstractCheckOutCommand.java | 1 + .../scm/command/checkout/CheckOutScmResult.java | 18 +- .../maven/scm/command/diff/DiffScmResult.java | 19 +- .../maven/scm/command/edit/EditScmResult.java | 16 +- .../maven/scm/command/export/ExportScmResult.java | 13 +- .../export/ExportScmResultWithRevision.java | 6 +- .../apache/maven/scm/command/info/InfoItem.java | 6 +- .../maven/scm/command/info/InfoScmResult.java | 26 +- .../maven/scm/command/list/ListScmResult.java | 19 +- .../maven/scm/command/login/LoginScmResult.java | 3 + .../maven/scm/command/mkdir/MkdirScmResult.java | 12 +- .../maven/scm/command/remove/RemoveScmResult.java | 16 +- .../maven/scm/command/status/StatusScmResult.java | 13 +- .../apache/maven/scm/command/tag/TagScmResult.java | 16 +- .../maven/scm/command/unedit/UnEditScmResult.java | 15 +- .../scm/command/update/AbstractUpdateCommand.java | 14 +- .../maven/scm/command/update/UpdateScmResult.java | 29 +- .../update/UpdateScmResultWithRevision.java | 13 +- .../org/apache/maven/scm/log/ScmLogDispatcher.java | 67 +-- .../maven/scm/manager/AbstractScmManager.java | 47 ++- .../org/apache/maven/scm/manager/ScmManager.java | 3 +- .../maven/scm/provider/AbstractScmProvider.java | 12 +- .../org/apache/maven/scm/provider/ScmProvider.java | 15 +- .../org/apache/maven/scm/provider/ScmUrlUtils.java | 8 +- .../scm/repository/ScmRepositoryException.java | 7 +- .../maven/scm/util/ThreadSafeDateFormat.java | 11 +- .../java/org/apache/maven/scm/ScmFileSetTest.java | 4 +- maven-scm-client/pom.xml | 2 +- .../apache/maven/scm/client/cli/MavenScmCli.java | 25 +- .../maven-scm-manager-plexus/pom.xml | 2 +- .../scm/manager/plexus/DefaultScmManager.java | 6 +- maven-scm-managers/pom.xml | 2 +- maven-scm-plugin/pom.xml | 63 ++- .../apache/maven/scm/plugin/AbstractScmMojo.java | 70 ++-- .../org/apache/maven/scm/plugin/ChangeLogMojo.java | 18 +- .../java/org/apache/maven/scm/plugin/ListMojo.java | 10 +- .../org/apache/maven/scm/plugin/StatusMojo.java | 15 +- .../org/apache/maven/scm/plugin/ValidateMojo.java | 5 +- .../main/resources/META-INF/plexus/components.xml | 45 ++ .../apt/examples/bootstrapping-with-pom.apt.vm | 22 +- .../apache/maven/scm/plugin/CheckoutMojoTest.java | 16 +- .../checkoutEncryptedPasswordFromSettings.xml | 47 ++- .../src/test/resources/settings-security.xml | 4 + .../maven-scm-provider-accurev/pom.xml | 13 +- .../apache/maven/scm/provider/accurev/AccuRev.java | 20 +- .../scm/provider/accurev/AccuRevCapability.java | 50 +-- .../maven/scm/provider/accurev/AccuRevInfo.java | 13 +- .../scm/provider/accurev/AccuRevScmProvider.java | 9 +- .../accurev/AccuRevScmProviderRepository.java | 13 +- .../maven/scm/provider/accurev/AccuRevVersion.java | 68 ++-- .../provider/accurev/cli/AccuRevCommandLine.java | 41 +- .../scm/provider/accurev/cli/DiffConsumer.java | 8 +- .../scm/provider/accurev/cli/ErrorConsumer.java | 1 + .../provider/accurev/cli/XppStreamConsumer.java | 18 +- .../AbstractAccuRevExtractSourceCommand.java | 14 +- .../accurev/command/add/AccuRevAddCommand.java | 1 - .../command/checkin/AccuRevCheckInCommand.java | 1 - .../command/checkout/AccuRevCheckOutCommand.java | 19 +- .../command/export/AccuRevExportCommand.java | 59 +-- .../command/remove/AccuRevRemoveCommand.java | 1 - .../command/status/AccuRevStatusCommand.java | 14 +- .../scm/provider/accurev/util/WorkspaceUtils.java | 71 ++++ .../src/site/apt/index.apt | 19 +- .../src/site/apt/tcktests.apt | 2 +- .../src/site/apt/todos.apt | 4 +- .../org/apache/maven/scm/ChangeSetMatcher.java | 1 - .../provider/accurev/AccuRevCapabilityTest.java | 9 + .../accurev/cli/AccuRevCommandLineTest.java | 49 ++- .../command/AbstractAccuRevCommandTest.java | 2 +- .../provider/accurev/command/AccuRevTckUtil.java | 3 +- .../accurev/command/add/AccuRevAddCommandTest.java | 2 - .../changelog/AccuRevChangeLogCommandTest.java | 2 - .../checkout/AccuRevCheckOutCommandTest.java | 74 +++- .../command/export/AccuRevExportCommandTest.java | 87 +++- .../command/remove/AccuRevRemoveCommandTest.java | 2 - .../command/status/AccuRevStatusCommandTest.java | 2 - .../src/test/resources/diff-vvt.xml | 7 + .../maven-scm-provider-bazaar/pom.xml | 2 +- .../scm/provider/bazaar/BazaarScmProvider.java | 4 +- .../maven/scm/provider/bazaar/BazaarUtils.java | 24 +- .../provider/bazaar/command/BazaarConsumer.java | 22 +- .../bazaar/command/add/BazaarAddConsumer.java | 4 +- .../bazaar/command/blame/BazaarBlameCommand.java | 1 + .../bazaar/command/blame/BazaarBlameConsumer.java | 5 +- .../command/changelog/BazaarChangeLogCommand.java | 21 +- .../command/changelog/BazaarChangeLogConsumer.java | 9 +- .../command/checkin/BazaarCheckInCommand.java | 27 +- .../command/checkout/BazaarCheckOutCommand.java | 14 +- .../command/checkout/BazaarCheckOutConsumer.java | 7 +- .../bazaar/command/diff/BazaarDiffConsumer.java | 12 +- .../bazaar/command/remove/BazaarRemoveCommand.java | 2 +- .../command/remove/BazaarRemoveConsumer.java | 7 +- .../command/status/BazaarStatusConsumer.java | 4 +- .../bazaar/command/tag/BazaarLsConsumer.java | 7 +- .../bazaar/command/update/BazaarUpdateCommand.java | 27 +- .../maven/scm/provider/bazaar/BazaarRepoUtils.java | 4 +- .../command/blame/BazaarBlameCommandTckTest.java | 4 +- .../changelog/BazaarChangeLogConsumerTest.java | 9 +- .../maven-scm-provider-clearcase/pom.xml | 3 +- .../clearcase/command/add/ClearCaseAddCommand.java | 4 +- .../command/add/ClearCaseAddConsumer.java | 4 +- .../command/blame/ClearCaseBlameConsumer.java | 8 +- .../changelog/ClearCaseChangeLogCommand.java | 1 + .../changelog/ClearCaseChangeLogConsumer.java | 5 +- .../command/checkin/ClearCaseCheckInCommand.java | 13 +- .../command/checkin/ClearCaseCheckInConsumer.java | 4 +- .../checkout/ClearCaseCheckOutConsumer.java | 9 +- .../command/edit/ClearCaseEditCommand.java | 12 +- .../command/edit/ClearCaseEditConsumer.java | 6 +- .../command/remove/ClearCaseRemoveCommand.java | 11 +- .../command/remove/ClearCaseRemoveConsumer.java | 5 +- .../command/status/ClearCaseStatusConsumer.java | 4 +- .../clearcase/command/tag/ClearCaseTagCommand.java | 15 +- .../command/tag/ClearCaseTagConsumer.java | 4 +- .../command/unedit/ClearCaseUnEditCommand.java | 11 +- .../command/unedit/ClearCaseUnEditConsumer.java | 5 +- .../command/update/ClearCaseUpdateCommand.java | 1 + .../command/update/ClearCaseUpdateConsumer.java | 4 +- .../repository/ClearCaseScmProviderRepository.java | 1 - .../scm/provider/clearcase/util/ClearCaseUtil.java | 14 +- .../command/add/ClearCaseAddCommandTest.java | 5 +- .../command/add/ClearCaseAddConsumerTest.java | 4 +- .../command/blame/ClearCaseBlameConsumerTest.java | 4 +- .../checkin/ClearCaseCheckInCommandTest.java | 2 +- .../checkin/ClearCaseCheckInConsumerTest.java | 4 +- .../checkout/ClearCaseCheckOutCommandTest.java | 1 + .../command/edit/ClearCaseEditCommandTest.java | 1 + .../command/edit/ClearCaseEditConsumerTest.java | 4 +- .../command/remove/ClearCaseRemoveCommandTest.java | 1 + .../remove/ClearCaseRemoveConsumerTest.java | 4 +- .../command/status/ClearCaseStatusCommandTest.java | 1 + .../status/ClearCaseStatusConsumerTest.java | 4 +- .../command/tag/ClearCaseTagCommandTest.java | 1 + .../command/tag/ClearCaseTagConsumerTest.java | 4 +- .../command/unedit/ClearCaseUnEditCommandTest.java | 1 + .../unedit/ClearCaseUnEditConsumerTest.java | 4 +- .../command/update/ClearCaseUpdateCommandTest.java | 1 + .../update/ClearCaseUpdateConsumerTest.java | 4 +- maven-scm-providers/maven-scm-provider-hg/pom.xml | 2 +- .../maven/scm/provider/hg/HgScmProvider.java | 52 ++- .../org/apache/maven/scm/provider/hg/HgUtils.java | 111 ++++- .../provider/hg/command/HgCommandConstants.java | 25 +- .../maven/scm/provider/hg/command/HgConsumer.java | 22 +- .../scm/provider/hg/command/add/HgAddCommand.java | 8 +- .../scm/provider/hg/command/add/HgAddConsumer.java | 4 +- .../provider/hg/command/blame/HgBlameCommand.java | 1 + .../provider/hg/command/blame/HgBlameConsumer.java | 13 +- .../hg/command/branch/HgBranchCommand.java | 173 ++++++++ .../hg/command/changelog/HgChangeLogCommand.java | 17 +- .../hg/command/changelog/HgChangeLogConsumer.java | 16 +- .../hg/command/checkin/HgCheckInCommand.java | 56 ++- .../hg/command/checkout/HgCheckOutCommand.java | 3 +- .../hg/command/checkout/HgCheckOutConsumer.java | 5 +- .../provider/hg/command/diff/HgDiffConsumer.java | 14 +- .../HgInfoCommand.java} | 39 +- .../HgInfoConsumer.java} | 48 ++- .../provider/hg/command/inventory/HgChangeSet.java | 52 +++ .../hg/command/inventory/HgListCommand.java | 8 +- .../hg/command/inventory/HgListConsumer.java | 4 +- .../hg/command/inventory/HgOutgoingConsumer.java | 63 +++ .../hg/command/remove/HgRemoveConsumer.java | 5 +- .../hg/command/status/HgStatusConsumer.java | 4 +- .../scm/provider/hg/command/tag/HgTagCommand.java | 49 ++- .../hg/command/update/HgUpdateCommand.java | 16 +- .../apache/maven/scm/provider/hg/HgRepoUtils.java | 2 +- .../hg/command/blame/HgBlameCommandTckTest.java | 4 +- .../hg/command/diff/HgDiffCommandTckTest.java | 18 +- .../maven-scm-provider-local/pom.xml | 3 +- .../local/command/add/LocalAddCommand.java | 7 +- .../command/changelog/LocalChangeLogCommand.java | 28 +- .../local/command/checkin/LocalCheckInCommand.java | 33 +- .../command/checkout/LocalCheckOutCommand.java | 32 +- .../command/checkout/LocalCheckOutScmResult.java | 9 +- .../local/command/list/LocalListCommand.java | 8 +- .../local/command/list/LocalListScmResult.java | 10 +- .../local/command/mkdir/LocalMkdirCommand.java | 4 +- .../local/command/status/LocalStatusCommand.java | 8 +- .../local/command/tag/LocalTagCommand.java | 21 +- .../local/command/update/LocalUpdateCommand.java | 22 +- .../local/command/update/LocalUpdateScmResult.java | 9 +- .../local/metadata/LocalScmMetadataUtils.java | 3 +- .../repository/LocalScmProviderRepository.java | 2 +- .../checkout/LocalCheckOutCommandTckTest.java | 16 +- .../command/update/LocalUpdateCommandTckTest.java | 24 +- .../maven-scm-provider-perforce/pom.xml | 2 +- .../scm/provider/perforce/PerforceScmProvider.java | 16 +- .../perforce/command/PerforceInfoCommand.java | 4 +- .../perforce/command/PerforceVerbMapper.java | 2 +- .../perforce/command/add/PerforceAddCommand.java | 9 +- .../perforce/command/add/PerforceAddConsumer.java | 14 +- .../command/blame/PerforceBlameCommand.java | 5 +- .../command/blame/PerforceBlameConsumer.java | 5 +- .../command/blame/PerforceFilelogConsumer.java | 4 +- .../changelog/PerforceChangeLogCommand.java | 22 +- .../changelog/PerforceChangeLogConsumer.java | 8 +- .../command/changelog/PerforceChangesConsumer.java | 5 +- .../changelog/PerforceDescribeConsumer.java | 20 +- .../command/checkin/PerforceCheckInCommand.java | 8 +- .../command/checkout/PerforceCheckOutCommand.java | 25 +- .../command/checkout/PerforceCheckOutConsumer.java | 4 +- .../perforce/command/edit/PerforceEditCommand.java | 2 +- .../command/edit/PerforceEditConsumer.java | 14 +- .../command/login/PerforceLoginCommand.java | 4 +- .../command/remove/PerforceRemoveCommand.java | 5 +- .../command/remove/PerforceRemoveConsumer.java | 18 +- .../command/status/PerforceStatusCommand.java | 12 +- .../command/status/PerforceStatusConsumer.java | 4 +- .../perforce/command/tag/PerforceTagCommand.java | 8 +- .../perforce/command/tag/PerforceTagConsumer.java | 18 +- .../command/unedit/PerforceUnEditCommand.java | 6 +- .../command/unedit/PerforceUnEditConsumer.java | 15 +- .../command/update/PerforceHaveConsumer.java | 7 - .../command/update/PerforceUpdateCommand.java | 1 + .../src/site/apt/index.apt | 2 +- .../command/add/PerforceAddConsumerTest.java | 9 +- .../changelog/PerforceChangeLogConsumerTest.java | 11 +- .../changelog/PerforceDescribeConsumerTest.java | 17 +- .../command/edit/PerforceEditConsumerTest.java | 9 +- .../command/remove/PerforceRemoveConsumerTest.java | 9 +- .../command/status/PerforceStatusConsumerTest.java | 7 +- .../command/tag/PerforceTagConsumerTest.java | 9 +- .../command/unedit/PerforceUnEditConsumerTest.java | 9 +- .../maven-scm-provider-starteam/pom.xml | 3 +- .../scm/provider/starteam/StarteamScmProvider.java | 31 +- .../starteam/command/StarteamCommandLineUtils.java | 14 +- .../starteam/command/add/StarteamAddCommand.java | 9 +- .../starteam/command/add/StarteamAddConsumer.java | 4 +- .../changelog/StarteamChangeLogCommand.java | 1 + .../changelog/StarteamChangeLogConsumer.java | 5 +- .../command/checkin/StarteamCheckInCommand.java | 7 +- .../command/checkin/StarteamCheckInConsumer.java | 5 +- .../command/checkout/StarteamCheckOutCommand.java | 3 +- .../command/checkout/StarteamCheckOutConsumer.java | 5 +- .../starteam/command/diff/StarteamDiffCommand.java | 4 +- .../command/diff/StarteamDiffConsumer.java | 23 +- .../starteam/command/edit/StarteamEditCommand.java | 4 +- .../command/edit/StarteamEditConsumer.java | 6 +- .../command/remove/StarteamRemoveCommand.java | 3 +- .../command/remove/StarteamRemoveConsumer.java | 4 +- .../command/status/StarteamStatusConsumer.java | 4 +- .../starteam/command/tag/StarteamTagCommand.java | 3 +- .../starteam/command/tag/StarteamTagConsumer.java | 11 +- .../command/unedit/StarteamUnEditCommand.java | 5 +- .../command/unedit/StarteamUnEditConsumer.java | 5 +- .../command/update/StarteamUpdateCommand.java | 6 +- .../scm/provider/starteam/util/StarteamUtil.java | 12 +- .../provider/starteam/StarteamScmProviderTest.java | 8 +- .../command/add/StarteamAddConsumerTest.java | 6 +- .../changelog/StarteamChangeLogConsumerTest.java | 16 +- .../checkin/StarteamCheckInConsumerTest.java | 15 +- .../checkout/StarteamCheckOutConsumerTest.java | 15 +- .../command/diff/StarteamDiffConsumerTest.java | 9 +- .../command/edit/StarteamEditConsumerTest.java | 9 +- .../command/remove/StarteamRemoveConsumerTest.java | 13 +- .../command/status/StarteamStatusConsumerTest.java | 13 +- .../command/unedit/StarteamUnEditConsumerTest.java | 9 +- .../maven-scm-provider-synergy/pom.xml | 2 +- .../scm/provider/synergy/SynergyScmProvider.java | 4 + .../synergy/command/add/SynergyAddCommand.java | 27 +- .../command/changelog/SynergyChangeLogCommand.java | 19 +- .../command/checkin/SynergyCheckInCommand.java | 22 +- .../command/checkout/SynergyCheckOutCommand.java | 22 +- .../synergy/command/edit/SynergyEditCommand.java | 30 +- .../command/remove/SynergyRemoveCommand.java | 21 +- .../command/status/SynergyStatusCommand.java | 8 +- .../synergy/command/tag/SynergyTagCommand.java | 20 +- .../command/unedit/SynergyUnEditCommand.java | 25 +- .../command/update/SynergyUpdateCommand.java | 4 +- .../consumer/SynergyGetCompletedTasksConsumer.java | 4 +- .../consumer/SynergyGetTaskObjectsConsumer.java | 5 +- .../consumer/SynergyGetWorkingFilesConsumer.java | 5 +- .../consumer/SynergyGetWorkingProjectConsumer.java | 2 +- .../consumer/SynergyShowDefaultTaskConsumer.java} | 52 +-- .../scm/provider/synergy/util/SynergyCCM.java | 67 ++- .../provider/synergy/util/SynergyTaskManager.java | 182 +++++++++ .../scm/provider/synergy/util/SynergyUtil.java | 93 ++++- .../SynergyGetCompletedTasksConsumerTest.java | 6 +- .../SynergyGetTaskObjectsConsumerTest.java | 4 +- .../SynergyShowDefaultTaskConsumerTest.java | 89 ++++ .../scm/provider/synergy/util/SynergyCCMTest.java | 29 +- .../synergy/consumer/showDefaultTaskNotSet.txt | 1 + .../synergy/consumer/showDefaultTaskSet.txt | 1 + maven-scm-providers/maven-scm-provider-tfs/pom.xml | 2 +- .../scm/provider/tfs/command/TfsBranchCommand.java | 3 +- .../provider/tfs/command/TfsChangeLogCommand.java | 12 +- .../maven/scm/provider/tfs/command/TfsCommand.java | 6 +- .../scm/provider/tfs/command/TfsStatusCommand.java | 2 +- .../scm/provider/tfs/command/TfsTagCommand.java | 17 +- .../tfs/command/blame/TfsBlameCommand.java | 1 + .../tfs/command/blame/TfsBlameConsumer.java | 4 +- .../tfs/command/consumer/ChangedFileConsumer.java | 8 +- .../tfs/command/consumer/FileListConsumer.java | 4 +- .../tfs/command/consumer/TfsChangeLogConsumer.java | 15 +- .../provider/tfs/command/TfsAddCommandTest.java | 1 + .../provider/tfs/command/TfsBranchCommandTest.java | 1 + .../tfs/command/TfsChangeLogCommandTest.java | 1 + .../tfs/command/TfsCheckInCommandTest.java | 1 + .../tfs/command/TfsCheckOutCommandTest.java | 1 + .../scm/provider/tfs/command/TfsCommandTest.java | 4 +- .../provider/tfs/command/TfsEditCommandTest.java | 1 + .../provider/tfs/command/TfsListCommandTest.java | 1 + .../provider/tfs/command/TfsStatusCommandTest.java | 5 +- .../provider/tfs/command/TfsTagCommandTest.java | 1 + .../provider/tfs/command/TfsUnEditCommandTest.java | 1 + .../provider/tfs/command/TfsUpdateCommandTest.java | 1 + maven-scm-providers/maven-scm-provider-vss/pom.xml | 2 +- .../provider/vss/commands/VssCommandLineUtils.java | 16 +- .../provider/vss/commands/add/VssAddCommand.java | 2 +- .../provider/vss/commands/add/VssAddConsumer.java | 4 +- .../commands/changelog/VssChangeLogConsumer.java | 11 +- .../vss/commands/changelog/VssHistoryCommand.java | 3 +- .../vss/commands/checkin/VssCheckInCommand.java | 27 +- .../vss/commands/checkin/VssCheckInConsumer.java | 4 +- .../vss/commands/checkout/VssCheckOutConsumer.java | 4 +- .../provider/vss/commands/edit/VssEditCommand.java | 20 +- .../vss/commands/edit/VssEditConsumer.java | 7 +- .../vss/commands/status/VssStatusCommand.java | 7 +- .../vss/commands/status/VssStatusConsumer.java | 6 +- .../provider/vss/commands/tag/VssTagCommand.java | 10 +- .../provider/vss/commands/tag/VssTagConsumer.java | 5 +- .../vss/commands/update/VssUpdateConsumer.java | 4 +- .../vss/commands/VssCommandLineUtilsTest.java | 6 + .../vss/commands/edit/VssEditCommandTest.java | 38 +- .../maven-scm-provider-cvs-commons/pom.xml | 3 +- .../provider/cvslib/AbstractCvsScmProvider.java | 27 +- .../provider/cvslib/command/CvsCommandUtils.java | 3 +- .../cvslib/command/add/AbstractCvsAddCommand.java | 9 +- .../cvslib/command/blame/CvsBlameConsumer.java | 7 +- .../command/changelog/CvsChangeLogConsumer.java | 15 +- .../command/checkin/AbstractCvsCheckInCommand.java | 14 +- .../cvslib/command/checkin/CvsCheckInConsumer.java | 5 +- .../command/checkout/CvsCheckOutConsumer.java | 5 +- .../cvslib/command/diff/CvsDiffConsumer.java | 15 +- .../command/list/AbstractCvsListCommand.java | 2 +- .../cvslib/command/list/CvsListConsumer.java | 6 +- .../command/mkdir/AbstractCvsMkdirCommand.java | 16 +- .../command/remove/AbstractCvsRemoveCommand.java | 11 +- .../cvslib/command/status/CvsStatusConsumer.java | 12 +- .../cvslib/command/tag/AbstractCvsTagCommand.java | 4 +- .../cvslib/command/tag/CvsTagConsumer.java | 5 +- .../command/update/AbstractCvsUpdateCommand.java | 5 +- .../cvslib/command/update/CvsUpdateConsumer.java | 4 +- .../changelog/CvsChangeLogConsumerTest.java | 6 +- .../repository/CvsScmProviderRepositoryTest.java | 2 + .../maven-scm-provider-cvsexe/pom.xml | 2 +- .../cvsexe/command/add/CvsExeAddCommand.java | 7 +- .../cvsexe/command/branch/CvsExeBranchCommand.java | 1 + .../cvsexe/command/remove/CvsExeRemoveCommand.java | 8 +- .../cvslib/cvsexe/CvsExeScmProviderTest.java | 2 +- .../maven-scm-provider-cvsjava/pom.xml | 4 +- .../cvsjava/command/add/CvsJavaAddCommand.java | 7 +- .../command/branch/CvsJavaBranchCommand.java | 3 +- .../command/remove/CvsJavaRemoveCommand.java | 14 +- .../cvslib/cvsjava/util/CvsConnection.java | 1 + .../maven-scm-provider-cvstest/pom.xml | 2 +- .../command/changelog/CvsChangeLogCommandTest.java | 1 + .../command/checkout/CvsCheckoutCommandTest.java | 9 +- .../maven-scm-providers-cvs/pom.xml | 2 +- .../maven-scm-provider-git-commons/pom.xml | 3 +- .../scm/provider/git/AbstractGitScmProvider.java | 20 +- .../maven/scm/provider/git/GitChangeSet.java | 98 ----- .../scm/provider/git/GitConfigFileReader.java | 10 +- .../provider/git/command/diff/GitDiffConsumer.java | 15 +- .../scm/provider/git/command/info/GitInfoItem.java | 125 +----- .../git/command/info/GitInfoScmResult.java | 32 +- .../git/command/update/GitUpdateScmResult.java | 9 +- .../git/repository/GitScmProviderRepository.java | 2 + .../git/command/diff/GitDiffConsumerTest.java | 20 +- .../repository/GitScmProviderRepositoryTest.java | 24 +- .../maven-scm-provider-gitexe/pom.xml | 2 +- .../scm/provider/git/gitexe/GitExeScmProvider.java | 16 +- .../command/AbstractFileCheckingConsumer.java | 9 +- .../git/gitexe/command/GitCommandLineUtils.java | 8 +- .../git/gitexe/command/add/GitAddCommand.java | 20 +- .../git/gitexe/command/blame/GitBlameCommand.java | 5 +- .../git/gitexe/command/blame/GitBlameConsumer.java | 114 +++++- .../gitexe/command/branch/GitBranchCommand.java | 2 +- .../command/changelog/GitChangeLogCommand.java | 1 + .../command/changelog/GitChangeLogConsumer.java | 11 +- .../gitexe/command/checkin/GitCheckInCommand.java | 16 +- .../GitInfoCommand.java} | 47 +-- .../git/gitexe/command/info/GitInfoConsumer.java | 79 ++++ .../git/gitexe/command/list/GitListConsumer.java | 3 +- .../gitexe/command/remove/GitRemoveCommand.java | 11 +- .../gitexe/command/remove/GitRemoveConsumer.java | 5 +- .../gitexe/command/status/GitStatusConsumer.java | 4 +- .../git/gitexe/command/tag/GitTagCommand.java | 2 +- .../gitexe/command/update/GitUpdateCommand.java | 2 +- .../command/update/GitUpdateCommandConsumer.java | 41 +- .../gitexe/command/add/GitExeAddCommandTest.java | 6 +- .../gitexe/command/blame/GitBlameConsumerTest.java | 176 ++++++++ .../command/blame/GitExeBlameCommandTckTest.java | 4 +- .../changelog/GitChangeLogConsumerTest.java | 12 +- .../gitexe/command/info/GitInfoCommandTckTest.java | 68 ++++ .../command/remove/GitRemoveConsumerTest.java | 6 +- .../command/status/GitStatusConsumerTest.java | 8 +- .../command/update/GitExeUpdateCommandTckTest.java | 12 +- .../update/GitUpdateCommandConsumerTest.java | 8 +- .../src/test/resources/git/blame/git-blame-2.orig | 87 ++++ .../src/test/resources/git/blame/git-blame-2.out | 239 +++++++++++ .../src/test/resources/git/blame/git-blame-3.out | 83 ++++ .../git/blame/git-blame-different-author.out | 241 +++++++++++ .../test/resources/git/blame/git-blame-empty.out | 0 .../resources/git/blame/git-blame-new-file.out | 16 + .../src/test/resources/git/blame/git-blame.out | 451 +++++++++++++++++++++ .../src/test/resources/git/info/foo.txt | 1 + .../maven-scm-provider-gittest/pom.xml | 2 +- .../maven-scm-providers-git/pom.xml | 2 +- .../maven-scm-providers-standard/pom.xml | 2 +- .../maven-scm-provider-svn-commons/pom.xml | 3 +- .../scm/provider/svn/AbstractSvnScmProvider.java | 20 +- .../maven/scm/provider/svn/SvnChangeSet.java | 11 +- .../scm/provider/svn/SvnConfigFileReader.java | 10 +- .../provider/svn/command/diff/SvnDiffConsumer.java | 13 +- .../scm/provider/svn/command/info/SvnInfoItem.java | 126 +----- .../svn/command/info/SvnInfoScmResult.java | 34 +- .../svn/command/update/SvnUpdateScmResult.java | 10 +- .../src/main/mdo/svn-settings.mdo | 9 + .../repository/SvnScmProviderRepositoryTest.java | 1 + .../maven-scm-provider-svnexe/pom.xml | 2 +- .../scm/provider/svn/svnexe/SvnExeScmProvider.java | 11 +- .../command/AbstractFileCheckingConsumer.java | 26 +- .../svn/svnexe/command/SvnCommandLineUtils.java | 23 +- .../svn/svnexe/command/add/SvnAddCommand.java | 4 +- .../svn/svnexe/command/add/SvnAddConsumer.java | 4 +- .../svn/svnexe/command/blame/SvnBlameCommand.java | 1 + .../svn/svnexe/command/blame/SvnBlameConsumer.java | 7 +- .../svnexe/command/branch/SvnBranchCommand.java | 26 +- .../command/changelog/IllegalOutputException.java | 1 + .../command/changelog/SvnChangeLogCommand.java | 6 +- .../command/changelog/SvnChangeLogConsumer.java | 5 +- .../svnexe/command/checkin/SvnCheckInCommand.java | 1 + .../svnexe/command/checkin/SvnCheckInConsumer.java | 3 +- .../command/checkout/SvnCheckOutCommand.java | 3 +- .../command/checkout/SvnCheckOutConsumer.java | 29 +- .../svn/svnexe/command/diff/SvnDiffCommand.java | 1 + .../svn/svnexe/command/info/SvnInfoCommand.java | 16 +- .../svn/svnexe/command/info/SvnInfoConsumer.java | 14 +- .../svn/svnexe/command/list/SvnListCommand.java | 4 +- .../svn/svnexe/command/list/SvnListConsumer.java | 4 +- .../svn/svnexe/command/mkdir/SvnMkdirCommand.java | 5 +- .../svn/svnexe/command/mkdir/SvnMkdirConsumer.java | 10 +- .../svnexe/command/remove/SvnRemoveCommand.java | 5 +- .../svnexe/command/remove/SvnRemoveConsumer.java | 5 +- .../svnexe/command/status/SvnStatusConsumer.java | 4 +- .../svn/svnexe/command/tag/SvnTagCommand.java | 19 +- .../svnexe/command/update/SvnUpdateCommand.java | 11 +- .../svnexe/command/update/SvnUpdateConsumer.java | 31 +- .../svnexe/command/SvnCommandLineUtilsTest.java | 1 + .../command/changelog/SvnChangeLogCommandTest.java | 8 +- .../command/update/SvnExeUpdateCommandTckTest.java | 1 + .../maven-scm-provider-svntest/pom.xml | 2 +- .../maven/scm/provider/svn/SvnScmTestUtils.java | 2 + .../svn/command/blame/SvnBlameCommandTckTest.java | 4 +- .../maven-scm-providers-svn/pom.xml | 2 +- maven-scm-providers/pom.xml | 2 +- maven-scm-test/pom.xml | 2 +- .../java/org/apache/maven/scm/ScmTckTestCase.java | 18 +- .../java/org/apache/maven/scm/ScmTestCase.java | 17 +- .../apache/maven/scm/manager/ScmManagerStub.java | 14 +- .../apache/maven/scm/provider/ScmProviderStub.java | 33 +- .../tck/command/branch/BranchCommandTckTest.java | 1 + .../tck/command/checkin/CheckInCommandTckTest.java | 6 +- .../command/checkout/CheckOutCommandTckTest.java | 10 +- .../scm/tck/command/diff/DiffCommandTckTest.java | 6 +- .../scm/tck/command/list/ListCommandTckTest.java | 13 +- .../tck/command/status/StatusCommandTckTest.java | 6 +- .../scm/tck/command/tag/TagCommandTckTest.java | 1 + .../tck/command/update/UpdateCommandTckTest.java | 35 +- .../maven/scm/manager/ScmManagerStubTest.java | 6 +- pom.xml | 103 +++-- src/site/apt/guide/index.apt | 2 +- src/site/apt/guide/new_provider.apt | 10 +- src/site/apt/guide/usage.apt | 4 +- src/site/apt/perforce.apt | 3 +- src/site/apt/subversion.apt | 4 +- src/site/site.xml | 7 - 496 files changed, 5535 insertions(+), 2564 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-scm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
