From 9c2265e9567ac1c73f6afae15384fec7b2b9862f Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 10 May 2017 09:37:31 +0200
Subject: [PATCH] fix conflict between rest- and apidocs

---
 scm-webapp/pom.xml                   | 1 +
 scm-webapp/src/main/doc/assembly.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index fbc35f3cbd..e1ee2a75ea 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -865,6 +865,7 @@
             <configuration>
               <configFile>${project.build.directory}/enunciate.xml</configFile>
               <docsDir>${project.build.directory}</docsDir>
+              <docsSubdir>restdocs</docsSubdir>
             </configuration>
             <dependencies>
               <dependency>
diff --git a/scm-webapp/src/main/doc/assembly.xml b/scm-webapp/src/main/doc/assembly.xml
index 9b1a1af5de..93c3f88ba0 100644
--- a/scm-webapp/src/main/doc/assembly.xml
+++ b/scm-webapp/src/main/doc/assembly.xml
@@ -46,7 +46,7 @@
   <fileSets>
 
     <fileSet>
-      <directory>target/apidocs</directory>
+      <directory>target/restdocs</directory>
       <filtered>false</filtered>
       <outputDirectory>.</outputDirectory>
       <directoryMode>0755</directoryMode>