Merge remote-tracking branch 'hd42/master' (Update to jbake 2.6.3)

jonbullock · Oct 5, 2019 · 66195e7 · 66195e7
2 parents 645e0ab + 1b4df42
commit 66195e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <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>
@@ -111,7 +111,7 @@
             <dependency>
                 <groupId>org.jbake</groupId>
                 <artifactId>jbake-core</artifactId>
-                <version>2.6.2</version>
+                <version>2.6.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
@@ -178,7 +178,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.4</version>
+                <version>3.6.0</version>
                 <configuration>
                     <goalPrefix>jbake</goalPrefix>
                     <requirements>
@@ -252,4 +252,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>
diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java
@@ -18,7 +18,6 @@
 
 import com.orientechnologies.orient.core.Orient;
 
-import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.MapConfiguration;
 import org.apache.maven.plugin.AbstractMojo;
@@ -29,9 +28,9 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.jbake.app.Oven;
+import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfiguration;
-import org.jbake.app.configuration.JBakeConfigurationFactory;
 
 import java.io.File;
 
@@ -98,8 +97,6 @@ protected void reRender() throws MojoExecutionException, MojoFailureException {
       // TODO: At some point, reuse Oven
       Oven oven = new Oven(createConfiguration());
 
-      oven.setupPaths();
-
       oven.bake();
       if (failOnError && !oven.getErrors().isEmpty()) {
           throw new MojoFailureException("Baked with " + oven.getErrors().size() + " errors. Check output above for details!");
@@ -112,18 +109,11 @@ protected void reRender() throws MojoExecutionException, MojoFailureException {
   }
 
   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(baseConfiguration.getCompositeConfiguration());
-
-    config.addConfiguration(new MapConfiguration(this.project.getProperties()));
-
-    return jbakeConfigurationFactory.createDefaultJbakeConfiguration(inputDirectory, outputDirectory, config, isClearCache);
+	  DefaultJBakeConfiguration jBakeConfiguration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(inputDirectory);
+    jBakeConfiguration.getCompositeConfiguration().addConfiguration(new MapConfiguration(this.project.getProperties()));
+    jBakeConfiguration.setDestinationFolder(outputDirectory);
+    jBakeConfiguration.setClearCache(isClearCache);
+    return jBakeConfiguration;
   }
 
 }