[maven-scm] 23/34: Merge tag 'upstream/1.9.5'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 26 13:31:16 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 e9ca45d349b8742612812d9b5d52d16e852d9d60
Merge: b91b3ab ed4848c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 13:11:18 2017 +0200

    Merge tag 'upstream/1.9.5'
    
    Upstream version 1.9.5

 .travis.yml                                        |   20 +
 README.txt                                         |    2 +-
 maven-scm-api/pom.xml                              |    2 +-
 .../main/java/org/apache/maven/scm/ScmResult.java  |   30 +-
 .../maven/scm/provider/ScmProviderRepository.java  |   46 +
 .../java/org/apache/maven/scm/ScmResultTest.java   |   43 +
 maven-scm-client/pom.xml                           |    2 +-
 .../maven-scm-manager-plexus/pom.xml               |    2 +-
 maven-scm-managers/pom.xml                         |    2 +-
 maven-scm-plugin/pom.xml                           |    6 +-
 .../dotSvnDir/.gitattributes                       |    2 +
 .../prepare.groovy                                 |    4 +
 .../src/it/scm-781/.svn/dotSvnDir/all-wcprops      |    5 +
 .../src/it/scm-781/.svn/dotSvnDir/entries          |   42 +
 .../src/it/scm-781/asf/.svn/all-wcprops            |   17 +
 .../src/it/scm-781/asf/.svn/dir-prop-base          |   13 +
 maven-scm-plugin/src/it/scm-781/asf/.svn/entries   |  107 ++
 .../it/scm-781/asf/.svn/prop-base/pom.xml.svn-base |    9 +
 .../asf/.svn/prop-base/site-pom.xml.svn-base       |   13 +
 .../it/scm-781/asf/.svn/text-base/pom.xml.svn-base |  411 +++++++
 .../asf/.svn/text-base/site-pom.xml.svn-base       |   85 ++
 maven-scm-plugin/src/it/scm-781/asf/pom.xml        |   37 +
 .../src/it/scm-781/asf/src/.svn/all-wcprops        |    5 +
 .../src/it/scm-781/asf/src/.svn/entries            |   36 +
 maven-scm-plugin/src/it/scm-781/invoker.properties |   35 +
 .../src/it/scm-781/maven/.svn/all-wcprops          |   17 +
 .../src/it/scm-781/maven/.svn/dir-prop-base        |   13 +
 maven-scm-plugin/src/it/scm-781/maven/.svn/entries |  107 ++
 .../scm-781/maven/.svn/prop-base/pom.xml.svn-base  |    9 +
 .../maven/.svn/prop-base/site-pom.xml.svn-base     |   13 +
 .../scm-781/maven/.svn/text-base/pom.xml.svn-base  | 1172 ++++++++++++++++++++
 .../maven/.svn/text-base/site-pom.xml.svn-base     |   81 ++
 maven-scm-plugin/src/it/scm-781/maven/pom.xml      |   37 +
 maven-scm-plugin/src/it/scm-781/maven/site-pom.xml |   81 ++
 .../src/it/scm-781/maven/src/.svn/all-wcprops      |    5 +
 .../src/it/scm-781/maven/src/.svn/entries          |   36 +
 maven-scm-plugin/src/it/scm-781/pom.xml            |   69 ++
 .../prepare.groovy                                 |   11 +
 maven-scm-plugin/src/it/scm-781/verify.groovy      |   20 +
 .../apache/maven/scm/plugin/AbstractScmMojo.java   |   14 +
 .../org/apache/maven/scm/plugin/BootstrapMojo.java |   25 +-
 .../org/apache/maven/scm/plugin/ValidateMojo.java  |   19 +-
 .../maven/scm/plugin/ValidateRecursively.java      |   35 +
 .../apt/examples/bootstrapping-with-pom.apt.vm     |    6 +
 .../maven-scm-provider-accurev/pom.xml             |    2 +-
 .../maven-scm-provider-bazaar/pom.xml              |    2 +-
 .../maven-scm-provider-clearcase/pom.xml           |    2 +-
 maven-scm-providers/maven-scm-provider-hg/pom.xml  |    2 +-
 .../org/apache/maven/scm/provider/hg/HgUtils.java  |   33 +-
 .../hg/command/inventory/HgOutgoingConsumer.java   |    4 +-
 .../maven-scm-provider-integrity/pom.xml           |    2 +-
 .../command/blame/IntegrityBlameCommand.java       |   69 +-
 .../maven-scm-provider-jazz/pom.xml                |   52 +-
 .../maven/scm/provider/jazz/JazzScmProvider.java   |   18 +-
 .../scm/provider/jazz/command/JazzConstants.java   |   21 +
 .../scm/provider/jazz/command/JazzScmCommand.java  |   11 +-
 .../provider/jazz/command/add/JazzAddCommand.java  |    2 +-
 .../jazz/command/blame/JazzBlameCommand.java       |    2 +-
 .../command/changelog/JazzChangeLogCommand.java    |    4 +-
 .../jazz/command/checkin/JazzCheckInCommand.java   |   56 +-
 .../jazz/command/checkout/JazzCheckOutCommand.java |    2 +-
 .../jazz/command/diff/JazzDiffCommand.java         |    2 +-
 .../jazz/command/edit/JazzEditCommand.java         |    2 +-
 .../jazz/command/list/JazzListCommand.java         |    9 +-
 .../jazz/command/status/JazzStatusCommand.java     |    2 +-
 .../jazz/command/status/JazzStatusConsumer.java    |  243 +++-
 .../provider/jazz/command/tag/JazzTagCommand.java  |    8 +-
 .../jazz/command/unedit/JazzUnEditCommand.java     |    2 +-
 .../jazz/command/update/JazzUpdateCommand.java     |    9 +-
 .../jazz/repository/JazzScmProviderRepository.java |   48 +-
 .../provider/jazz/command/JazzScmCommandTest.java  |   29 +-
 .../scm/provider/jazz/command/JazzTckUtil.java     |    2 +-
 .../command/checkin/JazzCheckInCommandTest.java    |   15 +
 .../jazz/command/list/JazzListCommandTest.java     |    2 +-
 .../jazz/command/status/JazzStatusCommandTest.java |  354 ++++++
 .../maven-scm-provider-local/pom.xml               |    2 +-
 .../maven-scm-provider-perforce/pom.xml            |    2 +-
 .../maven-scm-provider-starteam/pom.xml            |    2 +-
 .../maven-scm-provider-synergy/pom.xml             |    2 +-
 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 +-
 .../maven-scm-provider-cvsexe/pom.xml              |    2 +-
 .../maven-scm-provider-cvsjava/pom.xml             |    4 +-
 .../maven-scm-provider-cvstest/pom.xml             |    2 +-
 .../maven-scm-providers-cvs/pom.xml                |    2 +-
 .../maven-scm-provider-git-commons/pom.xml         |    4 +-
 .../maven/scm/provider/git/GitCommandUtils.java    |    2 +-
 .../git/repository/GitScmProviderRepository.java   |    3 +-
 .../src/main/mdo/git-settings.mdo                  |    9 +
 .../repository/GitScmProviderRepositoryTest.java   |   10 +
 .../maven-scm-provider-gitexe/pom.xml              |    2 +-
 .../git/gitexe/command/GitCommandLineUtils.java    |    6 +-
 .../gitexe/command/status/GitStatusConsumer.java   |  120 +-
 .../command/status/GitStatusConsumerTest.java      |  187 +++-
 .../test/resources/git/status/gitstatus1.gitlog    |    2 +
 .../maven-scm-provider-gittest/pom.xml             |    2 +-
 .../maven-scm-provider-jgit/pom.xml                |    5 +-
 .../scm/provider/git/jgit/JGitScmProvider.java     |    3 +-
 .../scm/provider/git/jgit/command/JGitUtils.java   |   25 +
 .../git/jgit/command/add/JGitAddCommand.java       |    2 +-
 .../git/jgit/command/blame/JGitBlameCommand.java   |    2 +-
 .../git/jgit/command/branch/JGitBranchCommand.java |    2 +-
 .../command/changelog/JGitChangeLogCommand.java    |    2 +-
 .../jgit/command/checkin/JGitCheckInCommand.java   |    2 +-
 .../jgit/command/checkout/JGitCheckOutCommand.java |    1 +
 .../git/jgit/command/diff/JGitDiffCommand.java     |    2 +-
 .../JGitInfoCommand.java}                          |   60 +-
 .../git/jgit/command/list/JGitListCommand.java     |    2 +-
 .../command/remoteinfo/JGitRemoteInfoCommand.java  |    2 +-
 .../git/jgit/command/status/JGitStatusCommand.java |    2 +-
 .../git/jgit/command/tag/JGitTagCommand.java       |    2 +-
 .../JGitCheckInCommandCommitterAuthorTckTest.java  |   76 ++
 .../maven-scm-providers-git/pom.xml                |    2 +-
 .../maven-scm-providers-standard/pom.xml           |    9 +-
 .../maven-scm-provider-svn-commons/pom.xml         |    2 +-
 .../scm/provider/svn/AbstractSvnScmProvider.java   |    9 +-
 .../maven-scm-provider-svnexe/pom.xml              |    2 +-
 .../svn/svnexe/command/SvnCommandLineUtils.java    |    6 +-
 .../svn/svnexe/command/add/SvnAddCommand.java      |    7 +-
 .../svn/svnexe/command/blame/SvnBlameCommand.java  |    7 +-
 .../svnexe/command/branch/SvnBranchCommand.java    |   11 +-
 .../command/changelog/SvnChangeLogCommand.java     |    7 +-
 .../command/changelog/SvnChangeLogConsumer.java    |    5 +-
 .../svnexe/command/checkin/SvnCheckInCommand.java  |    7 +-
 .../command/checkout/SvnCheckOutCommand.java       |    7 +-
 .../svn/svnexe/command/diff/SvnDiffCommand.java    |    7 +-
 .../svnexe/command/export/SvnExeExportCommand.java |    4 +-
 .../svn/svnexe/command/info/SvnInfoCommand.java    |    7 +-
 .../svn/svnexe/command/list/SvnListCommand.java    |    7 +-
 .../svn/svnexe/command/mkdir/SvnMkdirCommand.java  |    6 +-
 .../svnexe/command/remove/SvnRemoveCommand.java    |    7 +-
 .../svnexe/command/status/SvnStatusCommand.java    |    7 +-
 .../svn/svnexe/command/tag/SvnTagCommand.java      |    7 +-
 .../svnexe/command/update/SvnUpdateCommand.java    |    7 +-
 .../command/branch/SvnExeBranchCommandTckTest.java |    8 +-
 .../maven-scm-provider-svntest/pom.xml             |    2 +-
 .../src/main/resources/tck/.gitattributes          |    3 +
 .../maven-scm-providers-svn/pom.xml                |    2 +-
 maven-scm-providers/pom.xml                        |    2 +-
 maven-scm-test/pom.xml                             |    2 +-
 pom.xml                                            |  101 +-
 src/site/apt/scm-url-format.apt                    |    8 +-
 src/site/site.xml                                  |   16 -
 144 files changed, 4367 insertions(+), 235 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