ongoing work on #34 #39

Spring-Framework-Java-Apps · Jul 16, 2018 · 41f3879 · 41f3879
1 parent fe40192
commit 41f3879
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 1 deletion.
diff --git a/defcon-heroku-jpa/pom.xml b/defcon-heroku-jpa/pom.xml
@@ -120,6 +120,10 @@
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-server</artifactId>

diff --git a/defcon-local-neo4j/pom.xml b/defcon-local-neo4j/pom.xml
@@ -37,10 +37,12 @@
         <!--
         TODO: #30
         -->
+        <!--
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
         </dependency>
+        -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-neo4j</artifactId>
@@ -105,6 +107,10 @@
             <groupId>io.pivotal.spring.cloud</groupId>
             <artifactId>spring-cloud-services-starter-service-registry</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
         <!-- Todo #25 -->
         <dependency>
             <groupId>org.apache.camel</groupId>

diff --git a/defcon-parent/pom.xml b/defcon-parent/pom.xml
@@ -84,7 +84,7 @@
         <thymeleaf-spring-data-dialect.version>3.3.1</thymeleaf-spring-data-dialect.version>
 
         <!-- Spring Data und Neo4J -->
-        <neo4j.version>3.1.1</neo4j.version>
+        <neo4j.version>3.1.9</neo4j.version>
         <neo4j-ogm.version>3.1.0</neo4j-ogm.version>
         <org.postgresql.version>42.2.2</org.postgresql.version>
 
@@ -283,6 +283,11 @@
                 <artifactId>maven-fluido-skin</artifactId>
                 <version>${maven-fluido-skin.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-logging</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -522,6 +527,65 @@
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.jbake</groupId>
+                        <artifactId>jbake-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>default-generate</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <seedUrl>https://github.com/phasenraum2010/jbake-example-project-thymeleaf/zipball/master/</seedUrl>
+                            <!--
+                            <inputDirectory>${project.basedir}/src/main/resources</inputDirectory>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                            -->
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.thymeleaf</groupId>
+                                <artifactId>thymeleaf</artifactId>
+                                <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>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/less</exclude>
+                                <exclude>**/*.less</exclude>
+                                <exclude>**/assets</exclude>
+                                <exclude>**/assets/**</exclude>
+                                <exclude>**/content</exclude>
+                                <exclude>**/content/**</exclude>
+                                <exclude>**/templates</exclude>
+                                <exclude>**/templates/**</exclude>
+                                <exclude>**/template-draft.html</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/run.sh b/run.sh
@@ -4,6 +4,11 @@ source defcon-parent/conf.sh
 
 export MVN_CMD='./mvnw'
 
+
+#mvn_jbake_help
+#run_jbake_seed
+#mvn_jbake_run
+
 #mvn_fast_build
 #mvn_build
 mvn_site