diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index a25214da7e..a804af1109 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -107,12 +107,6 @@
       <artifactId>mapstruct-jdk8</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct-processor</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <!-- event bus -->
     
     <dependency>
diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml
index e82eaddb9a..8cdbd877b6 100644
--- a/scm-plugins/pom.xml
+++ b/scm-plugins/pom.xml
@@ -38,7 +38,7 @@
       <scope>provided</scope>
     </dependency>
     
-    <!-- annotation processor -->
+    <!-- annotation processors -->
     
     <dependency>
       <groupId>sonia.scm</groupId>
@@ -46,6 +46,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- Annotation processor for DTO mappers-->
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct-processor</artifactId>
+      <scope>provided</scope>
+    </dependency>
     
     <!-- test scope -->
 
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 30944d49cc..a1ec0fe926 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -378,6 +378,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct-processor</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
   </dependencies>
 
   <build>