Skip to content

[#763] Allow overriding jbake.properties through maven plugin #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beikov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[#763] Allow overriding jbake.properties through maven plugin #764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* limitations under the License.
*/

import org.apache.commons.configuration2.MapConfiguration;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Expand All @@ -30,6 +31,7 @@
import org.jbake.app.configuration.JBakeConfigurationFactory;

import java.io.File;
import java.util.Map;

/**
* Runs jbake on a folder
Expand Down Expand Up @@ -66,6 +68,12 @@ public class GenerateMojo extends AbstractMojo {
@Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true)
protected boolean isClearCache;

/**
* Properties that are passed to JBake which override the jbake.properties.
*/
@Parameter
protected Map<String, String> properties;

public final void execute() throws MojoExecutionException {
executeInternal();
}
Expand All @@ -91,7 +99,10 @@ protected void reRender() throws MojoExecutionException {

protected JBakeConfiguration createConfiguration() throws JBakeException {
DefaultJBakeConfiguration jBakeConfiguration = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(inputDirectory, outputDirectory, isClearCache);
jBakeConfiguration.addConfiguration(this.project.getProperties());
jBakeConfiguration.getCompositeConfiguration().addConfigurationFirst(new MapConfiguration(project.getProperties()));
if (properties != null) {
jBakeConfiguration.getCompositeConfiguration().addConfigurationFirst(new MapConfiguration(properties));
}
return jBakeConfiguration;
}

Expand Down