diff --git a/pom.xml b/pom.xml index d1b04e2f..5e944c7c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.6-SNAPSHOT + 0.3.6-rc.2 maven-plugin @@ -79,10 +79,6 @@ org.apache.commons commons-lang3 - - commons-configuration - commons-configuration - org.apache.maven maven-settings @@ -115,7 +111,7 @@ org.jbake jbake-core - 2.6.7 + 2.7.0-rc.2 org.apache.maven @@ -127,11 +123,6 @@ commons-lang3 3.10 - - commons-configuration - commons-configuration - 1.10 - commons-io commons-io diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java index 499b82cf..fcb70cc9 100644 --- a/src/main/java/org/jbake/maven/GenerateMojo.java +++ b/src/main/java/org/jbake/maven/GenerateMojo.java @@ -16,8 +16,6 @@ * limitations under the License. */ -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.MapConfiguration; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -25,6 +23,7 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; +import org.jbake.app.JBakeException; import org.jbake.app.Oven; import org.jbake.app.configuration.DefaultJBakeConfiguration; import org.jbake.app.configuration.JBakeConfiguration; @@ -90,9 +89,9 @@ protected void reRender() throws MojoExecutionException { } } - protected JBakeConfiguration createConfiguration() throws ConfigurationException { + protected JBakeConfiguration createConfiguration() throws JBakeException { DefaultJBakeConfiguration jBakeConfiguration = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(inputDirectory, outputDirectory, isClearCache); - jBakeConfiguration.getCompositeConfiguration().addConfiguration(new MapConfiguration(this.project.getProperties())); + jBakeConfiguration.addConfiguration(this.project.getProperties()); return jBakeConfiguration; } diff --git a/src/main/java/org/jbake/maven/InlineMojo.java b/src/main/java/org/jbake/maven/InlineMojo.java index e99c6eb3..5f2a5259 100644 --- a/src/main/java/org/jbake/maven/InlineMojo.java +++ b/src/main/java/org/jbake/maven/InlineMojo.java @@ -1,7 +1,5 @@ package org.jbake.maven; -import org.apache.commons.configuration.ConfigurationException; - /* * Copyright 2013 ingenieux Labs * @@ -21,6 +19,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.jbake.app.JBakeException; import static spark.Spark.awaitInitialization; import static spark.Spark.externalStaticFileLocation; @@ -57,7 +56,7 @@ private int getPort() { if (this.port == null) { try { return createConfiguration().getServerPort(); - } catch (ConfigurationException e) { + } catch (JBakeException e) { // ignore since default will be returned } } else { diff --git a/src/main/java/org/jbake/maven/SeedMojo.java b/src/main/java/org/jbake/maven/SeedMojo.java index d92465e5..23174570 100644 --- a/src/main/java/org/jbake/maven/SeedMojo.java +++ b/src/main/java/org/jbake/maven/SeedMojo.java @@ -33,7 +33,7 @@ import static java.lang.String.format; import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.join; /** * Seeds a new JBake Template into the (non-existing) directory defined by outputDirectory @@ -78,7 +78,6 @@ public void execute() throws MojoExecutionException { unpackZip(tmpZipFile); } catch (Exception e) { getLog().info("Oops", e); - throw new MojoExecutionException("Failure when running: ", e); } } diff --git a/src/main/java/org/jbake/maven/WatchMojo.java b/src/main/java/org/jbake/maven/WatchMojo.java index 5c47575b..e359dc09 100644 --- a/src/main/java/org/jbake/maven/WatchMojo.java +++ b/src/main/java/org/jbake/maven/WatchMojo.java @@ -25,7 +25,7 @@ import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicBoolean; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; /** * Runs jbake on a folder while watching for changes