Move site generation to official jbake maven plugin
This allows us to leave JDK8 behind on the Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
index 6ed683b..32671d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,6 @@
def docsVersion
node( 'ubuntu' ) {
- def JAVA_JDK_8=tool name: 'jdk_1.8_latest', type: 'hudson.model.JDK'
def JAVA_JDK_11=tool name: 'jdk_11_latest', type: 'hudson.model.JDK'
def MAVEN_3_LATEST=tool name: 'maven_3_latest', type: 'hudson.tasks.Maven$MavenInstallation'
def version = params?.version ?: 'master'
@@ -66,9 +65,9 @@
}
stage( 'build website' ) {
- echo "Will use Java $JAVA_JDK_8"
+ echo "Will use Java $JAVA_JDK_11"
echo "Will use Maven $MAVEN_3_LATEST"
- withEnv( [ "Path+JDK=$JAVA_JDK_8/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
+ withEnv( [ "Path+JDK=$JAVA_JDK_11/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
dir( jbake ) {
git branch: jbake, url: repo, credentialsId: creds, poll: true
sh "cp ../$build/ChangeLog.md ./src/main/config/changelog.md"
diff --git a/pom.xml b/pom.xml
index 40c7d65..43fbe82 100755
--- a/pom.xml
+++ b/pom.xml
@@ -42,15 +42,15 @@
<plugin.japicmp.version>0.15.4</plugin.japicmp.version>
<plugin.japicmp.jspwiki-new>2.11.2-SNAPSHOT</plugin.japicmp.jspwiki-new>
<plugin.japicmp.jspwiki-old>2.11.0</plugin.japicmp.jspwiki-old>
- <plugin.jbake>0.0.9</plugin.jbake>
+ <plugin.jbake>0.3.4</plugin.jbake>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <version.flexmark>0.62.2</version.flexmark>
<version.freemarker>2.3.31</version.freemarker>
<version.jbake-core>2.5.1</version.jbake-core>
<version.jdk>1.8</version.jdk>
<version.maven>3.5.0</version.maven>
- <version.pegdown>1.6.0</version.pegdown>
- </properties>
+ </properties>
<build>
<plugins>
@@ -65,7 +65,7 @@
</plugin>
<plugin>
- <groupId>br.com.ingenieux</groupId>
+ <groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
</plugin>
@@ -118,7 +118,7 @@
</plugin>
<plugin>
- <groupId>br.com.ingenieux</groupId>
+ <groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
<version>${plugin.jbake}</version>
<configuration>
@@ -133,20 +133,20 @@
</executions>
<dependencies>
<dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark</artifactId>
+ <version>${version.flexmark}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-profile-pegdown</artifactId>
+ <version>${version.flexmark}</version>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${version.freemarker}</version>
</dependency>
- <dependency>
- <groupId>org.jbake</groupId>
- <artifactId>jbake-core</artifactId>
- <version>${version.jbake-core}</version>
- </dependency>
- <dependency>
- <groupId>org.pegdown</groupId>
- <artifactId>pegdown</artifactId>
- <version>${version.pegdown}</version>
- </dependency>
</dependencies>
</plugin>
