From db46441adf9707715c08f96c32b1856823c8efbf Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Tue, 5 Nov 2019 09:51:58 +0100
Subject: [PATCH] move mergeResultDto + mapper to scm-core

---
 scm-core/pom.xml                                            | 6 ++++++
 .../java/sonia/scm/api/v2/resources/MergeResultDto.java     | 0
 .../sonia/scm/api/v2/resources/MergeResultToDtoMapper.java  | 0
 3 files changed, 6 insertions(+)
 rename {scm-webapp => scm-core}/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java (100%)
 rename {scm-webapp => scm-core}/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java (100%)

diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index f19d50064d..c7bbc664c9 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -131,6 +131,12 @@
       <artifactId>mapstruct-jdk8</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct-processor</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- rest documentation -->
     <dependency>
       <groupId>com.webcohesion.enunciate</groupId>
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
rename to scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultDto.java
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
similarity index 100%
rename from scm-webapp/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java
rename to scm-core/src/main/java/sonia/scm/api/v2/resources/MergeResultToDtoMapper.java