[maven-scm] 14/34: Merge tag 'upstream/1.9'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 26 13:31:15 UTC 2017
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 fdd4454c0312ee7d31a4b0c4a09ccba7c03d1f2f
Merge: a959334 904aa50
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 26 12:58:21 2017 +0200
Merge tag 'upstream/1.9'
Upstream version 1.9
.gitattributes | 8 +
.gitignore | 3 +
deploySite.sh | 23 +
maven-scm-api/pom.xml | 2 +-
.../maven/scm/command/blame/BlameScmRequest.java | 10 +
.../apache/maven/scm/scmfileset/exclude/exclude1 | 16 +
.../apache/maven/scm/scmfileset/exclude/exclude2 | 16 +
.../org/apache/maven/scm/scmfileset/testFile1 | 16 +
.../org/apache/maven/scm/scmfileset/testFile2 | 16 +
maven-scm-client/pom.xml | 2 +-
.../maven-scm-manager-plexus/pom.xml | 2 +-
maven-scm-managers/pom.xml | 2 +-
maven-scm-plugin/pom.xml | 43 +-
.../apache/maven/scm/plugin/AbstractScmMojo.java | 63 +-
.../java/org/apache/maven/scm/plugin/AddMojo.java | 5 +-
.../org/apache/maven/scm/plugin/BootstrapMojo.java | 15 +-
.../org/apache/maven/scm/plugin/BranchMojo.java | 18 +-
.../org/apache/maven/scm/plugin/ChangeLogMojo.java | 36 +-
.../scm/plugin/CheckLocalModificationsMojo.java | 35 +-
.../org/apache/maven/scm/plugin/CheckinMojo.java | 18 +-
.../org/apache/maven/scm/plugin/CheckoutMojo.java | 21 +-
.../org/apache/maven/scm/plugin/DefaultLog.java | 1 -
.../java/org/apache/maven/scm/plugin/DiffMojo.java | 22 +-
.../java/org/apache/maven/scm/plugin/EditMojo.java | 5 +-
.../org/apache/maven/scm/plugin/ExportMojo.java | 19 +-
.../java/org/apache/maven/scm/plugin/ListMojo.java | 15 +-
.../org/apache/maven/scm/plugin/RemoveMojo.java | 9 +-
.../org/apache/maven/scm/plugin/StatusMojo.java | 5 +-
.../java/org/apache/maven/scm/plugin/TagMojo.java | 28 +-
.../org/apache/maven/scm/plugin/UnEditMojo.java | 5 +-
.../org/apache/maven/scm/plugin/UpdateMojo.java | 25 +-
.../maven/scm/plugin/UpdateSubprojectsMojo.java | 22 +-
.../org/apache/maven/scm/plugin/ValidateMojo.java | 16 +-
maven-scm-plugin/src/site/apt/index.apt | 34 +-
maven-scm-plugin/src/site/apt/usage.apt.vm | 2 +-
.../maven-scm-provider-accurev/pom.xml | 4 +-
.../maven-scm-provider-bazaar/pom.xml | 2 +-
.../maven/scm/provider/bazaar/BazaarConfig.java | 2 +-
.../scm/provider/bazaar/BazaarScmProvider.java | 2 +-
.../maven/scm/provider/bazaar/BazaarUtils.java | 2 +-
.../maven/scm/provider/bazaar/BazaarRepoUtils.java | 2 +-
.../checkin/BazaarCheckInCommandTckTest.java | 2 +-
.../checkout/BazaarCheckOutCommandTckTest.java | 2 +-
.../command/status/BazaarStatusCommandTckTest.java | 2 +-
.../command/update/BazaarUpdateCommandTckTest.java | 2 +-
.../maven-scm-provider-clearcase/pom.xml | 2 +-
maven-scm-providers/maven-scm-provider-hg/pom.xml | 2 +-
.../provider/hg/command/HgCommandConstants.java | 17 +-
.../hg/command/changelog/HgChangeLogCommand.java | 23 +-
.../hg/command/changelog/HgChangeLogConsumer.java | 118 +-
.../apache/maven/scm/provider/hg/HgUtilsTest.java | 116 +-
.../maven-scm-provider-integrity/pom.xml | 2 +-
.../maven/scm/provider/integrity/APISession.java | 570 +++----
.../scm/provider/integrity/ExceptionHandler.java | 250 +--
.../provider/integrity/IntegrityScmProvider.java | 824 +++++-----
.../maven/scm/provider/integrity/Member.java | 528 +++---
.../maven/scm/provider/integrity/Project.java | 826 +++++-----
.../maven/scm/provider/integrity/Sandbox.java | 1700 ++++++++++----------
.../integrity/command/add/IntegrityAddCommand.java | 142 +-
.../command/blame/IntegrityBlameCommand.java | 184 +--
.../command/blame/IntegrityBlameConsumer.java | 194 +--
.../command/branch/IntegrityBranchCommand.java | 178 +-
.../changelog/IntegrityChangeLogCommand.java | 186 +--
.../command/checkin/IntegrityCheckInCommand.java | 138 +-
.../command/checkout/IntegrityCheckOutCommand.java | 240 +--
.../command/diff/IntegrityDiffCommand.java | 206 +--
.../command/diff/IntegrityDiffConsumer.java | 106 +-
.../command/edit/IntegrityEditCommand.java | 148 +-
.../command/export/IntegrityExportCommand.java | 240 +--
.../command/fileinfo/IntegrityFileInfoCommand.java | 218 +--
.../fileinfo/IntegrityFileInfoConsumer.java | 110 +-
.../command/list/IntegrityListCommand.java | 174 +-
.../command/lock/IntegrityLockCommand.java | 190 +--
.../command/login/IntegrityLoginCommand.java | 176 +-
.../command/mkdir/IntegrityMkdirCommand.java | 202 +--
.../command/remove/IntegrityRemoveCommand.java | 146 +-
.../command/status/IntegrityStatusCommand.java | 232 +--
.../integrity/command/tag/IntegrityTagCommand.java | 266 +--
.../command/unedit/IntegrityUnEditCommand.java | 146 +-
.../command/unlock/IntegrityUnlockCommand.java | 218 +--
.../command/update/IntegrityUpdateCommand.java | 236 +--
.../repository/IntegrityScmProviderRepository.java | 266 +--
.../integrity/command/IntegrityCommandTest.java | 194 +--
.../command/add/IntegrityAddCommandTest.java | 124 +-
.../command/branch/IntegrityBranchCommandTest.java | 122 +-
.../changelog/IntegrityChangeLogCommandTest.java | 130 +-
.../checkin/IntegrityCheckInCommandTest.java | 150 +-
.../checkout/IntegrityCheckOutCommandTest.java | 110 +-
.../command/export/IntegrityExportCommandTest.java | 116 +-
.../command/list/IntegrityListCommandTest.java | 126 +-
.../command/lock/IntegrityLockCommandTest.java | 118 +-
.../command/status/IntegrityStatusCommandTest.java | 112 +-
.../command/tag/IntegrityTagCommandTest.java | 120 +-
.../command/unedit/IntegrityUnEditCommandTest.java | 112 +-
.../command/update/IntegrityUpdateCommandTest.java | 130 +-
.../IntegrityScmProviderRepositoryTest.java | 370 ++---
.../maven-scm-provider-jazz/pom.xml | 2 +-
.../command/status/JazzStatusConsumerTest.java | 120 +-
.../maven-scm-provider-local/pom.xml | 2 +-
.../maven-scm-provider-perforce/pom.xml | 2 +-
.../changelog/PerforceChangeLogCommandTest.java | 10 +-
.../command/edit/PerforceEditCommandTest.java | 196 +--
.../maven-scm-provider-starteam/pom.xml | 2 +-
.../maven-scm-provider-synergy/pom.xml | 2 +-
.../consumer/SynergyGetCompletedTasksConsumer.java | 30 +-
.../SynergyGetCompletedTasksConsumerTest.java | 20 +-
maven-scm-providers/maven-scm-provider-tfs/pom.xml | 2 +-
maven-scm-providers/maven-scm-provider-vss/pom.xml | 2 +-
.../maven-scm-provider-cvs-commons/pom.xml | 2 +-
.../src/test/resources/checkoutdir/CVS/Entries | 2 +-
.../test/resources/checkoutdir/CVS/Entries.Extra | 18 +-
.../resources/checkoutdir/CVS/Entries.Extra.Old | 18 +-
.../src/test/resources/checkoutdir/CVS/Entries.Old | 18 +-
.../src/test/resources/checkoutdir/CVS/Repository | 2 +-
.../src/test/resources/checkoutdir/CVS/Root | 2 +-
.../maven-scm-provider-cvsexe/pom.xml | 2 +-
.../src/test/repository/CVSROOT/.cvsignore | 4 +-
.../src/test/repository/CVSROOT/checkoutlist | 26 +-
.../src/test/repository/CVSROOT/checkoutlist,v | 72 +-
.../src/test/repository/CVSROOT/commitinfo | 48 +-
.../src/test/repository/CVSROOT/commitinfo,v | 94 +-
.../src/test/repository/CVSROOT/config | 74 +-
.../src/test/repository/CVSROOT/config,v | 120 +-
.../src/test/repository/CVSROOT/cvswrappers | 38 +-
.../src/test/repository/CVSROOT/cvswrappers,v | 84 +-
.../src/test/repository/CVSROOT/loginfo | 62 +-
.../src/test/repository/CVSROOT/loginfo,v | 108 +-
.../src/test/repository/CVSROOT/modules | 52 +-
.../src/test/repository/CVSROOT/modules,v | 98 +-
.../src/test/repository/CVSROOT/notify | 34 +-
.../src/test/repository/CVSROOT/notify,v | 80 +-
.../src/test/repository/CVSROOT/rcsinfo | 26 +-
.../src/test/repository/CVSROOT/rcsinfo,v | 72 +-
.../src/test/repository/CVSROOT/taginfo | 80 +-
.../src/test/repository/CVSROOT/taginfo,v | 126 +-
.../src/test/repository/CVSROOT/val-tags | 2 +-
.../src/test/repository/CVSROOT/verifymsg | 58 +-
.../src/test/repository/CVSROOT/verifymsg,v | 104 +-
.../test/repository/test-repo/checkout/Foo.java,v | 52 +-
.../repository/test-repo/checkout/Readme.txt,v | 48 +-
.../src/test/tck-repository/CVSROOT/.cvsignore | 4 +-
.../maven-scm-provider-cvsjava/pom.xml | 4 +-
.../src/test/repository/CVSROOT/.cvsignore | 4 +-
.../src/test/repository/CVSROOT/checkoutlist | 26 +-
.../src/test/repository/CVSROOT/checkoutlist,v | 72 +-
.../src/test/repository/CVSROOT/commitinfo | 48 +-
.../src/test/repository/CVSROOT/commitinfo,v | 94 +-
.../src/test/repository/CVSROOT/config | 60 +-
.../src/test/repository/CVSROOT/config,v | 120 +-
.../src/test/repository/CVSROOT/cvswrappers | 38 +-
.../src/test/repository/CVSROOT/cvswrappers,v | 84 +-
.../src/test/repository/CVSROOT/loginfo | 62 +-
.../src/test/repository/CVSROOT/loginfo,v | 108 +-
.../src/test/repository/CVSROOT/modules | 52 +-
.../src/test/repository/CVSROOT/modules,v | 98 +-
.../src/test/repository/CVSROOT/notify | 34 +-
.../src/test/repository/CVSROOT/notify,v | 80 +-
.../src/test/repository/CVSROOT/rcsinfo | 26 +-
.../src/test/repository/CVSROOT/rcsinfo,v | 72 +-
.../src/test/repository/CVSROOT/taginfo | 80 +-
.../src/test/repository/CVSROOT/taginfo,v | 126 +-
.../src/test/repository/CVSROOT/val-tags | 2 +-
.../src/test/repository/CVSROOT/verifymsg | 58 +-
.../src/test/repository/CVSROOT/verifymsg,v | 104 +-
.../test/repository/test-repo/checkout/Foo.java,v | 52 +-
.../repository/test-repo/checkout/Readme.txt,v | 48 +-
.../src/test/tck-repository/CVSROOT/.cvsignore | 4 +-
.../maven-scm-provider-cvstest/pom.xml | 2 +-
.../main/resources/repository/CVSROOT/.cvsignore | 4 +-
.../main/resources/repository/CVSROOT/checkoutlist | 26 +-
.../resources/repository/CVSROOT/checkoutlist,v | 72 +-
.../main/resources/repository/CVSROOT/commitinfo | 48 +-
.../main/resources/repository/CVSROOT/commitinfo,v | 94 +-
.../src/main/resources/repository/CVSROOT/config | 74 +-
.../src/main/resources/repository/CVSROOT/config,v | 120 +-
.../main/resources/repository/CVSROOT/cvswrappers | 38 +-
.../resources/repository/CVSROOT/cvswrappers,v | 84 +-
.../src/main/resources/repository/CVSROOT/loginfo | 62 +-
.../main/resources/repository/CVSROOT/loginfo,v | 108 +-
.../src/main/resources/repository/CVSROOT/modules | 52 +-
.../main/resources/repository/CVSROOT/modules,v | 98 +-
.../src/main/resources/repository/CVSROOT/notify | 34 +-
.../src/main/resources/repository/CVSROOT/notify,v | 80 +-
.../src/main/resources/repository/CVSROOT/rcsinfo | 26 +-
.../main/resources/repository/CVSROOT/rcsinfo,v | 72 +-
.../src/main/resources/repository/CVSROOT/taginfo | 80 +-
.../main/resources/repository/CVSROOT/taginfo,v | 126 +-
.../src/main/resources/repository/CVSROOT/val-tags | 2 +-
.../main/resources/repository/CVSROOT/verifymsg | 58 +-
.../main/resources/repository/CVSROOT/verifymsg,v | 104 +-
.../repository/test-repo/checkout/Foo.java,v | 52 +-
.../repository/test-repo/checkout/Readme.txt,v | 48 +-
.../resources/tck-repository/CVSROOT/.cvsignore | 4 +-
.../maven-scm-providers-cvs/pom.xml | 2 +-
.../maven-scm-provider-git-commons/pom.xml | 2 +-
.../scm/provider/git/AbstractGitScmProvider.java | 2 +-
.../git/repository/GitScmProviderRepository.java | 25 +-
.../repository/GitScmProviderRepositoryTest.java | 83 +-
.../src/test/resources/git/diff/git-diff1.log | 12 +-
.../src/test/resources/git/diff/git-diff2.log | 32 +-
.../maven-scm-provider-gitexe/pom.xml | 2 +-
.../git/gitexe/command/add/GitAddCommand.java | 31 +-
.../gitexe/command/branch/GitBranchCommand.java | 2 +-
.../gitexe/command/checkin/GitCheckInCommand.java | 27 +-
.../gitexe/command/status/GitStatusCommand.java | 43 +-
.../gitexe/command/status/GitStatusConsumer.java | 161 +-
.../git/gitexe/command/tag/GitTagCommand.java | 2 +-
.../command/GitCommandLineUtilsAddTargetTest.java | 158 +-
.../command/changelog/GitChangeLogCommandTest.java | 26 +-
.../command/status/GitStatusConsumerTest.java | 68 +-
.../src/test/resources/repository/HEAD | 2 +-
.../src/test/resources/repository/config | 8 +-
.../src/test/resources/repository/description | 2 +-
.../src/test/resources/repository/info/exclude | 12 +-
.../test/resources/repository/refs/heads/master | 2 +-
.../maven-scm-provider-gittest/pom.xml | 2 +-
.../pom.xml | 40 +-
.../scm/provider/git/jgit/JGitScmProvider.java | 192 +++
.../scm/provider/git/jgit/command/JGitUtils.java | 432 +++++
.../git/jgit/command/add/JGitAddCommand.java | 85 +
.../git/jgit/command/blame/JGitBlameCommand.java | 81 +
.../git/jgit/command/branch/JGitBranchCommand.java | 147 ++
.../command/changelog/JGitChangeLogCommand.java | 292 ++++
.../jgit/command/checkin/JGitCheckInCommand.java | 135 ++
.../jgit/command/checkout/JGitCheckOutCommand.java | 193 +++
.../git/jgit/command/diff/JGitDiffCommand.java | 137 ++
.../git/jgit/command/list/JGitListCommand.java | 82 +
.../command/remoteinfo/JGitRemoteInfoCommand.java | 91 ++
.../git/jgit/command/status/JGitStatusCommand.java | 90 ++
.../git/jgit/command/tag/JGitTagCommand.java | 126 ++
.../src/site/markdown/index.md.vm | 122 ++
.../command/branch/JGitBranchCommandTckTest.java} | 31 +-
.../changelog/JGitChangeLogCommandTckTest.java} | 35 +-
.../checkin/JGitCheckInCommandTckTest.java} | 31 +-
.../checkout/JGitCheckOutCommandTckTest.java} | 32 +-
.../jgit/command/diff/JGitDiffCommandTckTest.java} | 32 +-
.../remoteinfo/JGitRemoteInfoCommandTckTest.java | 74 +
.../command/status/JGitStatusCommandTckTest.java} | 31 +-
.../jgit/command/tag/JGitTagCommandTckTest.java} | 33 +-
.../src/test/resources/repository/HEAD | 2 +-
.../src/test/resources/repository/config | 8 +-
.../src/test/resources/repository/description | 2 +-
.../test/resources/repository/hooks/applypatch-msg | 15 +
.../repository/hooks/applypatch-msg.sample | 15 +
.../src/test/resources/repository/hooks/commit-msg | 21 +
.../resources/repository/hooks/commit-msg.sample | 24 +
.../test/resources/repository/hooks/post-commit | 8 +
.../resources/repository/hooks/post-commit.sample | 8 +
.../test/resources/repository/hooks/post-receive | 16 +
.../resources/repository/hooks/post-receive.sample | 15 +
.../test/resources/repository/hooks/post-update | 8 +
.../resources/repository/hooks/post-update.sample | 8 +
.../test/resources/repository/hooks/pre-applypatch | 14 +
.../repository/hooks/pre-applypatch.sample | 14 +
.../src/test/resources/repository/hooks/pre-commit | 70 +
.../resources/repository/hooks/pre-commit.sample | 18 +
.../src/test/resources/repository/hooks/pre-rebase | 150 ++
.../resources/repository/hooks/pre-rebase.sample | 169 ++
.../repository/hooks/prepare-commit-msg.sample | 36 +
.../src/test/resources/repository/hooks/update | 78 +
.../test/resources/repository/hooks/update.sample | 107 ++
.../src/test/resources/repository/info/exclude | 12 +-
.../src/test/resources/repository/logs/HEAD | 3 +
.../resources/repository/logs/refs/heads/master | 3 +
.../repository/logs/refs/remotes/origin/master | 1 +
.../17/e953589369a48dcb0a0cbad084a76ef852cd11 | Bin 0 -> 37 bytes
.../1d/308c3b92eb0df9c0dc76436d50edfd0ca41d18 | Bin 0 -> 199 bytes
.../3b/459fa9451a94fc1acd10e2e29ab73d93eb816d | Bin 0 -> 75 bytes
.../3b/d305c57c635aead10cf59f7c1dc51af03edaf7 | Bin 0 -> 116 bytes
.../3c/f7bb86c15554148bf5b0b12bfd639e54a77e58 | Bin 0 -> 46 bytes
.../61/4a3fd04313593d67f4154855a06941046326b3 | Bin 0 -> 23 bytes
.../61/a0d22b023d6e31894d736cca8c1a47b6edd822 | Bin 0 -> 45 bytes
.../92/09a983605d6e43e5cf841a1ea18a1914bb7407 | Bin 0 -> 54 bytes
.../92/f139dfec4d1dfb79c3cd2f94e83bf13129668b | 1 +
.../94/d3d586e355f318d67e3da6bb16a91be7aad1a7 | Bin 0 -> 28 bytes
.../9e/131cfc732b0d9f42b9b712a528d0632d9bcca7 | Bin 0 -> 43 bytes
.../b5/3306f849b69ef0459ddf5cccff06b5fbb08c23 | Bin 0 -> 36 bytes
.../ba/a229a9193371fad604444f64c4f26f8ff702f3 | 1 +
.../ba/cd4ee105073117b30e5dcdba5150373b6b53c6 | Bin 0 -> 60 bytes
.../c3/8b0351660113545db270ba6918cc22a9eb17ce | Bin 0 -> 46 bytes
.../c5/1dcd33e7b71897603c203b5e0afc1d75f70051 | Bin 0 -> 147 bytes
.../dc/4204852765c12f398ef4a5fbcabf23cf17a183 | Bin 0 -> 116 bytes
.../f7/1429f9ff9214a546b438c611ae942c9cf5a49e | Bin 0 -> 46 bytes
.../fd/39fa3de0f63bc5c78eca219e74e0a8531bd3e6 | Bin 0 -> 24 bytes
.../fe/a16119a5b4ec0562d4f65b4237314250773bf8 | Bin 0 -> 27 bytes
.../test/resources/repository/refs/heads/master | 2 +-
.../resources/repository/refs/remotes/origin/HEAD | 1 +
.../repository/refs/remotes/origin/master | 1 +
.../maven-scm-providers-git/pom.xml | 4 +-
.../maven-scm-providers-standard/pom.xml | 2 +-
.../maven-scm-provider-svn-commons/pom.xml | 2 +-
.../maven-scm-provider-svnexe/pom.xml | 14 +-
.../scm/provider/svn/svnexe/SvnExeScmProvider.java | 9 +-
.../svn/svnexe/command/tag/SvnTagCommand.java | 24 +-
.../provider/svn/svnexe/SvnExeScmProviderTest.java | 78 +
.../command/checkout/SvnCheckOutConsumerTest.java | 88 +-
.../command/export/SvnExportCommandTest.java | 126 +-
.../svnexe/command/info/SvnInfoCommandTest.java | 106 +-
.../command/tag/SvnExeTagCommandTckTest.java | 16 +-
.../maven-scm-provider-svntest/pom.xml | 2 +-
.../maven-scm-providers-svn/pom.xml | 2 +-
maven-scm-providers/pom.xml | 2 +-
maven-scm-test/pom.xml | 2 +-
.../java/org/apache/maven/scm/ScmTestCase.java | 15 +-
.../tck/command/branch/BranchCommandTckTest.java | 2 +-
.../command/changelog/ChangeLogCommandTckTest.java | 22 +-
.../command/checkout/CheckOutCommandTckTest.java | 11 +-
.../scm/tck/command/tag/TagCommandTckTest.java | 2 +-
.../tck/command/update/UpdateCommandTckTest.java | 5 +-
pom.xml | 96 +-
src/main/assemblies/scm-source-release.xml | 85 +
src/site/apt/accurev.apt | 8 +-
src/site/apt/bazaar.apt | 10 +-
src/site/apt/clearcase.apt | 20 +-
src/site/apt/cvs.apt | 34 +-
src/site/apt/git.apt | 12 +-
src/site/apt/guide/define_provider.apt | 77 +
src/site/apt/index.apt | 12 +-
src/site/apt/jazz.apt | 126 +-
src/site/apt/local.apt | 6 +-
src/site/apt/mercurial.apt | 6 +-
src/site/apt/perforce.apt | 6 +-
src/site/apt/scm-url-format.apt | 4 +-
src/site/apt/scms-overview.apt | 16 +-
src/site/apt/starteam.apt | 6 +-
src/site/apt/subversion.apt | 6 +-
src/site/apt/synergy.apt | 6 +-
src/site/apt/tfs.apt | 8 +-
src/site/apt/vss.apt | 16 +-
329 files changed, 13132 insertions(+), 9341 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-scm.git
More information about the pkg-java-commits
mailing list