From de504e3d73bd14ed3bfe3f038bac04ae5e23dff7 Mon Sep 17 00:00:00 2001 From: Konrad Windszus Date: Thu, 20 Jul 2023 09:28:02 +0200 Subject: [PATCH] Revert "[SCM-1011] Consider interactive flag for SvnExeScmProvider" This reverts commit 882ae3119c88035adc50a0848858207c89b03c09. --- .../maven/scm/provider/ScmProvider.java | 4 +-- .../maven-scm-provider-svn-commons/pom.xml | 2 +- .../src/main/mdo/svn-settings.mdo | 2 +- .../svn/svnexe/SvnExeScmProvider.java | 13 ++------ .../svnexe/command/SvnCommandLineUtils.java | 16 +--------- .../command/checkin/SvnCheckInCommand.java | 14 +------- .../command/checkout/SvnCheckOutCommand.java | 32 ++----------------- .../command/update/SvnUpdateCommand.java | 14 ++------ .../checkin/SvnCheckInCommandTest.java | 4 +-- .../checkout/SvnCheckOutCommandTest.java | 2 +- .../command/update/SvnUpdateCommandTest.java | 2 +- 11 files changed, 17 insertions(+), 88 deletions(-) diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java index e9e26cff4..72593d5ef 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java @@ -70,9 +70,9 @@ ScmProviderRepository makeProviderScmRepository(File path) throws ScmRepositoryException, UnknownRepositoryStructure; /** - * Sets the interactive mode, which by default (i.e. if not called) is assumed to be true by providers. + * Sets the interactive mode. * - * @param interactive either {@code true} in case user may be prompted for information, otherwise {@code false}. + * @param interactive either {@code true} in case user may be prompted for information, otherwise {@code false} * @since 2.0.0-M2 */ default void setInteractive(boolean interactive) {} diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml index c0ac39883..03a286027 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml @@ -59,7 +59,7 @@ org.codehaus.modello modello-maven-plugin - 2.1.0 + 1.1.0 src/main/mdo/svn-settings.mdo diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo index 1ff2a151c..92f7e40cb 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo @@ -70,7 +70,7 @@ boolean true --non-interactive e.g. on Leopard (see SCM-402) when used with non-interactive SVN provider. + Switch off if you do not like to use --non-interactive e.g. on Leopard (see SCM-402). ]]> diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java index adb51e02e..f2b6d120e 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java @@ -56,13 +56,6 @@ @Singleton @Named("svn") public class SvnExeScmProvider extends AbstractSvnScmProvider { - private boolean interactive; - - @Override - public void setInteractive(boolean interactive) { - this.interactive = interactive; - } - /** * {@inheritDoc} */ @@ -92,7 +85,7 @@ protected SvnCommand getChangeLogCommand() { */ @Override protected SvnCommand getCheckInCommand() { - return new SvnCheckInCommand(interactive); + return new SvnCheckInCommand(); } /** @@ -100,7 +93,7 @@ protected SvnCommand getCheckInCommand() { */ @Override protected SvnCommand getCheckOutCommand() { - return new SvnCheckOutCommand(interactive); + return new SvnCheckOutCommand(); } /** @@ -156,7 +149,7 @@ protected SvnCommand getUntagCommand() { */ @Override protected SvnCommand getUpdateCommand() { - return new SvnUpdateCommand(interactive); + return new SvnUpdateCommand(); } /** diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java index b8addc007..cca583245 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java @@ -71,21 +71,7 @@ public static void addTarget(Commandline cl, List files) throws IOExceptio targets.deleteOnExit(); } - /** - * Shortcut for {@link #getBaseSvnCommandLine(File, SvnScmProviderRepository, boolean)} with the last argument being {@code false}. - * Although usually the interactive mode defaults to {@code true} the SVN provider always assumed non-interactive in the past. - * @param workingDirectory - * @param repository - * @return - * @deprecated Use {@link #getBaseSvnCommandLine(File, SvnScmProviderRepository, boolean)} instead - */ - @Deprecated public static Commandline getBaseSvnCommandLine(File workingDirectory, SvnScmProviderRepository repository) { - return getBaseSvnCommandLine(workingDirectory, repository, false); - } - - public static Commandline getBaseSvnCommandLine( - File workingDirectory, SvnScmProviderRepository repository, boolean interactive) { Commandline cl = new Commandline(); cl.setExecutable("svn"); @@ -126,7 +112,7 @@ public static Commandline getBaseSvnCommandLine( cl.createArg().setValue("--no-auth-cache"); } - if (!interactive && SvnUtil.getSettings().isUseNonInteractive()) { + if (SvnUtil.getSettings().isUseNonInteractive()) { cl.createArg().setValue("--non-interactive"); } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java index f177817a1..7f8ecdc45 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java @@ -43,12 +43,6 @@ * */ public class SvnCheckInCommand extends AbstractCheckInCommand implements SvnCommand { - private final boolean interactive; - - public SvnCheckInCommand(boolean interactive) { - this.interactive = interactive; - } - /** {@inheritDoc} */ protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message, ScmVersion version) throws ScmException { @@ -110,13 +104,7 @@ protected CheckInScmResult executeCheckInCommand( public static Commandline createCommandLine( SvnScmProviderRepository repository, ScmFileSet fileSet, File messageFile) throws ScmException { - return createCommandLine(repository, fileSet, messageFile, true); - } - - public static Commandline createCommandLine( - SvnScmProviderRepository repository, ScmFileSet fileSet, File messageFile, boolean interactive) - throws ScmException { - Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(fileSet.getBasedir(), repository, interactive); + Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(fileSet.getBasedir(), repository); cl.createArg().setValue("commit"); diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java index 79b9c1c99..6acd729ec 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java @@ -46,12 +46,6 @@ * */ public class SvnCheckOutCommand extends AbstractCheckOutCommand implements SvnCommand { - private final boolean interactive; - - public SvnCheckOutCommand(boolean interactive) { - this.interactive = interactive; - } - /** * {@inheritDoc} */ @@ -72,7 +66,7 @@ protected CheckOutScmResult executeCheckOutCommand( url = SvnCommandUtils.fixUrl(url, repository.getUser()); - Commandline cl = createCommandLine(repository, fileSet.getBasedir(), version, url, recursive, interactive); + Commandline cl = createCommandLine(repository, fileSet.getBasedir(), version, url, recursive); SvnCheckOutConsumer consumer = new SvnCheckOutConsumer(fileSet.getBasedir()); @@ -138,29 +132,7 @@ public static Commandline createCommandLine( ScmVersion version, String url, boolean recursive) { - return createCommandLine(repository, workingDirectory, version, url, recursive, true); - } - /** - * Create SVN check out command line. - * - * @param repository not null - * @param workingDirectory not null - * @param version not null - * @param url not null - * @param recursive true if recursive check out is wanted, false otherwise. - * @param interactive true if executed in interactive mode, false otherwise. - * @return the SVN command line for the SVN check out. - * @since 2.1.0 - */ - public static Commandline createCommandLine( - SvnScmProviderRepository repository, - File workingDirectory, - ScmVersion version, - String url, - boolean recursive, - boolean interactive) { - Commandline cl = - SvnCommandLineUtils.getBaseSvnCommandLine(workingDirectory.getParentFile(), repository, interactive); + Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(workingDirectory.getParentFile(), repository); cl.createArg().setValue("checkout"); diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java index 171a9cf8c..75286bd99 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java @@ -48,12 +48,6 @@ * */ public class SvnUpdateCommand extends AbstractUpdateCommand implements SvnCommand { - private final boolean interactive; - - public SvnUpdateCommand(boolean interactive) { - this.interactive = interactive; - } - /** {@inheritDoc} */ protected UpdateScmResult executeUpdateCommand(ScmProviderRepository repo, ScmFileSet fileSet, ScmVersion version) throws ScmException { @@ -98,13 +92,9 @@ protected UpdateScmResult executeUpdateCommand(ScmProviderRepository repo, ScmFi // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- - public static Commandline createCommandLine( - SvnScmProviderRepository repository, File workingDirectory, ScmVersion version) { - return createCommandLine(repository, workingDirectory, version, true); - } public static Commandline createCommandLine( - SvnScmProviderRepository repository, File workingDirectory, ScmVersion version, boolean interactive) { + SvnScmProviderRepository repository, File workingDirectory, ScmVersion version) { Settings settings = SvnUtil.getSettings(); String workingDir = workingDirectory.getAbsolutePath(); @@ -119,7 +109,7 @@ public static Commandline createCommandLine( version = null; } - Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(workingDirectory, repository, interactive); + Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(workingDirectory, repository); if (version == null || SvnTagBranchUtils.isRevisionSpecifier(version)) { cl.createArg().setValue("update"); diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java index af3908406..7e8b02e6a 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java @@ -100,8 +100,8 @@ private void testCommandLine(String scmUrl, String commandLine) throws Exception SvnScmProviderRepository svnRepository = (SvnScmProviderRepository) repository.getProviderRepository(); - Commandline cl = SvnCheckInCommand.createCommandLine( - svnRepository, new ScmFileSet(workingDirectory), messageFile, false); + Commandline cl = + SvnCheckInCommand.createCommandLine(svnRepository, new ScmFileSet(workingDirectory), messageFile); assertCommandLine(commandLine, workingDirectory, cl); } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java index 05600f4bc..8b9d1d176 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java @@ -108,7 +108,7 @@ private void testCommandLine(ScmManager scmManager, String scmUrl, String revisi SvnScmProviderRepository svnRepository = (SvnScmProviderRepository) repository.getProviderRepository(); Commandline cl = SvnCheckOutCommand.createCommandLine( - svnRepository, workingDirectory, new ScmRevision(revision), svnRepository.getUrl(), recursive, false); + svnRepository, workingDirectory, new ScmRevision(revision), svnRepository.getUrl(), recursive); assertCommandLine(commandLine, workingDirectory.getParentFile(), cl); } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java index 3646f4ba6..d9b87493b 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java @@ -197,7 +197,7 @@ private void testCommandLine(String scmUrl, ScmVersion version, String commandLi private void testCommandLine(String scmUrl, ScmVersion version, String commandLine, File workingDirectory) throws Exception { - Commandline cl = SvnUpdateCommand.createCommandLine(getSvnRepository(scmUrl), workingDirectory, version, false); + Commandline cl = SvnUpdateCommand.createCommandLine(getSvnRepository(scmUrl), workingDirectory, version); assertCommandLine(commandLine, workingDirectory, cl); }