From 62c20b071b06254117ad9774129e3639f26a2bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 7 Nov 2018 10:33:47 +0100 Subject: [PATCH] Fix reminders of dry run --- .../src/main/java/sonia/scm/repository/api/Command.java | 7 +------ .../scm/repository/spi/RepositoryServiceProvider.java | 8 -------- .../scm/repository/spi/GitRepositoryServiceProvider.java | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/api/Command.java b/scm-core/src/main/java/sonia/scm/repository/api/Command.java index 2987232ff2..fa09cea2cb 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/Command.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/Command.java @@ -71,10 +71,5 @@ public enum Command /** * @since 2.0 */ - MERGE, - - /** - * @since 2.0 - */ - MERGE_DRY_RUN + MERGE } diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java index 33dd137302..77201d1a72 100644 --- a/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java +++ b/scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java @@ -259,12 +259,4 @@ public abstract class RepositoryServiceProvider implements Closeable { throw new CommandNotSupportedException(Command.MERGE); } - - /** - * @since 2.0 - */ - public MergeDryRunCommand getMergeDryRunCommand() - { - throw new CommandNotSupportedException(Command.MERGE_DRY_RUN); - } } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java index 846c127c4c..a0a3074014 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java @@ -64,7 +64,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider Command.OUTGOING, Command.PUSH, Command.PULL, - Command.MERGE_DRY_RUN + Command.MERGE ); //J+