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 ffd48178127f9e85f70380ffda7b824609cfcddf Merge: c6de532 c58e99f Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 26 13:10:00 2017 +0200 Merge tag 'upstream/1.9.3' Upstream version 1.9.3 maven-scm-api/pom.xml | 2 +- .../main/java/org/apache/maven/scm/ChangeSet.java | 13 +- .../org/apache/maven/scm/CommandParameter.java | 4 +- .../org/apache/maven/scm/ScmBranchParameters.java | 4 +- .../java/org/apache/maven/scm/ScmFileStatus.java | 4 +- .../main/java/org/apache/maven/scm/ScmRequest.java | 4 +- .../org/apache/maven/scm/ScmTagParameters.java | 4 +- .../maven/scm/command/blame/BlameScmRequest.java | 1 + .../scm/command/branch/AbstractBranchCommand.java | 5 +- .../changelog/AbstractChangeLogCommand.java | 1 + .../maven/scm/command/diff/DiffScmResult.java | 10 +- .../maven/scm/command/edit/EditScmResult.java | 5 +- .../maven/scm/command/tag/AbstractTagCommand.java | 3 +- .../update/UpdateScmResultWithRevision.java | 3 +- .../org/apache/maven/scm/provider/ScmProvider.java | 3 +- .../maven/scm/provider/ScmProviderRepository.java | 2 +- .../org/apache/maven/scm/util/FilenameUtils.java | 3 + .../maven/scm/util/ThreadSafeDateFormat.java | 11 +- maven-scm-client/pom.xml | 2 +- .../maven-scm-manager-plexus/pom.xml | 2 +- .../scm/manager/plexus/DefaultScmManager.java | 4 +- maven-scm-managers/pom.xml | 2 +- maven-scm-plugin/pom.xml | 8 +- .../apache/maven/scm/plugin/AbstractScmMojo.java | 13 +- .../org/apache/maven/scm/plugin/BootstrapMojo.java | 2 +- .../scm/plugin/CheckLocalModificationsMojo.java | 3 +- .../org/apache/maven/scm/plugin/CheckoutMojo.java | 9 +- .../org/apache/maven/scm/plugin/ExportMojo.java | 28 ++-- .../java/org/apache/maven/scm/plugin/TagMojo.java | 6 +- .../org/apache/maven/scm/plugin/ValidateMojo.java | 15 +- .../maven-scm-provider-accurev/pom.xml | 8 +- .../apache/maven/scm/provider/accurev/AccuRev.java | 16 +- .../scm/provider/accurev/AccuRevCapability.java | 57 ++++--- .../scm/provider/accurev/AccuRevException.java | 3 + .../maven/scm/provider/accurev/AccuRevInfo.java | 3 + .../scm/provider/accurev/AccuRevScmProvider.java | 16 +- .../accurev/AccuRevScmProviderRepository.java | 8 +- .../maven/scm/provider/accurev/AccuRevStat.java | 13 +- .../maven/scm/provider/accurev/AccuRevVersion.java | 81 +++++----- .../scm/provider/accurev/CategorisedElements.java | 4 +- .../maven/scm/provider/accurev/FileDifference.java | 28 +++- .../apache/maven/scm/provider/accurev/Stream.java | 33 ++++ .../maven/scm/provider/accurev/Transaction.java | 6 + .../maven/scm/provider/accurev/WorkSpace.java | 4 +- .../provider/accurev/cli/AccuRevCommandLine.java | 33 ++-- .../provider/accurev/cli/AuthTokenConsumer.java | 3 + .../accurev/cli/ClientVersionConsumer.java | 3 + .../accurev/cli/CommandOutputConsumer.java | 3 + .../scm/provider/accurev/cli/DiffConsumer.java | 8 +- .../scm/provider/accurev/cli/ErrorConsumer.java | 5 +- .../scm/provider/accurev/cli/FileConsumer.java | 5 +- .../scm/provider/accurev/cli/HistoryConsumer.java | 3 + .../scm/provider/accurev/cli/InfoConsumer.java | 3 + .../provider/accurev/cli/StatBackingConsumer.java | 3 + .../scm/provider/accurev/cli/StatConsumer.java | 4 +- .../scm/provider/accurev/cli/StreamsConsumer.java | 3 + .../provider/accurev/cli/WorkSpaceConsumer.java | 3 + .../provider/accurev/cli/XppStreamConsumer.java | 5 - .../accurev/command/AbstractAccuRevCommand.java | 3 + .../AbstractAccuRevExtractSourceCommand.java | 6 +- .../accurev/command/add/AccuRevAddCommand.java | 3 + .../accurev/command/blame/AccuRevBlameCommand.java | 2 - .../command/changelog/AccuRevChangeLogCommand.java | 3 - .../command/checkin/AccuRevCheckInCommand.java | 6 +- .../command/checkout/AccuRevCheckOutCommand.java | 14 +- .../command/export/AccuRevExportCommand.java | 20 +-- .../accurev/command/login/AccuRevLoginCommand.java | 4 +- .../command/remove/AccuRevRemoveCommand.java | 4 + .../command/status/AccuRevStatusCommand.java | 3 + .../accurev/command/tag/AccuRevTagCommand.java | 3 + .../command/update/AccuRevUpdateCommand.java | 3 + .../command/update/AccuRevUpdateScmResult.java | 4 +- .../accurev/util/QuotedPropertyParser.java | 4 + .../scm/provider/accurev/util/WorkspaceUtils.java | 5 +- .../org/apache/maven/scm/ChangeFileMatcher.java | 37 +++-- .../org/apache/maven/scm/ChangeSetMatcher.java | 7 +- .../apache/maven/scm/CollectionSizeMatcher.java | 8 +- .../java/org/apache/maven/scm/ScmFileMatcher.java | 8 +- .../maven/scm/provider/accurev/VersionMatcher.java | 2 +- .../provider/accurev/cli/HistoryConsumerTest.java | 5 +- .../changelog/AccuRevChangeLogCommandTckTest.java | 8 +- .../command/status/AccuRevStatusCommandTest.java | 6 +- .../maven-scm-provider-bazaar/pom.xml | 2 +- .../maven/scm/provider/bazaar/BazaarUtils.java | 2 +- .../provider/bazaar/command/BazaarConsumer.java | 17 +- .../command/checkin/BazaarCheckInCommand.java | 3 +- .../command/checkout/BazaarCheckOutCommand.java | 3 +- .../bazaar/command/diff/BazaarDiffConsumer.java | 4 +- .../bazaar/command/tag/BazaarLsConsumer.java | 31 ++-- .../bazaar/command/tag/BazaarTagCommand.java | 42 ++--- .../bazaar/command/update/BazaarUpdateCommand.java | 3 +- .../repository/BazaarScmProviderRepository.java | 9 +- .../maven-scm-provider-clearcase/pom.xml | 2 +- .../command/blame/ClearCaseBlameCommand.java | 3 +- .../command/checkout/ClearCaseCheckOutCommand.java | 3 +- .../checkout/ClearCaseCheckOutConsumer.java | 2 +- .../scm/provider/clearcase/util/ClearCaseUtil.java | 10 +- maven-scm-providers/maven-scm-provider-hg/pom.xml | 2 +- .../org/apache/maven/scm/provider/hg/HgUtils.java | 3 +- .../provider/hg/command/HgCommandConstants.java | 3 +- .../hg/command/branch/HgBranchCommand.java | 28 ++-- .../hg/command/changelog/HgChangeLogConsumer.java | 4 +- .../hg/command/checkin/HgCheckInCommand.java | 7 +- .../provider/hg/command/diff/HgDiffConsumer.java | 4 +- .../provider/hg/command/info/HgInfoConsumer.java | 9 +- .../provider/hg/command/inventory/HgChangeSet.java | 34 ++-- .../hg/command/inventory/HgOutgoingConsumer.java | 34 ++-- .../hg/command/status/HgStatusCommand.java | 4 +- .../scm/provider/hg/command/tag/HgTagCommand.java | 3 +- .../hg/command/update/HgUpdateCommand.java | 26 +-- .../hg/repository/HgScmProviderRepository.java | 4 +- .../maven-scm-provider-integrity/pom.xml | 2 +- .../maven/scm/provider/integrity/APISession.java | 4 +- .../scm/provider/integrity/ExceptionHandler.java | 175 +++++++++++---------- .../provider/integrity/IntegrityScmProvider.java | 11 +- .../maven/scm/provider/integrity/Member.java | 24 +-- .../maven/scm/provider/integrity/Project.java | 29 +--- .../maven/scm/provider/integrity/Sandbox.java | 20 +-- .../integrity/command/add/IntegrityAddCommand.java | 2 +- .../command/blame/IntegrityBlameCommand.java | 2 +- .../command/blame/IntegrityBlameConsumer.java | 2 +- .../command/branch/IntegrityBranchCommand.java | 2 +- .../changelog/IntegrityChangeLogCommand.java | 2 +- .../command/checkin/IntegrityCheckInCommand.java | 2 +- .../command/checkout/IntegrityCheckOutCommand.java | 5 +- .../command/diff/IntegrityDiffCommand.java | 6 +- .../command/diff/IntegrityDiffConsumer.java | 2 +- .../command/edit/IntegrityEditCommand.java | 2 +- .../command/export/IntegrityExportCommand.java | 2 +- .../command/fileinfo/IntegrityFileInfoCommand.java | 2 +- .../fileinfo/IntegrityFileInfoConsumer.java | 2 +- .../command/list/IntegrityListCommand.java | 2 +- .../command/lock/IntegrityLockCommand.java | 2 +- .../command/login/IntegrityLoginCommand.java | 2 +- .../command/mkdir/IntegrityMkdirCommand.java | 2 +- .../command/remove/IntegrityRemoveCommand.java | 2 +- .../command/status/IntegrityStatusCommand.java | 2 +- .../integrity/command/tag/IntegrityTagCommand.java | 2 +- .../command/unedit/IntegrityUnEditCommand.java | 2 +- .../command/unlock/IntegrityUnlockCommand.java | 2 +- .../command/update/IntegrityUpdateCommand.java | 2 +- .../repository/IntegrityScmProviderRepository.java | 2 +- .../integrity/command/IntegrityCommandTest.java | 2 +- .../command/add/IntegrityAddCommandTest.java | 2 +- .../command/branch/IntegrityBranchCommandTest.java | 2 +- .../changelog/IntegrityChangeLogCommandTest.java | 2 +- .../checkin/IntegrityCheckInCommandTest.java | 2 +- .../checkout/IntegrityCheckOutCommandTest.java | 2 +- .../command/export/IntegrityExportCommandTest.java | 2 +- .../command/list/IntegrityListCommandTest.java | 2 +- .../command/lock/IntegrityLockCommandTest.java | 2 +- .../command/status/IntegrityStatusCommandTest.java | 2 +- .../command/tag/IntegrityTagCommandTest.java | 2 +- .../command/unedit/IntegrityUnEditCommandTest.java | 2 +- .../command/update/IntegrityUpdateCommandTest.java | 2 +- .../IntegrityScmProviderRepositoryTest.java | 2 +- .../maven-scm-provider-jazz/pom.xml | 2 +- .../maven/scm/provider/jazz/JazzScmProvider.java | 3 +- .../provider/jazz/command/add/JazzAddCommand.java | 7 +- .../changelog/JazzListChangesetConsumer.java | 11 +- .../jazz/command/diff/JazzDiffCommand.java | 3 +- .../jazz/command/status/JazzStatusConsumer.java | 8 +- .../jazz/command/update/JazzUpdateConsumer.java | 6 +- .../jazz/repository/JazzScmProviderRepository.java | 16 +- .../maven-scm-provider-local/pom.xml | 2 +- .../local/command/checkin/LocalCheckInCommand.java | 2 +- .../local/command/status/LocalStatusCommand.java | 2 +- .../local/command/tag/LocalTagCommand.java | 6 +- .../maven-scm-provider-perforce/pom.xml | 2 +- .../scm/provider/perforce/PerforceScmProvider.java | 6 +- .../perforce/command/PerforceVerbMapper.java | 2 +- .../command/blame/PerforceBlameCommand.java | 38 +++-- .../command/blame/PerforceFilelogConsumer.java | 4 +- .../changelog/PerforceChangeLogCommand.java | 25 +-- .../changelog/PerforceChangeLogConsumer.java | 15 +- .../command/changelog/PerforceChangesConsumer.java | 2 +- .../changelog/PerforceDescribeConsumer.java | 16 +- .../perforce/command/edit/PerforceEditCommand.java | 1 - .../command/update/PerforceHaveConsumer.java | 2 +- .../command/update/PerforceUpdateCommand.java | 2 +- .../repository/PerforceScmProviderRepository.java | 6 +- .../maven-scm-provider-starteam/pom.xml | 2 +- .../scm/provider/starteam/StarteamScmProvider.java | 12 +- .../command/diff/StarteamDiffConsumer.java | 4 +- .../scm/provider/starteam/util/StarteamUtil.java | 10 +- .../maven-scm-provider-synergy/pom.xml | 2 +- .../command/changelog/SynergyChangeLogCommand.java | 3 +- .../synergy/command/tag/SynergyTagCommand.java | 10 +- .../command/update/SynergyUpdateCommand.java | 3 +- .../consumer/SynergyShowDefaultTaskConsumer.java | 4 +- .../scm/provider/synergy/util/SynergyCCM.java | 12 +- .../provider/synergy/util/SynergyTaskManager.java | 15 +- .../scm/provider/synergy/util/SynergyUtil.java | 37 ++--- maven-scm-providers/maven-scm-provider-tfs/pom.xml | 2 +- .../maven/scm/provider/tfs/TfsScmProvider.java | 18 ++- .../scm/provider/tfs/TfsScmProviderRepository.java | 3 + .../scm/provider/tfs/command/TfsAddCommand.java | 3 + .../scm/provider/tfs/command/TfsBranchCommand.java | 3 + .../provider/tfs/command/TfsChangeLogCommand.java | 2 + .../provider/tfs/command/TfsCheckInCommand.java | 3 + .../provider/tfs/command/TfsCheckOutCommand.java | 3 + .../maven/scm/provider/tfs/command/TfsCommand.java | 10 +- .../scm/provider/tfs/command/TfsEditCommand.java | 3 + .../scm/provider/tfs/command/TfsListCommand.java | 3 + .../scm/provider/tfs/command/TfsStatusCommand.java | 3 + .../scm/provider/tfs/command/TfsTagCommand.java | 4 +- .../scm/provider/tfs/command/TfsUnEditCommand.java | 3 + .../scm/provider/tfs/command/TfsUpdateCommand.java | 3 + .../tfs/command/blame/TfsBlameCommand.java | 3 +- .../tfs/command/consumer/ChangedFileConsumer.java | 11 +- .../tfs/command/consumer/ErrorStreamConsumer.java | 3 + .../tfs/command/consumer/FileListConsumer.java | 3 + .../command/consumer/ServerFileListConsumer.java | 3 + maven-scm-providers/maven-scm-provider-vss/pom.xml | 2 +- .../maven/scm/provider/vss/VssScmProvider.java | 3 +- .../provider/vss/commands/VssCommandLineUtils.java | 23 +-- .../provider/vss/commands/VssParameterContext.java | 12 +- .../provider/vss/commands/add/VssAddConsumer.java | 3 +- .../vss/commands/VssCommandLineUtilsTest.java | 1 + .../maven-scm-provider-cvs-commons/pom.xml | 2 +- .../provider/cvslib/AbstractCvsScmProvider.java | 6 +- .../cvslib/command/blame/CvsBlameConsumer.java | 2 +- .../cvslib/command/diff/CvsDiffConsumer.java | 4 +- .../cvslib/command/list/CvsListConsumer.java | 10 +- .../command/mkdir/AbstractCvsMkdirCommand.java | 2 +- .../maven/scm/provider/cvslib/util/CvsUtil.java | 4 +- .../maven-scm-provider-cvsexe/pom.xml | 2 +- .../maven-scm-provider-cvsjava/pom.xml | 4 +- .../maven-scm-provider-cvstest/pom.xml | 2 +- .../command/mkdir/CvsMkdirCommandTckTest.java | 3 + .../maven-scm-providers-cvs/pom.xml | 2 +- .../maven-scm-provider-git-commons/pom.xml | 2 +- .../scm/provider/git/AbstractGitScmProvider.java | 3 +- .../provider/git/command/diff/GitDiffConsumer.java | 4 +- .../scm/provider/git/command/info/GitInfoItem.java | 4 +- .../git/repository/GitScmProviderRepository.java | 12 +- .../scm/provider/git/repository/RepositoryUrl.java | 4 +- .../maven/scm/provider/git/util/GitUtil.java | 6 +- .../maven-scm-provider-gitexe/pom.xml | 2 +- .../git/gitexe/command/AnonymousCommandLine.java | 58 +++++++ .../git/gitexe/command/GitCommandLineUtils.java | 32 +++- .../git/gitexe/command/add/GitAddCommand.java | 6 +- .../git/gitexe/command/blame/GitBlameConsumer.java | 18 ++- .../gitexe/command/branch/GitBranchCommand.java | 8 +- .../command/branch/GitCurrentBranchConsumer.java | 2 +- .../command/changelog/GitChangeLogCommand.java | 9 +- .../command/changelog/GitChangeLogConsumer.java | 4 +- .../gitexe/command/checkin/GitCheckInCommand.java | 18 ++- .../git/gitexe/command/diff/GitDiffCommand.java | 3 +- .../gitexe/command/diff/GitDiffRawConsumer.java | 2 +- .../git/gitexe/command/info/GitInfoCommand.java | 7 +- .../gitexe/command/status/GitStatusCommand.java | 12 +- .../gitexe/command/status/GitStatusConsumer.java | 30 ++-- .../git/gitexe/command/tag/GitTagCommand.java | 14 +- .../gitexe/command/update/GitUpdateCommand.java | 11 +- .../command/GitCommandLineUtilsAddTargetTest.java | 39 ++++- .../maven-scm-provider-gittest/pom.xml | 2 +- .../changelog/GitChangeLogCommandTckTest.java | 6 +- .../AbstractGitRemoteInfoCommandTckTest.java | 13 +- .../maven-scm-provider-jgit/pom.xml | 2 +- .../scm/provider/git/jgit/command/JGitUtils.java | 46 +++--- .../git/jgit/command/blame/JGitBlameCommand.java | 3 +- .../command/changelog/JGitChangeLogCommand.java | 3 + .../jgit/command/checkin/JGitCheckInCommand.java | 11 +- .../jgit/command/checkout/JGitCheckOutCommand.java | 10 +- .../maven-scm-providers-git/pom.xml | 2 +- .../maven-scm-providers-standard/pom.xml | 2 +- .../maven-scm-provider-svn-commons/pom.xml | 2 +- .../maven/scm/provider/svn/SvnCommandUtils.java | 3 +- .../maven/scm/provider/svn/SvnTagBranchUtils.java | 3 +- .../provider/svn/command/diff/SvnDiffConsumer.java | 4 +- .../scm/provider/svn/command/info/SvnInfoItem.java | 4 +- .../maven/scm/provider/svn/util/SvnUtil.java | 4 +- .../maven-scm-provider-svnexe/pom.xml | 2 +- .../svn/svnexe/command/SvnCommandLineUtils.java | 10 +- .../svn/svnexe/command/add/SvnAddConsumer.java | 3 +- .../svnexe/command/branch/SvnBranchCommand.java | 11 +- .../command/changelog/IllegalOutputException.java | 1 - .../command/changelog/SvnChangeLogCommand.java | 4 +- .../command/changelog/SvnChangeLogConsumer.java | 4 +- .../svnexe/command/checkin/SvnCheckInCommand.java | 3 +- .../svnexe/command/export/SvnExeExportCommand.java | 3 +- .../svn/svnexe/command/mkdir/SvnMkdirConsumer.java | 2 +- .../command/remoteinfo/SvnRemoteInfoCommand.java | 1 + .../svnexe/command/remove/SvnRemoveCommand.java | 3 +- .../svnexe/command/remove/SvnRemoveConsumer.java | 3 +- .../svnexe/command/status/SvnStatusConsumer.java | 3 +- .../svn/svnexe/command/tag/SvnTagCommand.java | 2 +- .../maven-scm-provider-svntest/pom.xml | 2 +- .../maven/scm/provider/svn/SvnScmTestUtils.java | 6 +- .../maven-scm-providers-svn/pom.xml | 2 +- maven-scm-providers/pom.xml | 2 +- maven-scm-test/pom.xml | 6 +- .../java/org/apache/maven/scm/ScmTestCase.java | 9 +- .../apache/maven/scm/manager/ScmManagerStub.java | 3 +- .../scm/provider/ScmProviderRepositoryStub.java | 3 +- .../apache/maven/scm/provider/ScmProviderStub.java | 3 +- .../maven/scm/repository/ScmRepositoryStub.java | 3 +- .../command/changelog/ChangeLogCommandTckTest.java | 4 +- .../tck/command/checkin/CheckInCommandTckTest.java | 8 +- pom.xml | 88 ++++------- 301 files changed, 1434 insertions(+), 1026 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
