ongoing work on #34 #39

Spring-Framework-Java-Apps · Jul 15, 2018 · 2049689 · 2049689
1 parent caa2418
commit 2049689
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/defcon-documentation/pom.xml b/defcon-documentation/pom.xml
@@ -42,17 +42,25 @@
                             -->
                         </configuration>
                         <dependencies>
-                            <!--
-                            <dependency>
-                                <groupId>org.freemarker</groupId>
-                                <artifactId>freemarker</artifactId>
-                                <version>2.3.20</version>
-                            </dependency>
-                            -->
                             <dependency>
                                 <groupId>org.thymeleaf</groupId>
                                 <artifactId>thymeleaf</artifactId>
-                                <version>3.0.9.RELEASE</version>
+                                <version>${thymeleaf.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.asciidoctor</groupId>
+                                <artifactId>asciidoctorj</artifactId>
+                                <version>${asciidoctorj.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.vladsch.flexmark</groupId>
+                                <artifactId>flexmark-all</artifactId>
+                                <version>${flexmark-all.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.apache.maven.doxia</groupId>
+                                <artifactId>doxia-module-markdown</artifactId>
+                                <version>${doxia-module-markdown.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>

diff --git a/defcon-documentation/run.sh b/defcon-documentation/run.sh
@@ -4,8 +4,8 @@ source ../defcon-parent/conf.sh
 
 #mvn_jbake_help
 
-run_jbake_seed
+#run_jbake_seed
 
-#mvn_jbake_run
+mvn_jbake_run
 
 exit 0
diff --git a/defcon-parent/pom.xml b/defcon-parent/pom.xml
@@ -75,6 +75,12 @@
 
         <aspectj.version>1.8.9</aspectj.version>
 
+        <!-- jbake -->
+        <asciidoctorj.version>1.5.6</asciidoctorj.version>
+        <doxia-module-markdown.version>1.8</doxia-module-markdown.version>
+        <flexmark-all.version>0.34.8</flexmark-all.version>
+        <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
+
         <!-- file encoding -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/run.sh b/run.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+source defcon-parent/conf.sh
+
+#mvn_fast_build
+mvn_build
+
+exit 0