diff --git a/gradle.properties b/gradle.properties
index ecae932f..9f511a88 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,5 +49,6 @@ org.gradle.configureondemand = true
 org.gradle.vfs.watch = true
 
 # jbake-maven-plugin dependencies
-mavenVersion                = 3.8.4
+mavenVersion                = 3.8.1
 mavenAnnotationsVersion     = 3.6.2
+sparkVersion                = 2.9.3
diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle
index ec9ef6bf..1a82b8e1 100644
--- a/jbake-maven-plugin/build.gradle
+++ b/jbake-maven-plugin/build.gradle
@@ -4,26 +4,25 @@ plugins {
 }
 
 group = "org.jbake"
-version = "2.7.0"
 
 dependencies {
     implementation project(":jbake-core")
 
-    compileOnly "org.apache.maven:maven-core:3.8.1"
-    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.2"
+    compileOnly "org.apache.maven:maven-core:$mavenVersion"
+    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:$mavenAnnotationsVersion"
 
-    implementation "com.sparkjava:spark-core:2.9.3"
+    implementation "com.sparkjava:spark-core:$sparkVersion"
 
     // Include all optional dependencies by default
-//    implementation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion"
-//    implementation "org.codehaus.groovy:groovy:$groovyVersion"
-//    implementation "org.codehaus.groovy:groovy-templates:$groovyVersion"
-//    implementation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
-//    implementation "org.freemarker:freemarker:$freemarkerVersion"
-//    implementation "org.thymeleaf:thymeleaf:$thymeleafVersion"
-//    implementation "de.neuland-bfi:jade4j:$jade4jVersion"
-//    implementation "com.vladsch.flexmark:flexmark:$flexmarkVersion"
-//    implementation "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion"
-//    implementation "io.pebbletemplates:pebble:$pebbleVersion"
-//    implementation "org.yaml:snakeyaml:$snakeYamlVersion"
+    implementation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion"
+    implementation "org.codehaus.groovy:groovy:$groovyVersion"
+    implementation "org.codehaus.groovy:groovy-templates:$groovyVersion"
+    implementation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
+    implementation "org.freemarker:freemarker:$freemarkerVersion"
+    implementation "org.thymeleaf:thymeleaf:$thymeleafVersion"
+    implementation "de.neuland-bfi:jade4j:$jade4jVersion"
+    implementation "com.vladsch.flexmark:flexmark:$flexmarkVersion"
+    implementation "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion"
+    implementation "io.pebbletemplates:pebble:$pebbleVersion"
+    implementation "org.yaml:snakeyaml:$snakeYamlVersion"
 }
diff --git a/jbake-maven-plugin/pom.xml b/jbake-maven-plugin/pom.xml
deleted file mode 100644
index d1870f17..00000000
--- a/jbake-maven-plugin/pom.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
-    </parent>
-
-    <groupId>org.jbake</groupId>
-    <artifactId>jbake-maven-plugin</artifactId>
-    <version>0.3.7-SNAPSHOT</version>
-    <packaging>maven-plugin</packaging>
-
-    <prerequisites>
-        <maven>3.1.1</maven>
-    </prerequisites>
-
-	<name>jbake-maven-plugin</name>
-    <description>jbake-maven-plugin is a Maven plugin allowing you to integrate JBake into your projects build</description>
-    <url>http://jbake.org</url>
-    <inceptionYear>2013</inceptionYear>
-
-    <licenses>
-        <license>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <name>Apache 2.0</name>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>JBake</name>
-        <url>http://jbake.org</url>
-    </organization>
-
-    <developers>
-        <developer>
-            <id>aldrinleal</id>
-            <name>Aldrin Leal</name>
-            <timezone>-3</timezone>
-        </developer>
-        <developer>
-            <id>jonbullock</id>
-            <name>Jonathan Bullock</name>
-            <timezone>0</timezone>
-        </developer>
-    </developers>
-
-    <issueManagement>
-        <system>GitHub Issues</system>
-        <url>https://github.com/jbake-org/jbake-maven-plugin/issues</url>
-    </issueManagement>
-
-    <properties>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <scm>
-        <connection>scm:git:http://github.com/jbake-org/jbake-maven-plugin</connection>
-        <developerConnection>scm:git:https://github.com/jbake-org/jbake-maven-plugin.git</developerConnection>
-        <url>http://github.com/jbake-org/jbake-maven-plugin</url>
-    </scm>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jbake</groupId>
-            <artifactId>jbake-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sparkjava</groupId>
-            <artifactId>spark-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-settings</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.sonatype.plexus</groupId>
-            <artifactId>plexus-build-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-    </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.jbake</groupId>
-                <artifactId>jbake-core</artifactId>
-                <version>2.7.0-rc.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-plugin-api</artifactId>
-                <version>3.3.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-configuration2</artifactId>
-                <version>2.7</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven.plugin-testing</groupId>
-                <artifactId>maven-plugin-testing-harness</artifactId>
-                <version>3.3.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.17</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-settings</artifactId>
-                <version>3.3.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-core</artifactId>
-                <version>3.3.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven.plugin-tools</groupId>
-                <artifactId>maven-plugin-annotations</artifactId>
-                <version>3.4</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.sonatype.plexus</groupId>
-                <artifactId>plexus-build-api</artifactId>
-                <version>0.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>3.0.22</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sparkjava</groupId>
-                <artifactId>spark-core</artifactId>
-                <version>2.9.3</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <goalPrefix>jbake</goalPrefix>
-                    <requirements>
-                        <jdk>1.8</jdk>
-                    </requirements>
-                    <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-descriptor</id>
-                        <phase>process-classes</phase>
-                    </execution>
-                    <execution>
-                        <id>help-goal</id>
-                        <goals>
-                            <goal>helpmojo</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-        </plugins>
-    </reporting>
-</project>