#4: Merge branch 'epub-and-html-generation-issue4' of https://github.…

…com/arturk88/oasp-docgen into arturk88-epub-and-html-generation-issue4 Conflicts: pom.xml
oasp · Nov 10, 2014 · fd882e6 · fd882e6
2 parents 12b1964 + 7152874
commit fd882e6
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <!-- Default values-->
+    <!-- Default values -->
     <oasp.repo>oasp4j</oasp.repo>
     <oasp.wiki.folder>${oasp.repo}.wiki</oasp.wiki.folder>
     <oasp.wiki.page>OASP4J</oasp.wiki.page>
@@ -25,7 +25,7 @@
   <build>
     <plugins>
       <!--
-      <plugin>
+        <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
@@ -91,7 +91,7 @@
         <artifactId>asciidoctor-maven-plugin</artifactId>
         <version>1.5.0</version>
         <configuration>
-          <!--<backend>pdf</backend>-->
+          <!--<backend>pdf</backend> -->
           <backend>docbook5</backend>
           <sourceDirectory>${oasp.asciidoc.target}</sourceDirectory>
           <sourceDocumentName>${oasp.wiki.page}.asciidoc</sourceDocumentName>
@@ -111,6 +111,7 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>com.agilejava.docbkx</groupId>
         <artifactId>docbkx-maven-plugin</artifactId>
@@ -149,21 +150,27 @@
             </goals>
             <phase>generate-resources</phase>
           </execution>
-          <!--
+          <execution>
+            <id>html</id>
+            <goals>
+              <goal>generate-html</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
           <execution>
             <id>epub</id>
             <goals>
               <goal>generate-epub</goal>
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-              <epubCustomization>${basedir}/src/main/docbook/xsl/epub.xsl</epubCustomization>
+
+              <targetDirectory>${basedir}/target/generated-docs/epub</targetDirectory>
+              <!-- <epubCustomization>${basedir}/src/main/docbook/xsl/epub.xsl</epubCustomization> -->
             </configuration>
           </execution>
-          -->
         </executions>
       </plugin>
-
     </plugins>
   </build>