Skip to content

Commit 41f3879

Browse files
author
phasenraum2010
committed
ongoing work on #34 #39
1 parent fe40192 commit 41f3879

File tree

4 files changed

+80
-1
lines changed

4 files changed

+80
-1
lines changed

defcon-heroku-jpa/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@
120120
<groupId>de.codecentric</groupId>
121121
<artifactId>spring-boot-admin-starter-client</artifactId>
122122
</dependency>
123+
<dependency>
124+
<groupId>org.springframework.boot</groupId>
125+
<artifactId>spring-boot-starter-logging</artifactId>
126+
</dependency>
123127
<dependency>
124128
<groupId>de.codecentric</groupId>
125129
<artifactId>spring-boot-admin-starter-server</artifactId>

defcon-local-neo4j/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@
3737
<!--
3838
TODO: #30
3939
-->
40+
<!--
4041
<dependency>
4142
<groupId>org.springframework.boot</groupId>
4243
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
4344
</dependency>
45+
-->
4446
<dependency>
4547
<groupId>org.springframework.boot</groupId>
4648
<artifactId>spring-boot-starter-data-neo4j</artifactId>
@@ -105,6 +107,10 @@
105107
<groupId>io.pivotal.spring.cloud</groupId>
106108
<artifactId>spring-cloud-services-starter-service-registry</artifactId>
107109
</dependency>
110+
<dependency>
111+
<groupId>org.springframework.boot</groupId>
112+
<artifactId>spring-boot-starter-logging</artifactId>
113+
</dependency>
108114
<!-- Todo #25 -->
109115
<dependency>
110116
<groupId>org.apache.camel</groupId>

defcon-parent/pom.xml

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<thymeleaf-spring-data-dialect.version>3.3.1</thymeleaf-spring-data-dialect.version>
8585

8686
<!-- Spring Data und Neo4J -->
87-
<neo4j.version>3.1.1</neo4j.version>
87+
<neo4j.version>3.1.9</neo4j.version>
8888
<neo4j-ogm.version>3.1.0</neo4j-ogm.version>
8989
<org.postgresql.version>42.2.2</org.postgresql.version>
9090

@@ -283,6 +283,11 @@
283283
<artifactId>maven-fluido-skin</artifactId>
284284
<version>${maven-fluido-skin.version}</version>
285285
</dependency>
286+
<dependency>
287+
<groupId>org.springframework.boot</groupId>
288+
<artifactId>spring-boot-starter-logging</artifactId>
289+
<version>${spring-boot.version}</version>
290+
</dependency>
286291
</dependencies>
287292
</dependencyManagement>
288293

@@ -522,6 +527,65 @@
522527
</activation>
523528
<build>
524529
<plugins>
530+
<plugin>
531+
<groupId>org.jbake</groupId>
532+
<artifactId>jbake-maven-plugin</artifactId>
533+
<executions>
534+
<execution>
535+
<id>default-generate</id>
536+
<phase>generate-resources</phase>
537+
<goals>
538+
<goal>generate</goal>
539+
</goals>
540+
</execution>
541+
</executions>
542+
<configuration>
543+
<seedUrl>https://github.com/phasenraum2010/jbake-example-project-thymeleaf/zipball/master/</seedUrl>
544+
<!--
545+
<inputDirectory>${project.basedir}/src/main/resources</inputDirectory>
546+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
547+
-->
548+
</configuration>
549+
<dependencies>
550+
<dependency>
551+
<groupId>org.thymeleaf</groupId>
552+
<artifactId>thymeleaf</artifactId>
553+
<version>${thymeleaf.version}</version>
554+
</dependency>
555+
<dependency>
556+
<groupId>org.asciidoctor</groupId>
557+
<artifactId>asciidoctorj</artifactId>
558+
<version>${asciidoctorj.version}</version>
559+
</dependency>
560+
<dependency>
561+
<groupId>com.vladsch.flexmark</groupId>
562+
<artifactId>flexmark-all</artifactId>
563+
<version>${flexmark-all.version}</version>
564+
</dependency>
565+
<dependency>
566+
<groupId>org.apache.maven.doxia</groupId>
567+
<artifactId>doxia-module-markdown</artifactId>
568+
<version>${doxia-module-markdown.version}</version>
569+
</dependency>
570+
</dependencies>
571+
</plugin>
572+
<plugin>
573+
<groupId>org.apache.maven.plugins</groupId>
574+
<artifactId>maven-jar-plugin</artifactId>
575+
<configuration>
576+
<excludes>
577+
<exclude>**/less</exclude>
578+
<exclude>**/*.less</exclude>
579+
<exclude>**/assets</exclude>
580+
<exclude>**/assets/**</exclude>
581+
<exclude>**/content</exclude>
582+
<exclude>**/content/**</exclude>
583+
<exclude>**/templates</exclude>
584+
<exclude>**/templates/**</exclude>
585+
<exclude>**/template-draft.html</exclude>
586+
</excludes>
587+
</configuration>
588+
</plugin>
525589
<plugin>
526590
<groupId>org.apache.maven.plugins</groupId>
527591
<artifactId>maven-surefire-plugin</artifactId>

run.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ source defcon-parent/conf.sh
44

55
export MVN_CMD='./mvnw'
66

7+
8+
#mvn_jbake_help
9+
#run_jbake_seed
10+
#mvn_jbake_run
11+
712
#mvn_fast_build
813
#mvn_build
914
mvn_site

0 commit comments

Comments
 (0)