You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/22 08:18:07 UTC
[maven-scm] branch SCM-980 updated (43b86b1b3 -> 828043a46)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-980
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
omit 43b86b1b3 [SCM-980] Remove code duplication in ListMojo
add fe474847b Style improvements
add dd090d830 [SCM-982] Upgrade to Java 8
add c534c1ce7 [SCM-979] Replace Plexus Container Default with Sisu Plexus Shim
add 1f6d1281a [SCM-983] Drop SCM Logger in favor of SLF4J
add c52b5d7c7 Ignore .factorypath
add bbd23dcfa [SCM-943] scm:check-local-modification does not support excludes
new 828043a46 [SCM-980] Remove code duplication in ListMojo
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 (43b86b1b3)
\
N -- N -- N refs/heads/SCM-980 (828043a46)
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.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 5 +-
maven-scm-api/pom.xml | 13 ++
.../apache/maven/scm/command/AbstractCommand.java | 17 +-
.../java/org/apache/maven/scm/command/Command.java | 11 -
.../java/org/apache/maven/scm/log/DefaultLog.java | 182 ---------------
.../org/apache/maven/scm/log/ScmLogDispatcher.java | 212 ------------------
.../java/org/apache/maven/scm/log/ScmLogger.java | 60 -----
.../maven/scm/manager/AbstractScmManager.java | 247 +++++++++++----------
.../apache/maven/scm/manager/BasicScmManager.java | 9 -
.../scm/manager/NoSuchScmProviderException.java | 7 +-
.../org/apache/maven/scm/manager/ScmManager.java | 2 -
.../maven/scm/provider/AbstractScmProvider.java | 116 +++++++---
.../org/apache/maven/scm/provider/ScmProvider.java | 11 -
.../apache/maven/scm/util/AbstractConsumer.java | 29 +--
maven-scm-client/pom.xml | 53 +++--
.../apache/maven/scm/client/cli/MavenScmCli.java | 43 +++-
.../main/resources/META-INF/plexus/components.xml | 56 -----
.../maven-scm-manager-plexus/pom.xml | 27 +--
.../scm/manager/plexus/DefaultScmManager.java | 86 ++-----
.../maven/scm/manager/plexus/PlexusLogger.java | 135 -----------
maven-scm-plugin/pom.xml | 45 +++-
.../apache/maven/scm/plugin/AbstractScmMojo.java | 34 ++-
.../scm/plugin/CheckLocalModificationsMojo.java | 21 +-
.../org/apache/maven/scm/plugin/DefaultLog.java | 133 -----------
.../main/resources/META-INF/plexus/components.xml | 45 ----
maven-scm-providers/maven-scm-provider-hg/pom.xml | 43 ++--
.../org/apache/maven/scm/provider/hg/HgConfig.java | 8 +-
.../maven/scm/provider/hg/HgScmProvider.java | 36 +--
.../org/apache/maven/scm/provider/hg/HgUtils.java | 57 ++---
.../maven/scm/provider/hg/command/HgConsumer.java | 30 +--
.../scm/provider/hg/command/add/HgAddCommand.java | 4 +-
.../scm/provider/hg/command/add/HgAddConsumer.java | 12 +-
.../provider/hg/command/blame/HgBlameCommand.java | 4 +-
.../provider/hg/command/blame/HgBlameConsumer.java | 9 +-
.../hg/command/branch/HgBranchCommand.java | 12 +-
.../hg/command/changelog/HgChangeLogCommand.java | 8 +-
.../hg/command/changelog/HgChangeLogConsumer.java | 4 +-
.../hg/command/checkin/HgCheckInCommand.java | 9 +-
.../hg/command/checkout/HgCheckOutCommand.java | 12 +-
.../hg/command/checkout/HgCheckOutConsumer.java | 4 +-
.../provider/hg/command/diff/HgDiffCommand.java | 4 +-
.../provider/hg/command/diff/HgDiffConsumer.java | 15 +-
.../provider/hg/command/info/HgInfoCommand.java | 4 +-
.../provider/hg/command/info/HgInfoConsumer.java | 8 +-
.../hg/command/inventory/HgListCommand.java | 4 +-
.../hg/command/inventory/HgListConsumer.java | 8 +-
.../hg/command/inventory/HgOutgoingConsumer.java | 6 -
.../hg/command/remove/HgRemoveCommand.java | 4 +-
.../hg/command/remove/HgRemoveConsumer.java | 12 +-
.../hg/command/status/HgStatusCommand.java | 4 +-
.../hg/command/status/HgStatusConsumer.java | 16 +-
.../scm/provider/hg/command/tag/HgTagCommand.java | 14 +-
.../scm/provider/hg/command/tag/HgTagConsumer.java | 6 -
.../hg/command/update/HgUpdateCommand.java | 21 +-
.../hg/repository/HgScmProviderRepository.java | 12 +-
.../maven-scm-provider-local/pom.xml | 28 +--
.../maven/scm/provider/local/LocalScmProvider.java | 36 ++-
.../command/changelog/LocalChangeLogCommand.java | 6 +-
.../local/command/checkin/LocalCheckInCommand.java | 19 +-
.../command/checkout/LocalCheckOutCommand.java | 12 +-
.../local/command/list/LocalListCommand.java | 14 +-
.../local/command/mkdir/LocalMkdirCommand.java | 11 +-
.../local/command/status/LocalStatusCommand.java | 3 +-
.../local/command/tag/LocalTagCommand.java | 5 +-
.../local/command/update/LocalUpdateCommand.java | 9 +-
.../local/metadata/LocalScmMetadataUtils.java | 18 +-
.../maven-scm-provider-git-commons/pom.xml | 21 ++
.../scm/provider/git/AbstractGitScmProvider.java | 6 +-
.../scm/provider/git/GitConfigFileReader.java | 23 +-
.../provider/git/command/diff/GitDiffConsumer.java | 17 +-
.../maven/scm/provider/git/TestGitScmProvider.java | 5 +
.../git/command/diff/GitDiffConsumerTest.java | 7 +-
.../test/resources/META-INF/plexus/components.xml | 28 ---
.../maven-scm-provider-gitexe/pom.xml | 39 ++--
.../scm/provider/git/gitexe/GitExeScmProvider.java | 7 +-
.../command/AbstractFileCheckingConsumer.java | 12 +-
.../git/gitexe/command/GitCommandLineUtils.java | 21 +-
.../git/gitexe/command/add/GitAddCommand.java | 14 +-
.../git/gitexe/command/blame/GitBlameCommand.java | 4 +-
.../git/gitexe/command/blame/GitBlameConsumer.java | 14 +-
.../gitexe/command/branch/GitBranchCommand.java | 15 +-
.../command/branch/GitCurrentBranchConsumer.java | 9 -
.../command/changelog/GitChangeLogCommand.java | 4 +-
.../command/changelog/GitChangeLogConsumer.java | 9 +-
.../gitexe/command/checkin/GitCheckInCommand.java | 27 ++-
.../command/checkout/GitCheckOutCommand.java | 12 +-
.../git/gitexe/command/diff/GitDiffCommand.java | 6 +-
.../gitexe/command/diff/GitDiffRawConsumer.java | 18 +-
.../git/gitexe/command/info/GitInfoCommand.java | 4 +-
.../git/gitexe/command/info/GitInfoConsumer.java | 13 +-
.../git/gitexe/command/list/GitListConsumer.java | 8 +-
.../command/remoteinfo/GitRemoteInfoCommand.java | 6 +-
.../command/remoteinfo/GitRemoteInfoConsumer.java | 14 +-
.../gitexe/command/remove/GitRemoveCommand.java | 4 +-
.../gitexe/command/remove/GitRemoveConsumer.java | 18 +-
.../gitexe/command/status/GitStatusCommand.java | 22 +-
.../gitexe/command/status/GitStatusConsumer.java | 30 +--
.../git/gitexe/command/tag/GitTagCommand.java | 8 +-
.../git/gitexe/command/untag/GitUntagCommand.java | 4 +-
.../update/GitLatestRevisionCommandConsumer.java | 10 +-
.../gitexe/command/update/GitUpdateCommand.java | 19 +-
.../gitexe/command/blame/GitBlameConsumerTest.java | 3 +-
.../changelog/GitChangeLogConsumerTest.java | 5 +-
.../command/diff/GitDiffRawConsumerTest.java | 3 +-
.../remoteinfo/GitRemoteInfoConsumerTest.java | 3 +-
.../command/remove/GitRemoveConsumerTest.java | 8 +-
.../command/status/GitStatusConsumerTest.java | 9 +-
.../GitLatestRevisionCommandConsumerTest.java | 3 +-
.../maven-scm-provider-gittest/pom.xml | 17 ++
.../maven-scm-provider-jgit/pom.xml | 48 ++--
.../scm/provider/git/jgit/JGitScmProvider.java | 25 ++-
.../jgit/command/JGitTransportConfigCallback.java | 4 +-
.../scm/provider/git/jgit/command/JGitUtils.java | 30 +--
.../git/jgit/command/add/JGitAddCommand.java | 4 +-
.../git/jgit/command/branch/JGitBranchCommand.java | 14 +-
.../command/changelog/JGitChangeLogCommand.java | 4 +-
.../jgit/command/checkin/JGitCheckInCommand.java | 16 +-
.../jgit/command/checkout/JGitCheckOutCommand.java | 28 +--
.../git/jgit/command/diff/JGitDiffCommand.java | 2 +-
.../git/jgit/command/list/JGitListCommand.java | 8 +-
.../command/remoteinfo/JGitRemoteInfoCommand.java | 6 +-
.../git/jgit/command/status/JGitStatusCommand.java | 2 +-
.../git/jgit/command/tag/JGitTagCommand.java | 6 +-
.../git/jgit/command/untag/JGitUntagCommand.java | 6 +-
.../maven-scm-provider-svn-commons/pom.xml | 16 ++
.../scm/provider/svn/AbstractSvnScmProvider.java | 14 +-
.../provider/svn/command/diff/SvnDiffConsumer.java | 17 +-
.../maven/scm/provider/svn/TestSvnScmProvider.java | 5 +
.../test/resources/META-INF/plexus/components.xml | 28 ---
.../maven-scm-provider-svnexe/pom.xml | 39 ++--
.../scm/provider/svn/svnexe/SvnExeScmProvider.java | 26 ++-
.../command/AbstractFileCheckingConsumer.java | 12 +-
.../svn/svnexe/command/SvnCommandLineUtils.java | 44 ++--
.../svn/svnexe/command/add/SvnAddCommand.java | 10 +-
.../svn/svnexe/command/add/SvnAddConsumer.java | 18 +-
.../svn/svnexe/command/blame/SvnBlameCommand.java | 10 +-
.../svn/svnexe/command/blame/SvnBlameConsumer.java | 15 +-
.../svnexe/command/branch/SvnBranchCommand.java | 10 +-
.../command/changelog/SvnChangeLogCommand.java | 10 +-
.../command/changelog/SvnChangeLogConsumer.java | 15 +-
.../svnexe/command/checkin/SvnCheckInCommand.java | 10 +-
.../svnexe/command/checkin/SvnCheckInConsumer.java | 5 +-
.../command/checkout/SvnCheckOutCommand.java | 10 +-
.../command/checkout/SvnCheckOutConsumer.java | 9 +-
.../svn/svnexe/command/diff/SvnDiffCommand.java | 10 +-
.../svnexe/command/export/SvnExeExportCommand.java | 10 +-
.../svn/svnexe/command/info/SvnInfoCommand.java | 8 +-
.../svn/svnexe/command/info/SvnInfoConsumer.java | 6 +-
.../svn/svnexe/command/list/SvnListCommand.java | 8 +-
.../svn/svnexe/command/list/SvnListConsumer.java | 6 +-
.../svn/svnexe/command/mkdir/SvnMkdirCommand.java | 10 +-
.../svn/svnexe/command/mkdir/SvnMkdirConsumer.java | 16 +-
.../command/remoteinfo/SvnRemoteInfoCommand.java | 22 +-
.../svnexe/command/remove/SvnRemoveCommand.java | 10 +-
.../svnexe/command/remove/SvnRemoveConsumer.java | 18 +-
.../svnexe/command/status/SvnStatusCommand.java | 10 +-
.../svnexe/command/status/SvnStatusConsumer.java | 15 +-
.../svn/svnexe/command/tag/SvnTagCommand.java | 14 +-
.../svn/svnexe/command/untag/SvnUntagCommand.java | 8 +-
.../svnexe/command/update/SvnUpdateCommand.java | 20 +-
.../svnexe/command/update/SvnUpdateConsumer.java | 7 +-
.../provider/svn/svnexe/SvnExeScmProviderTest.java | 10 +-
.../changelog/SvnChangeLogConsumerTest.java | 12 +-
.../command/checkout/SvnCheckOutConsumerTest.java | 3 +-
.../maven-scm-provider-svntest/pom.xml | 8 +
maven-scm-test/pom.xml | 36 ++-
.../java/org/apache/maven/scm/ScmTestCase.java | 31 +--
.../apache/maven/scm/provider/ScmProviderStub.java | 11 -
.../maven/scm/manager/ScmManagerStubTest.java | 2 +-
pom.xml | 98 ++++----
src/site/apt/guide/new_provider.apt | 26 ++-
171 files changed, 1338 insertions(+), 2302 deletions(-)
delete mode 100644 maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java
delete mode 100644 maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java
delete mode 100644 maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogger.java
delete mode 100644 maven-scm-client/src/main/resources/META-INF/plexus/components.xml
delete mode 100644 maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/PlexusLogger.java
delete mode 100644 maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DefaultLog.java
delete mode 100644 maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
delete mode 100644 maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/resources/META-INF/plexus/components.xml
delete mode 100644 maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/resources/META-INF/plexus/components.xml
[maven-scm] 01/01: [SCM-980] Remove code duplication in ListMojo
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-980
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 828043a46886a2101aba297cee95dd694497cd37
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu May 19 22:04:38 2022 +0200
[SCM-980] Remove code duplication in ListMojo
This closes #138
---
.../main/java/org/apache/maven/scm/plugin/ListMojo.java | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
index 2d8c9ac86..d933e78f3 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
@@ -19,7 +19,6 @@ package org.apache.maven.scm.plugin;
* under the License.
*/
-import java.io.File;
import java.io.IOException;
import org.apache.maven.plugin.MojoExecutionException;
@@ -27,7 +26,6 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.list.ListScmResult;
import org.apache.maven.scm.repository.ScmRepository;
@@ -86,18 +84,5 @@ public class ListMojo
}
}
- public ScmFileSet getFileSet()
- throws IOException
- {
- if ( getIncludes() != null || getExcludes() != null )
- {
- return new ScmFileSet( getWorkingDirectory(), getIncludes(), getExcludes() );
- }
- else
- {
- return new ScmFileSet( getWorkingDirectory(), new File( "." ) );
- }
- }
-
}