Adjustments to make it compatible with JBake 2.6.2

This closes jbake-org#16
jonbullock · Oct 10, 2018 · a998ccf · a998ccf
1 parent 8ecf3d3
commit a998ccf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -111,7 +111,7 @@
             <dependency>
                 <groupId>org.jbake</groupId>
                 <artifactId>jbake-core</artifactId>
-                <version>2.6.1</version>
+                <version>2.6.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>

diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java
@@ -27,9 +27,10 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
-import org.jbake.app.ConfigUtil;
-import org.jbake.app.JBakeException;
 import org.jbake.app.Oven;
+import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfigurationFactory;
 
 import java.io.File;
 
@@ -88,7 +89,7 @@ protected void reRender() throws MojoExecutionException {
       Orient.instance().startup();
 
       // TODO: At some point, reuse Oven
-      Oven oven = new Oven(inputDirectory, outputDirectory, createConfiguration(), isClearCache);
+      Oven oven = new Oven(createConfiguration());
 
       oven.setupPaths();
 
@@ -100,14 +101,19 @@ protected void reRender() throws MojoExecutionException {
     }
   }
 
-  protected CompositeConfiguration createConfiguration() throws ConfigurationException {
+  protected JBakeConfiguration createConfiguration() throws ConfigurationException {
+    JBakeConfigurationFactory jbakeConfigurationFactory = new JBakeConfigurationFactory();
+
+    // load base config (cast to DefaultJBakeConfig)
+    DefaultJBakeConfiguration baseConfiguration = (DefaultJBakeConfiguration)jbakeConfigurationFactory.getConfigUtil().loadConfig(inputDirectory);
+
     final CompositeConfiguration config = new CompositeConfiguration();
 
-    config.addConfiguration(ConfigUtil.load(inputDirectory));
+    config.addConfiguration(baseConfiguration.getCompositeConfiguration());
 
     config.addConfiguration(new MapConfiguration(this.project.getProperties()));
 
-    return config;
+    return jbakeConfigurationFactory.createDefaultJbakeConfiguration(inputDirectory, outputDirectory, config, isClearCache);
   }
 
 }