This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/mina-sshd-2.16
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
discard 28ec2c982 Use SSHD 2.16.0
add 041492ed4 Follow Oracle Javadoc guidelines (#1312)
add 6450c6da5 Use SSHD 2.16.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (28ec2c982)
\
N -- N -- N refs/heads/feature/mina-sshd-2.16 (6450c6da5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../org/apache/maven/scm/AbstractScmVersion.java | 13 ++-
.../main/java/org/apache/maven/scm/ChangeFile.java | 26 ++---
.../main/java/org/apache/maven/scm/ChangeSet.java | 97 +++++++++---------
.../org/apache/maven/scm/CommandParameter.java | 13 +--
.../org/apache/maven/scm/CommandParameters.java | 86 ++++++++--------
.../maven/scm/NoSuchCommandScmException.java | 3 +-
.../main/java/org/apache/maven/scm/ScmBranch.java | 5 +-
.../java/org/apache/maven/scm/ScmException.java | 1 -
.../main/java/org/apache/maven/scm/ScmFile.java | 23 +++--
.../main/java/org/apache/maven/scm/ScmFileSet.java | 23 +++--
.../java/org/apache/maven/scm/ScmFileStatus.java | 21 ++--
.../main/java/org/apache/maven/scm/ScmRequest.java | 2 +
.../main/java/org/apache/maven/scm/ScmResult.java | 19 ++--
.../java/org/apache/maven/scm/ScmRevision.java | 5 +-
.../src/main/java/org/apache/maven/scm/ScmTag.java | 5 +-
.../org/apache/maven/scm/ScmTagParameters.java | 10 +-
.../org/apache/maven/scm/ScmUntagParameters.java | 18 ++--
.../main/java/org/apache/maven/scm/ScmVersion.java | 1 -
.../apache/maven/scm/command/AbstractCommand.java | 5 +-
.../java/org/apache/maven/scm/command/Command.java | 3 +-
.../maven/scm/command/add/AbstractAddCommand.java | 5 +-
.../apache/maven/scm/command/add/AddScmResult.java | 3 +-
.../apache/maven/scm/command/blame/BlameLine.java | 1 -
.../maven/scm/command/blame/BlameScmRequest.java | 2 +-
.../scm/command/branch/AbstractBranchCommand.java | 10 +-
.../maven/scm/command/branch/BranchScmResult.java | 1 -
.../changelog/AbstractChangeLogCommand.java | 1 -
.../scm/command/changelog/ChangeLogCommand.java | 1 -
.../scm/command/changelog/ChangeLogScmResult.java | 1 -
.../maven/scm/command/changelog/ChangeLogSet.java | 21 ++--
.../command/checkin/AbstractCheckInCommand.java | 2 -
.../scm/command/checkin/CheckInScmResult.java | 3 +-
.../command/checkout/AbstractCheckOutCommand.java | 9 +-
.../scm/command/checkout/CheckOutScmResult.java | 3 +-
.../scm/command/diff/AbstractDiffCommand.java | 7 +-
.../maven/scm/command/diff/DiffScmResult.java | 1 -
.../scm/command/edit/AbstractEditCommand.java | 7 +-
.../scm/command/export/AbstractExportCommand.java | 5 +-
.../maven/scm/command/export/ExportScmResult.java | 1 -
.../export/ExportScmResultWithRevision.java | 1 -
.../command/fileinfo/AbstractFileInfoCommand.java | 1 -
.../apache/maven/scm/command/info/InfoItem.java | 6 +-
.../maven/scm/command/info/InfoScmResult.java | 1 -
.../scm/command/list/AbstractListCommand.java | 7 +-
.../maven/scm/command/list/ListScmResult.java | 3 +-
.../scm/command/lock/AbstractLockCommand.java | 1 -
.../scm/command/login/AbstractLoginCommand.java | 5 +-
.../maven/scm/command/login/LoginScmResult.java | 1 -
.../scm/command/mkdir/AbstractMkdirCommand.java | 5 +-
.../maven/scm/command/mkdir/MkdirScmResult.java | 1 -
.../command/remoteinfo/RemoteInfoScmResult.java | 8 +-
.../scm/command/remove/AbstractRemoveCommand.java | 5 +-
.../maven/scm/command/remove/RemoveScmResult.java | 1 -
.../scm/command/status/AbstractStatusCommand.java | 5 +-
.../maven/scm/command/status/StatusScmResult.java | 1 -
.../maven/scm/command/tag/AbstractTagCommand.java | 7 +-
.../apache/maven/scm/command/tag/TagScmResult.java | 1 -
.../scm/command/unedit/AbstractUnEditCommand.java | 7 +-
.../maven/scm/command/unedit/UnEditScmResult.java | 1 -
.../scm/command/unlock/AbstractUnlockCommand.java | 1 -
.../scm/command/untag/AbstractUntagCommand.java | 8 +-
.../maven/scm/command/untag/UntagScmResult.java | 4 +-
.../scm/command/update/AbstractUpdateCommand.java | 5 +-
.../maven/scm/command/update/UpdateScmResult.java | 4 +-
.../update/UpdateScmResultWithRevision.java | 1 -
.../maven/scm/manager/AbstractScmManager.java | 2 +-
.../apache/maven/scm/manager/BasicScmManager.java | 1 -
.../scm/manager/NoSuchScmProviderException.java | 1 -
.../org/apache/maven/scm/manager/ScmManager.java | 104 +++++++++----------
.../maven/scm/provider/AbstractScmProvider.java | 3 +-
.../org/apache/maven/scm/provider/ScmProvider.java | 114 ++++++++++-----------
.../maven/scm/provider/ScmProviderRepository.java | 17 +--
.../provider/ScmProviderRepositoryWithHost.java | 1 -
.../org/apache/maven/scm/provider/ScmUrlUtils.java | 19 ++--
.../apache/maven/scm/repository/ScmRepository.java | 11 +-
.../scm/repository/ScmRepositoryException.java | 1 -
.../scm/repository/UnknownRepositoryStructure.java | 1 -
.../apache/maven/scm/util/AbstractConsumer.java | 5 +-
.../org/apache/maven/scm/util/FilenameUtils.java | 3 -
.../maven/scm/util/ThreadSafeDateFormat.java | 1 +
.../apache/maven/scm/client/cli/MavenScmCli.java | 1 -
.../apache/maven/scm/plugin/AbstractScmMojo.java | 12 ++-
.../java/org/apache/maven/scm/plugin/AddMojo.java | 4 +-
.../org/apache/maven/scm/plugin/BootstrapMojo.java | 6 +-
.../org/apache/maven/scm/plugin/BranchMojo.java | 9 +-
.../org/apache/maven/scm/plugin/ChangeLogMojo.java | 2 +-
.../scm/plugin/CheckLocalModificationsMojo.java | 4 +-
.../org/apache/maven/scm/plugin/CheckinMojo.java | 4 +-
.../org/apache/maven/scm/plugin/CheckoutMojo.java | 8 +-
.../java/org/apache/maven/scm/plugin/DiffMojo.java | 4 +-
.../java/org/apache/maven/scm/plugin/EditMojo.java | 4 +-
.../org/apache/maven/scm/plugin/ExportMojo.java | 4 +-
.../java/org/apache/maven/scm/plugin/ListMojo.java | 4 +-
.../org/apache/maven/scm/plugin/StatusMojo.java | 6 +-
.../java/org/apache/maven/scm/plugin/TagMojo.java | 9 +-
.../org/apache/maven/scm/plugin/UnEditMojo.java | 4 +-
.../org/apache/maven/scm/plugin/UntagMojo.java | 4 +-
.../org/apache/maven/scm/plugin/UpdateMojo.java | 4 +-
.../maven/scm/plugin/UpdateSubprojectsMojo.java | 4 +-
.../org/apache/maven/scm/plugin/ValidateMojo.java | 1 +
.../maven/scm/plugin/ValidateRecursively.java | 2 +-
.../org/apache/maven/scm/provider/hg/HgConfig.java | 7 +-
.../maven/scm/provider/hg/HgScmProvider.java | 69 +++++++++----
.../org/apache/maven/scm/provider/hg/HgUtils.java | 13 +--
.../provider/hg/command/HgCommandConstants.java | 38 +++----
.../maven/scm/provider/hg/command/HgConsumer.java | 13 +--
.../scm/provider/hg/command/add/HgAddCommand.java | 5 +-
.../scm/provider/hg/command/add/HgAddConsumer.java | 5 +-
.../hg/command/branch/HgBranchCommand.java | 1 -
.../hg/command/checkin/HgCheckInCommand.java | 1 -
.../hg/command/checkout/HgCheckOutCommand.java | 1 -
.../hg/command/checkout/HgCheckOutConsumer.java | 5 +-
.../provider/hg/command/diff/HgDiffCommand.java | 5 +-
.../provider/hg/command/diff/HgDiffConsumer.java | 5 +-
.../provider/hg/command/info/HgInfoConsumer.java | 1 -
.../provider/hg/command/inventory/HgChangeSet.java | 3 +-
.../hg/command/inventory/HgListCommand.java | 7 +-
.../hg/command/inventory/HgListConsumer.java | 7 +-
.../hg/command/inventory/HgOutgoingConsumer.java | 3 +-
.../hg/command/remove/HgRemoveCommand.java | 5 +-
.../hg/command/remove/HgRemoveConsumer.java | 5 +-
.../hg/command/status/HgStatusCommand.java | 4 +-
.../hg/command/status/HgStatusConsumer.java | 5 +-
.../scm/provider/hg/command/tag/HgTagCommand.java | 3 +-
.../scm/provider/hg/command/tag/HgTagConsumer.java | 5 +-
.../hg/command/update/HgUpdateCommand.java | 5 +-
.../hg/repository/HgScmProviderRepository.java | 7 +-
.../maven/scm/provider/local/LocalScmProvider.java | 44 ++++++--
.../scm/provider/local/command/LocalCommand.java | 1 -
.../local/command/add/LocalAddCommand.java | 5 +-
.../command/changelog/LocalChangeLogCommand.java | 5 +-
.../local/command/checkin/LocalCheckInCommand.java | 5 +-
.../command/checkout/LocalCheckOutCommand.java | 5 +-
.../command/checkout/LocalCheckOutScmResult.java | 1 -
.../local/command/list/LocalListCommand.java | 5 +-
.../local/command/list/LocalListScmResult.java | 1 -
.../local/command/mkdir/LocalMkdirCommand.java | 1 -
.../local/command/status/LocalStatusCommand.java | 5 +-
.../local/command/tag/LocalTagCommand.java | 9 +-
.../local/command/update/LocalUpdateCommand.java | 9 +-
.../local/command/update/LocalUpdateScmResult.java | 1 -
.../local/metadata/LocalScmMetadataUtils.java | 11 +-
.../repository/LocalScmProviderRepository.java | 5 +-
.../scm/provider/git/AbstractGitScmProvider.java | 84 ++++++++++-----
.../maven/scm/provider/git/GitCommandUtils.java | 1 -
.../scm/provider/git/GitConfigFileReader.java | 3 +-
.../maven/scm/provider/git/command/GitCommand.java | 1 -
.../provider/git/command/diff/GitDiffConsumer.java | 9 +-
.../scm/provider/git/command/info/GitInfoItem.java | 1 -
.../git/command/info/GitInfoScmResult.java | 1 -
.../git/command/update/GitUpdateScmResult.java | 1 -
.../git/repository/GitScmProviderRepository.java | 27 +++--
.../scm/provider/git/repository/RepositoryUrl.java | 14 +--
.../maven/scm/provider/git/util/GitUtil.java | 8 +-
.../scm/provider/git/gitexe/GitExeScmProvider.java | 65 +++++++++---
.../command/AbstractFileCheckingConsumer.java | 5 +-
.../git/gitexe/command/AnonymousCommandLine.java | 3 +-
.../git/gitexe/command/GitCommandLineUtils.java | 1 -
.../git/gitexe/command/blame/GitBlameConsumer.java | 2 +-
.../gitexe/command/branch/GitBranchCommand.java | 7 +-
.../command/branch/GitCurrentBranchConsumer.java | 6 +-
.../command/changelog/GitChangeLogCommand.java | 25 +++--
.../command/changelog/GitChangeLogConsumer.java | 43 ++++----
.../gitexe/command/checkin/GitCheckInCommand.java | 5 +-
.../command/checkout/GitCheckOutCommand.java | 3 +-
.../git/gitexe/command/diff/GitDiffCommand.java | 5 +-
.../gitexe/command/diff/GitDiffRawConsumer.java | 1 -
.../git/gitexe/command/info/GitInfoCommand.java | 3 +-
.../git/gitexe/command/info/GitInfoConsumer.java | 5 +-
.../git/gitexe/command/list/GitListCommand.java | 1 -
.../git/gitexe/command/list/GitListConsumer.java | 5 +-
.../command/remoteinfo/GitRemoteInfoConsumer.java | 4 +-
.../gitexe/command/remove/GitRemoveCommand.java | 1 -
.../gitexe/command/remove/GitRemoveConsumer.java | 3 +-
.../gitexe/command/status/GitStatusCommand.java | 13 +--
.../gitexe/command/status/GitStatusConsumer.java | 22 ++--
.../git/gitexe/command/tag/GitTagCommand.java | 5 +-
.../git/gitexe/command/untag/GitUntagCommand.java | 8 +-
.../update/GitLatestRevisionCommandConsumer.java | 11 +-
.../gitexe/command/update/GitUpdateCommand.java | 11 +-
.../maven/scm/provider/git/GitScmTestUtils.java | 4 +-
.../maven/scm/provider/git/GitSshServer.java | 2 +-
.../command/branch/GitBranchCommandTckTest.java | 5 +-
.../command/branch/GitSshBranchCommandTckTest.java | 11 +-
.../changelog/GitChangeLogCommandTckTest.java | 4 +-
.../command/checkin/GitCheckInCommandTckTest.java | 6 +-
.../checkout/GitCheckOutCommandTckTest.java | 9 +-
.../checkout/GitSshCheckOutCommandTckTest.java | 11 +-
.../git/command/diff/GitDiffCommandTckTest.java | 5 +-
.../git/command/info/GitInfoCommandTckTest.java | 5 +-
.../git/command/list/GitListCommandTckTest.java | 5 +-
.../command/remove/GitRemoveCommandTckTest.java | 8 +-
.../command/status/GitStatusCommandTckTest.java | 5 +-
.../git/command/tag/GitSshTagCommandTckTest.java | 11 +-
.../git/command/tag/GitTagCommandTckTest.java | 5 +-
.../command/untag/GitSshUntagCommandTckTest.java | 11 +-
.../git/command/untag/GitUntagCommandTckTest.java | 8 +-
.../command/update/GitUpdateCommandTckTest.java | 5 +-
.../scm/provider/git/jgit/command/JGitUtils.java | 29 +++---
.../PlexusInteractivityCredentialsProvider.java | 1 -
.../ScmProviderAwareSshdSessionFactory.java | 1 -
.../git/jgit/command/branch/JGitBranchCommand.java | 2 +-
.../command/changelog/JGitChangeLogCommand.java | 3 -
.../git/jgit/command/untag/JGitUntagCommand.java | 4 +-
.../scm/provider/svn/AbstractSvnScmProvider.java | 3 +-
.../maven/scm/provider/svn/SvnChangeSet.java | 5 +-
.../maven/scm/provider/svn/SvnCommandUtils.java | 1 -
.../scm/provider/svn/SvnConfigFileReader.java | 1 -
.../maven/scm/provider/svn/SvnTagBranchUtils.java | 17 ++-
.../maven/scm/provider/svn/command/SvnCommand.java | 1 -
.../provider/svn/command/diff/SvnDiffConsumer.java | 5 +-
.../scm/provider/svn/command/info/SvnInfoItem.java | 1 -
.../svn/command/info/SvnInfoScmResult.java | 1 -
.../svn/command/update/SvnUpdateScmResult.java | 1 -
.../svn/repository/SvnScmProviderRepository.java | 14 ++-
.../maven/scm/provider/svn/util/SvnUtil.java | 1 -
.../command/AbstractFileCheckingConsumer.java | 5 +-
.../svn/svnexe/command/SvnCommandLineUtils.java | 1 -
.../svn/svnexe/command/add/SvnAddCommand.java | 5 +-
.../svn/svnexe/command/add/SvnAddConsumer.java | 5 +-
.../svnexe/command/branch/SvnBranchCommand.java | 7 +-
.../command/changelog/IllegalOutputException.java | 3 +-
.../command/changelog/SvnChangeLogCommand.java | 9 +-
.../command/changelog/SvnChangeLogConsumer.java | 33 +++---
.../svnexe/command/checkin/SvnCheckInCommand.java | 5 +-
.../svnexe/command/checkin/SvnCheckInConsumer.java | 5 +-
.../command/checkout/SvnCheckOutCommand.java | 7 +-
.../command/checkout/SvnCheckOutConsumer.java | 1 -
.../svn/svnexe/command/diff/SvnDiffCommand.java | 5 +-
.../svnexe/command/export/SvnExeExportCommand.java | 5 +-
.../svn/svnexe/command/info/SvnInfoCommand.java | 5 +-
.../svn/svnexe/command/info/SvnInfoConsumer.java | 5 +-
.../svn/svnexe/command/list/SvnListCommand.java | 5 +-
.../svn/svnexe/command/list/SvnListConsumer.java | 5 +-
.../svn/svnexe/command/mkdir/SvnMkdirCommand.java | 1 -
.../svn/svnexe/command/mkdir/SvnMkdirConsumer.java | 5 +-
.../svnexe/command/remove/SvnRemoveCommand.java | 5 +-
.../svnexe/command/remove/SvnRemoveConsumer.java | 5 +-
.../svnexe/command/status/SvnStatusCommand.java | 5 +-
.../svnexe/command/status/SvnStatusConsumer.java | 5 +-
.../svn/svnexe/command/tag/SvnTagCommand.java | 9 +-
.../svn/svnexe/command/untag/SvnUntagCommand.java | 10 +-
.../svnexe/command/update/SvnUpdateCommand.java | 9 +-
.../svnexe/command/update/SvnUpdateConsumer.java | 5 +-
.../maven/scm/provider/svn/SvnScmTestUtils.java | 5 +-
.../command/branch/SvnBranchCommandTckTest.java | 9 +-
.../command/checkin/SvnCheckInCommandTckTest.java | 9 +-
.../checkout/SvnCheckOutCommandTckTest.java | 9 +-
.../svn/command/diff/SvnDiffCommandTckTest.java | 9 +-
.../svn/command/info/SvnInfoCommandTckTest.java | 8 +-
.../svn/command/list/SvnListCommandTckTest.java | 11 +-
.../svn/command/mkdir/SvnMkdirCommandTckTest.java | 9 +-
.../command/remove/SvnRemoveCommandTckTest.java | 11 +-
.../command/status/SvnStatusCommandTckTest.java | 9 +-
.../svn/command/tag/SvnTagCommandTckTest.java | 9 +-
.../svn/command/untag/SvnUntagCommandTckTest.java | 9 +-
.../command/update/SvnUpdateCommandTckTest.java | 9 +-
.../java/org/apache/maven/scm/ScmTckTestCase.java | 22 ++--
.../java/org/apache/maven/scm/ScmTestCase.java | 7 +-
.../apache/maven/scm/manager/ScmManagerStub.java | 7 +-
.../scm/provider/ScmProviderRepositoryStub.java | 11 +-
.../apache/maven/scm/provider/ScmProviderStub.java | 3 +-
.../maven/scm/repository/ScmRepositoryStub.java | 3 +-
.../tck/command/branch/BranchCommandTckTest.java | 1 -
.../command/changelog/ChangeLogCommandTckTest.java | 3 +-
.../command/checkout/CheckOutCommandTckTest.java | 1 -
.../scm/tck/command/diff/DiffCommandTckTest.java | 1 -
.../scm/tck/command/info/InfoCommandTckTest.java | 1 -
.../scm/tck/command/list/ListCommandTckTest.java | 1 -
.../scm/tck/command/mkdir/MkdirCommandTckTest.java | 1 -
.../tck/command/status/StatusCommandTckTest.java | 1 -
.../scm/tck/command/tag/TagCommandTckTest.java | 1 -
.../tck/command/update/UpdateCommandTckTest.java | 1 -
273 files changed, 1256 insertions(+), 1003 deletions(-)
