From 9ff9fedcaf22f6fd8f2aee15a9c10bae98cc9c16 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 13 Sep 2013 14:21:59 -0300 Subject: [PATCH 001/256] First Version --- .gitignore | 7 + .hgignore | 9 + .travis.yml | 5 + pom.xml | 254 ++++++++++++++++++ .../ingenieux/mojo/jbake/GenerateMojo.java | 56 ++++ .../com/ingenieux/mojo/jbake/InlineMojo.java | 135 ++++++++++ 6 files changed, 466 insertions(+) create mode 100644 .gitignore create mode 100644 .hgignore create mode 100644 .travis.yml create mode 100644 pom.xml create mode 100644 src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java create mode 100644 src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..e729b3880 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.settings +.idea +target +.classpath +.project +*.log +*.iml diff --git a/.hgignore b/.hgignore new file mode 100644 index 000000000..6bcb865b6 --- /dev/null +++ b/.hgignore @@ -0,0 +1,9 @@ +.settings +.idea +target +.classpath +.project +syntax:glob +*.log +syntax:glob +*.iml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..33b390271 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: java + +jdk: + - oraclejdk7 + - openjdk6 diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..ebd340a03 --- /dev/null +++ b/pom.xml @@ -0,0 +1,254 @@ + + 4.0.0 + + org.sonatype.oss + oss-parent + 7 + + + br.com.ingenieux + jbake-maven-plugin + maven-plugin + 0.0.1-SNAPSHOT + + jbake-maven-plugin is a plugin to integrate JBake into your projects + http://docs.ingenieux.com.br/jbake-maven-plugin/ + 2013 + + + + http://www.apache.org/licenses/LICENSE-2.0.txt + Apache 2.0 + + + + + + docs.ingenieux.com.br + ingenieux Beanstalker Site + s3://docs.ingenieux.com.br/projects/jbake-maven-plugin/ + + + + + ingenieux + http://ingenieux.com.br + + + + + aldrinleal + Aldrin Leal + -3 + + + + + github + https://bitbucket.org/ingenieux/jbake-maven-plugin/ + + + + UTF-8 + UTF-8 + UTF-8 + + + + scm:hg:http://bitbucket.org/ingenieux/jbake-maven-plugin + scm:hg:ssh://hg@bitbucket.org/ingenieux/jbake-maven-plugin + http://bitbucket.org/ingenieux/jbake-maven-plugin + + + + + org.jbake.app + jbake + + + org.apache.maven + maven-plugin-api + + + commons-lang + commons-lang + + + org.apache.maven + maven-settings + + + org.apache.maven + maven-core + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.sonatype.plexus + plexus-build-api + + + org.codehaus.plexus + plexus-utils + + + org.jvnet.hudson.winstone + winstone + + + + + + + org.jbake.app + jbake + 2.2 + + + org.apache.maven + maven-plugin-api + 3.0.4 + + + commons-lang + commons-lang + 2.6 + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 2.0-alpha-1 + test + + + log4j + log4j + 1.2.12 + + + org.apache.maven + maven-settings + 3.0.4 + + + org.apache.maven + maven-core + 3.0.4 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.2 + provided + + + org.sonatype.plexus + plexus-build-api + 0.0.7 + + + org.codehaus.plexus + plexus-utils + 3.0.1 + + + org.jvnet.hudson.winstone + winstone + 0.9.10-hudson-24 + + + + + + + + org.kuali.maven.wagons + maven-s3-wagon + 1.1.20 + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + true + + + 1.7 + + true + + + + mojo-descriptor + + descriptor + + + + + help-goal + + helpmojo + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-site-plugin + 3.2 + + + org.apache.maven.doxia + doxia-module-markdown + 1.3 + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + + diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java new file mode 100644 index 000000000..7ba65f6dc --- /dev/null +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -0,0 +1,56 @@ +package br.com.ingenieux.mojo.jbake; + +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.File; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.jbake.app.Oven; + +/** + * Runs jbake on a folder + */ +@Mojo(name = "generate") +public class GenerateMojo extends AbstractMojo { + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.build.directory}/${project.build.finalName}", required = true) + private File outputDirectory; + + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) + private File inputDirectory; + + public void execute() throws MojoExecutionException { + try { + Oven oven = new Oven(inputDirectory, outputDirectory); + + oven.setupPaths(); + oven.bake(); + } catch (Exception e) { + getLog().info("Oops", e); + + throw new MojoExecutionException("Failure when running: ", e); + } + } +} diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java new file mode 100644 index 000000000..dab375191 --- /dev/null +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -0,0 +1,135 @@ +package br.com.ingenieux.mojo.jbake; + +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.nio.file.FileSystems; +import java.nio.file.Path; +import java.nio.file.StandardWatchEventKinds; +import java.nio.file.WatchEvent; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +import winstone.Launcher; + +/** + * Runs jbake on a folder while watching and serving a folder with it + */ +@Mojo(name = "inline", requiresDirectInvocation = true) +public class InlineMojo extends GenerateMojo { + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.build.directory}/${project.build.finalName}", required = true) + private File outputDirectory; + + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) + private File inputDirectory; + + /** + * Listen Port + */ + @Parameter(property = "jbake.listenAddress", defaultValue = "127.0.0.1") + private String listenAddress; + + /** + * Listen Port + */ + @Parameter(property = "jbake.port", defaultValue = "8080") + private Integer port; + + public void execute() throws MojoExecutionException { + super.execute(); + + getLog().info("Now listening for changes on path " + inputDirectory.getPath()); + + Map args = new HashMap(); + + Launcher launcher = null; + + try { + args.put("webroot", outputDirectory.getAbsolutePath()); + args.put("httpPort", port.toString()); + args.put("httpListenAddress", listenAddress); + + launcher = new Launcher(args); + + final Path inPath = FileSystems.getDefault().getPath( + inputDirectory.getAbsolutePath()); + final WatchService watchService = inPath.getFileSystem() + .newWatchService(); + + inPath.register(watchService, StandardWatchEventKinds.ENTRY_CREATE, + StandardWatchEventKinds.ENTRY_MODIFY, + StandardWatchEventKinds.ENTRY_DELETE); + + final AtomicBoolean done = new AtomicBoolean(false); + final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); + + (new Thread() { + @Override + public void run() { + try { + getLog().info("Running. Hit to finish"); + reader.readLine(); + } catch (Exception exc) { + } finally { + done.set(true); + } + } + }).run(); + + do { + WatchKey watchKey = watchService.take(); + Thread.sleep(1000L); + + if (watchKey.reset()) { + watchKey.cancel(); + watchService.close(); + return; + } + + List> events = watchKey.pollEvents(); + + if (! events.isEmpty()) { + getLog().info("Refreshing"); + super.execute(); + } + } while (! done.get()); + } catch (Exception exc) { + getLog().info("Oops", exc); + + throw new MojoExecutionException("Oops", exc); + } finally { + getLog().info("Finishing"); + launcher.shutdown(); + } + } +} From 76606eb556ad34d0cc2234db18779496253b30ef Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 13 Sep 2013 15:03:21 -0300 Subject: [PATCH 002/256] Fixing Watch and Inline --- .../ingenieux/mojo/jbake/GenerateMojo.java | 6 +- .../com/ingenieux/mojo/jbake/InlineMojo.java | 91 ++--------- .../com/ingenieux/mojo/jbake/WatchMojo.java | 92 +++++++++++ .../ingenieux/mojo/jbake/util/DirWatcher.java | 146 ++++++++++++++++++ 4 files changed, 251 insertions(+), 84 deletions(-) create mode 100644 src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java create mode 100644 src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 7ba65f6dc..1af08e216 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -1,7 +1,7 @@ package br.com.ingenieux.mojo.jbake; /* - * Copyright 2001-2005 The Apache Software Foundation. + * Copyright 2013 ingenieux Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,13 +33,13 @@ public class GenerateMojo extends AbstractMojo { * Location of the Output Directory. */ @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.build.directory}/${project.build.finalName}", required = true) - private File outputDirectory; + protected File outputDirectory; /** * Location of the Output Directory. */ @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) - private File inputDirectory; + protected File inputDirectory; public void execute() throws MojoExecutionException { try { diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index dab375191..e4a7673c7 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -1,7 +1,7 @@ package br.com.ingenieux.mojo.jbake; /* - * Copyright 2001-2005 The Apache Software Foundation. + * Copyright 2013 ingenieux Labs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,8 @@ * limitations under the License. */ -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.nio.file.FileSystems; -import java.nio.file.Path; -import java.nio.file.StandardWatchEventKinds; -import java.nio.file.WatchEvent; -import java.nio.file.WatchKey; -import java.nio.file.WatchService; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -40,19 +29,7 @@ * Runs jbake on a folder while watching and serving a folder with it */ @Mojo(name = "inline", requiresDirectInvocation = true) -public class InlineMojo extends GenerateMojo { - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.build.directory}/${project.build.finalName}", required = true) - private File outputDirectory; - - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) - private File inputDirectory; - +public class InlineMojo extends WatchMojo { /** * Listen Port */ @@ -65,71 +42,23 @@ public class InlineMojo extends GenerateMojo { @Parameter(property = "jbake.port", defaultValue = "8080") private Integer port; - public void execute() throws MojoExecutionException { - super.execute(); - - getLog().info("Now listening for changes on path " + inputDirectory.getPath()); + protected Launcher launcher = null; - Map args = new HashMap(); - - Launcher launcher = null; + protected void stopServer() { + launcher.shutdown(); + } + protected void initServer() throws MojoExecutionException { try { + Map args = new HashMap(); + args.put("webroot", outputDirectory.getAbsolutePath()); args.put("httpPort", port.toString()); args.put("httpListenAddress", listenAddress); launcher = new Launcher(args); - - final Path inPath = FileSystems.getDefault().getPath( - inputDirectory.getAbsolutePath()); - final WatchService watchService = inPath.getFileSystem() - .newWatchService(); - - inPath.register(watchService, StandardWatchEventKinds.ENTRY_CREATE, - StandardWatchEventKinds.ENTRY_MODIFY, - StandardWatchEventKinds.ENTRY_DELETE); - - final AtomicBoolean done = new AtomicBoolean(false); - final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); - - (new Thread() { - @Override - public void run() { - try { - getLog().info("Running. Hit to finish"); - reader.readLine(); - } catch (Exception exc) { - } finally { - done.set(true); - } - } - }).run(); - - do { - WatchKey watchKey = watchService.take(); - Thread.sleep(1000L); - - if (watchKey.reset()) { - watchKey.cancel(); - watchService.close(); - return; - } - - List> events = watchKey.pollEvents(); - - if (! events.isEmpty()) { - getLog().info("Refreshing"); - super.execute(); - } - } while (! done.get()); } catch (Exception exc) { - getLog().info("Oops", exc); - - throw new MojoExecutionException("Oops", exc); - } finally { - getLog().info("Finishing"); - launcher.shutdown(); + throw new MojoExecutionException("Ooops", exc); } } } diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java new file mode 100644 index 000000000..a4a82ffb1 --- /dev/null +++ b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java @@ -0,0 +1,92 @@ +package br.com.ingenieux.mojo.jbake; + +/* + * Copyright 2013 ingenieux Labs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.nio.file.Paths; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; + +import br.com.ingenieux.mojo.jbake.util.DirWatcher; + +/** + * Runs jbake on a folder while watching for changes + */ +@Mojo(name = "watch", requiresDirectInvocation = true) +public class WatchMojo extends GenerateMojo { + public void execute() throws MojoExecutionException { + super.execute(); + + getLog().info( + "Now listening for changes on path " + inputDirectory.getPath()); + + initServer(); + + try { + final AtomicBoolean done = new AtomicBoolean(false); + final BufferedReader reader = new BufferedReader( + new InputStreamReader(System.in)); + + (new Thread() { + @Override + public void run() { + try { + getLog().info("Running. Hit to finish"); + reader.readLine(); + } catch (Exception exc) { + } finally { + done.set(true); + } + } + }).start(); + + DirWatcher dirWatcher = new DirWatcher(Paths.get(inputDirectory + .getPath())); + + do { + Boolean result = dirWatcher.processEvents(); + + if (Boolean.FALSE.equals(result)) { + Thread.sleep(1000); + } else if (Boolean.TRUE.equals(result)) { + getLog().info("Refreshing"); + + super.execute(); + } else if (null == result) { + break; + } + } while (!done.get()); + } catch (Exception exc) { + getLog().info("Oops", exc); + + throw new MojoExecutionException("Oops", exc); + } finally { + getLog().info("Finishing"); + + stopServer(); + } + } + + protected void stopServer() { + } + + protected void initServer() throws MojoExecutionException { + } +} diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java b/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java new file mode 100644 index 000000000..42f839cd7 --- /dev/null +++ b/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java @@ -0,0 +1,146 @@ +package br.com.ingenieux.mojo.jbake.util; + +import static java.nio.file.LinkOption.NOFOLLOW_LINKS; +import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE; +import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE; +import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY; +import static java.nio.file.StandardWatchEventKinds.OVERFLOW; + +import java.io.IOException; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.WatchEvent; +import java.nio.file.WatchEvent.Kind; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +/** + * Example to watch a directory (or tree) for changes to files. + */ + +public class DirWatcher { + private final WatchService watcher; + + private final Map keys; + + @SuppressWarnings("unchecked") + static WatchEvent cast(WatchEvent event) { + return (WatchEvent) event; + } + + /** + * Register the given directory with the WatchService + */ + private void register(Path dir) throws IOException { + WatchKey key = dir.register(watcher, ENTRY_CREATE, ENTRY_DELETE, + ENTRY_MODIFY); + // if (trace) { + // Path prev = keys.get(key); + // if (prev == null) { + // System.out.format("register: %s\n", dir); + // } else { + // if (!dir.equals(prev)) { + // System.out.format("update: %s -> %s\n", prev, dir); + // } + // } + // } + keys.put(key, dir); + } + + /** + * Register the given directory, and all its sub-directories, with the + * WatchService. + */ + private void registerAll(final Path start) throws IOException { + // register directory and sub-directories + Files.walkFileTree(start, new SimpleFileVisitor() { + @Override + public FileVisitResult preVisitDirectory(Path dir, + BasicFileAttributes attrs) throws IOException { + register(dir); + return FileVisitResult.CONTINUE; + } + }); + } + + /** + * Creates a WatchService and registers the given directory + */ + public DirWatcher(Path dir) throws IOException { + this.watcher = FileSystems.getDefault().newWatchService(); + this.keys = new HashMap(); + + registerAll(dir); + } + + /** + * Process all events for keys queued to the watcher + */ + public Boolean processEvents() { + // wait for key to be signalled + WatchKey key; + try { + key = watcher.poll(1L, TimeUnit.SECONDS); + } catch (InterruptedException x) { + return Boolean.FALSE; + } + + if (null == key) + return Boolean.FALSE; + + Path dir = keys.get(key); + if (dir == null) + throw new IllegalStateException("WatchKey not recognized!!"); + + for (WatchEvent event : key.pollEvents()) { + Kind kind = event.kind(); + + // TBD - provide example of how OVERFLOW event is handled + if (kind == OVERFLOW) { + continue; + } + + // Context for directory entry event is the file name of entry + WatchEvent ev = cast(event); + Path name = ev.context(); + Path child = dir.resolve(name); + + // if directory is created, and watching recursively, then + // register it and its sub-directories + if (kind == ENTRY_CREATE) { + try { + if (Files.isDirectory(child, NOFOLLOW_LINKS)) { + registerAll(child); + } + } catch (IOException x) { + // ignore to keep sample readbale + } + } + } + + // reset key and remove from set if directory no longer accessible + boolean valid = key.reset(); + if (!valid) { + keys.remove(key); + + // all directories are inaccessible + if (keys.isEmpty()) { + return null; + } + } + + return Boolean.TRUE; + } + + static void usage() { + System.err.println("usage: java WatchDir [-r] dir"); + System.exit(-1); + } +} \ No newline at end of file From abce914bf9e2a57d560070832ab31783d6ac6c53 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 22 Sep 2013 14:23:19 -0300 Subject: [PATCH 003/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.1 --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ebd340a03..8d3371154 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 org.sonatype.oss @@ -10,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.1-SNAPSHOT + 0.0.1 jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 5b3efb63113347b7c5e7b952f373bd24699b4862 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 22 Sep 2013 14:23:25 -0300 Subject: [PATCH 004/256] [maven-release-plugin] copy for tag jbake-maven-plugin-0.0.1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgtags diff --git a/.hgtags b/.hgtags new file mode 100644 index 000000000..26eb971be --- /dev/null +++ b/.hgtags @@ -0,0 +1 @@ +29a2a0ff369456f68e2f0f772a04428829335763 jbake-maven-plugin-0.0.1 From 75f492ef090ae4db718751d0bc149ba3401a1e7c Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 22 Sep 2013 14:23:32 -0300 Subject: [PATCH 005/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d3371154..fc4f35e3b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.1 + 0.0.2-SNAPSHOT jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 9f05c53c2543b88ebfe2a147f8100b92939d743b Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 22 Sep 2013 14:27:42 -0300 Subject: [PATCH 006/256] Redoing the release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fc4f35e3b..caaa7cb58 100644 --- a/pom.xml +++ b/pom.xml @@ -103,9 +103,9 @@ - org.jbake.app - jbake - 2.2 + org.jbake + jbake-core + 2.1 org.apache.maven From 0dc0f3f17efba627edf201c35479aac16b9f4353 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 22 Sep 2013 14:29:11 -0300 Subject: [PATCH 007/256] Fixing --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index caaa7cb58..99cd5b222 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,8 @@ - org.jbake.app - jbake + org.jbake + jbake-core org.apache.maven From 1a7c346813ee4522d63fa7377df090b831081094 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 23 Sep 2013 16:34:56 -0300 Subject: [PATCH 008/256] Fixing for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99cd5b222..5b515e60d 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ org.jbake jbake-core - 2.1 + 2.1.1 org.apache.maven From 845659757d6bf6acaa24140d8e3b594995cc7066 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 23 Sep 2013 16:38:32 -0300 Subject: [PATCH 009/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b515e60d..752830dcf 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.2-SNAPSHOT + 0.0.2 jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From cd82bff010a36e73e846bacf81967a7132636fbc Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 23 Sep 2013 16:38:46 -0300 Subject: [PATCH 010/256] [maven-release-plugin] copy for tag jbake-maven-plugin-0.0.2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 26eb971be..a443e59bb 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 29a2a0ff369456f68e2f0f772a04428829335763 jbake-maven-plugin-0.0.1 +a4cc0a5a7e191369db77919f9bb1424693f0ec8e jbake-maven-plugin-0.0.2 From 29d7ef3333193c1027b8865e7473c62341182529 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 23 Sep 2013 16:38:52 -0300 Subject: [PATCH 011/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 752830dcf..fd473d666 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.2 + 0.0.3-SNAPSHOT jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 95738d6ae871fcce0cc7056b6a11b6f6fbad52a2 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 6 Dec 2013 06:48:45 -0300 Subject: [PATCH 012/256] Swapping Winstone for Vert.x --- pom.xml | 486 +++++++++--------- .../com/ingenieux/mojo/jbake/InlineMojo.java | 55 +- 2 files changed, 285 insertions(+), 256 deletions(-) diff --git a/pom.xml b/pom.xml index fd473d666..3bf878414 100644 --- a/pom.xml +++ b/pom.xml @@ -1,253 +1,263 @@ - - 4.0.0 - - org.sonatype.oss - oss-parent - 7 - + + 4.0.0 + + org.sonatype.oss + oss-parent + 7 + - br.com.ingenieux - jbake-maven-plugin - maven-plugin - 0.0.3-SNAPSHOT + br.com.ingenieux + jbake-maven-plugin + maven-plugin + 0.0.3-SNAPSHOT - jbake-maven-plugin is a plugin to integrate JBake into your projects - http://docs.ingenieux.com.br/jbake-maven-plugin/ - 2013 + jbake-maven-plugin is a plugin to integrate JBake into your projects + http://docs.ingenieux.com.br/jbake-maven-plugin/ + 2013 - - - http://www.apache.org/licenses/LICENSE-2.0.txt - Apache 2.0 - - + + + http://www.apache.org/licenses/LICENSE-2.0.txt + Apache 2.0 + + - - - docs.ingenieux.com.br - ingenieux Beanstalker Site - s3://docs.ingenieux.com.br/projects/jbake-maven-plugin/ - - + + + docs.ingenieux.com.br + ingenieux Beanstalker Site + s3://docs.ingenieux.com.br/projects/jbake-maven-plugin/ + + - - ingenieux - http://ingenieux.com.br - + + ingenieux + http://ingenieux.com.br + - - - aldrinleal - Aldrin Leal - -3 - - + + + aldrinleal + Aldrin Leal + -3 + + - - github - https://bitbucket.org/ingenieux/jbake-maven-plugin/ - + + github + https://bitbucket.org/ingenieux/jbake-maven-plugin/ + - - UTF-8 - UTF-8 - UTF-8 - + + UTF-8 + UTF-8 + UTF-8 + - - scm:hg:http://bitbucket.org/ingenieux/jbake-maven-plugin - scm:hg:ssh://hg@bitbucket.org/ingenieux/jbake-maven-plugin - http://bitbucket.org/ingenieux/jbake-maven-plugin - + + scm:hg:http://bitbucket.org/ingenieux/jbake-maven-plugin + scm:hg:ssh://hg@bitbucket.org/ingenieux/jbake-maven-plugin + http://bitbucket.org/ingenieux/jbake-maven-plugin + - - - org.jbake - jbake-core - - - org.apache.maven - maven-plugin-api - - - commons-lang - commons-lang - - - org.apache.maven - maven-settings - - - org.apache.maven - maven-core - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - org.sonatype.plexus - plexus-build-api - - - org.codehaus.plexus - plexus-utils - - - org.jvnet.hudson.winstone - winstone - - + + + org.jbake + jbake-core + + + org.apache.maven + maven-plugin-api + + + commons-lang + commons-lang + + + org.apache.maven + maven-settings + + + org.apache.maven + maven-core + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.sonatype.plexus + plexus-build-api + + + org.codehaus.plexus + plexus-utils + + + io.vertx + vertx-core + + + io.vertx + vertx-platform + + - - - - org.jbake - jbake-core - 2.1.1 - - - org.apache.maven - maven-plugin-api - 3.0.4 - - - commons-lang - commons-lang - 2.6 - - - org.apache.maven.plugin-testing - maven-plugin-testing-harness - 2.0-alpha-1 - test - - - log4j - log4j - 1.2.12 - - - org.apache.maven - maven-settings - 3.0.4 - - - org.apache.maven - maven-core - 3.0.4 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.2 - provided - - - org.sonatype.plexus - plexus-build-api - 0.0.7 - - - org.codehaus.plexus - plexus-utils - 3.0.1 - - - org.jvnet.hudson.winstone - winstone - 0.9.10-hudson-24 - - - + + + + org.jbake + jbake-core + 2.1.1 + + + org.apache.maven + maven-plugin-api + 3.0.4 + + + commons-lang + commons-lang + 2.6 + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 2.0-alpha-1 + test + + + log4j + log4j + 1.2.12 + + + org.apache.maven + maven-settings + 3.0.4 + + + org.apache.maven + maven-core + 3.0.4 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.2 + provided + + + org.sonatype.plexus + plexus-build-api + 0.0.7 + + + org.codehaus.plexus + plexus-utils + 3.0.1 + + + io.vertx + vertx-core + 2.0.2-final + + + io.vertx + vertx-platform + 2.0.2-final + + + - - - - org.kuali.maven.wagons - maven-s3-wagon - 1.1.20 - - + + + + org.kuali.maven.wagons + maven-s3-wagon + 1.1.20 + + - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.2 - true - - - 1.7 - - true - - - - mojo-descriptor - - descriptor - - - - - help-goal - - helpmojo - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-site-plugin - 3.2 - - - org.apache.maven.doxia - doxia-module-markdown - 1.3 - - - - - - + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + true + + + 1.7 + + true + + + + mojo-descriptor + + descriptor + + + + + help-goal + + helpmojo + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-site-plugin + 3.2 + + + org.apache.maven.doxia + doxia-module-markdown + 1.3 + + + + + + - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index e4a7673c7..e10b09629 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -16,14 +16,15 @@ * limitations under the License. */ -import java.util.HashMap; -import java.util.Map; - import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.vertx.java.core.Handler; +import org.vertx.java.core.VertxFactory; +import org.vertx.java.core.http.HttpServerRequest; +import org.vertx.java.platform.Verticle; -import winstone.Launcher; +import java.io.File; /** * Runs jbake on a folder while watching and serving a folder with it @@ -36,29 +37,47 @@ public class InlineMojo extends WatchMojo { @Parameter(property = "jbake.listenAddress", defaultValue = "127.0.0.1") private String listenAddress; - /** + /** + * Listen Port + */ + @Parameter(property = "jbake.indexFile", defaultValue = "index.html") + private String indexFile; + + /** * Listen Port */ @Parameter(property = "jbake.port", defaultValue = "8080") private Integer port; - protected Launcher launcher = null; + Server server = new Server(); + + class Server extends Verticle { + { + vertx = VertxFactory.newVertx(); + } + + @Override + public void start() { + vertx.createHttpServer().requestHandler(new Handler() { + @Override + public void handle(HttpServerRequest req) { + String file = req.path().endsWith("/") ? req.path() + indexFile : req.path(); + + if (new File(outputDirectory + file).isDirectory()) { + req.response().setStatusCode(301).putHeader("Location", file + "/").close(); + } else { + req.response().sendFile(outputDirectory.getAbsolutePath() + file); + } + } + }).listen(port, listenAddress); + } + } protected void stopServer() { - launcher.shutdown(); + server.stop(); } protected void initServer() throws MojoExecutionException { - try { - Map args = new HashMap(); - - args.put("webroot", outputDirectory.getAbsolutePath()); - args.put("httpPort", port.toString()); - args.put("httpListenAddress", listenAddress); - - launcher = new Launcher(args); - } catch (Exception exc) { - throw new MojoExecutionException("Ooops", exc); - } + server.start(); } } From f021b8f94fa3cbc25c5dccba48c90cb9714145fe Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 6 Dec 2013 06:52:56 -0300 Subject: [PATCH 013/256] Fixing metadata --- src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index e10b09629..d06f27636 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -38,7 +38,7 @@ public class InlineMojo extends WatchMojo { private String listenAddress; /** - * Listen Port + * Index File */ @Parameter(property = "jbake.indexFile", defaultValue = "index.html") private String indexFile; From 7337c6c95a7d2edb837b9ce2ee4a657aed7517d8 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 27 Jan 2014 17:09:47 -0300 Subject: [PATCH 014/256] Fixing JBake Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bf878414..ff3533d63 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ org.jbake jbake-core - 2.1.1 + 2.2.1 org.apache.maven From cc51599934943cbb83fd059623f9e29af18e058e Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 02:58:21 -0300 Subject: [PATCH 015/256] Fixing pom --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index ff3533d63..dacccd69c 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,12 @@ org.jbake jbake-core + + + org.eclipse.jetty + jetty-server + + org.apache.maven From e57c389bcaac4fb76d56f723ca9eea17e1d0e32d Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 00:19:42 -0600 Subject: [PATCH 016/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.3 --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dacccd69c..e7eb6e6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 org.sonatype.oss @@ -10,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.3-SNAPSHOT + 0.0.3 jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 9f9b388e51483fa6ca53073c7beea1c6db12fc80 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 00:19:44 -0600 Subject: [PATCH 017/256] [maven-release-plugin] copy for tag jbake-maven-plugin-0.0.3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a443e59bb..17360ae5d 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 29a2a0ff369456f68e2f0f772a04428829335763 jbake-maven-plugin-0.0.1 a4cc0a5a7e191369db77919f9bb1424693f0ec8e jbake-maven-plugin-0.0.2 +dac515355fb76185faba67020f44735a00e9fdd6 jbake-maven-plugin-0.0.3 From 92d7ac3fb6a77fdf332d703b4c44ccaf17a90985 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 00:19:46 -0600 Subject: [PATCH 018/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7eb6e6c3..ee5beed22 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.3 + 0.0.4-SNAPSHOT jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 8fd028ea1a832a6732a11d8dc75dc2aeb6a1e996 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 04:43:09 -0300 Subject: [PATCH 019/256] Removing Project Requirement --- .../br/com/ingenieux/mojo/jbake/GenerateMojo.java | 6 +++--- .../java/br/com/ingenieux/mojo/jbake/InlineMojo.java | 2 +- .../java/br/com/ingenieux/mojo/jbake/WatchMojo.java | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 1af08e216..2f1e55ce0 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -16,18 +16,18 @@ * limitations under the License. */ -import java.io.File; - import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.jbake.app.Oven; +import java.io.File; + /** * Runs jbake on a folder */ -@Mojo(name = "generate") +@Mojo(name = "generate", requiresProject = false) public class GenerateMojo extends AbstractMojo { /** * Location of the Output Directory. diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index d06f27636..df2d6435a 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -29,7 +29,7 @@ /** * Runs jbake on a folder while watching and serving a folder with it */ -@Mojo(name = "inline", requiresDirectInvocation = true) +@Mojo(name = "inline", requiresDirectInvocation = true, requiresProject = false) public class InlineMojo extends WatchMojo { /** * Listen Port diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java index a4a82ffb1..38d672128 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java @@ -16,20 +16,19 @@ * limitations under the License. */ +import br.com.ingenieux.mojo.jbake.util.DirWatcher; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.nio.file.Paths; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.Mojo; - -import br.com.ingenieux.mojo.jbake.util.DirWatcher; - /** * Runs jbake on a folder while watching for changes */ -@Mojo(name = "watch", requiresDirectInvocation = true) +@Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false) public class WatchMojo extends GenerateMojo { public void execute() throws MojoExecutionException { super.execute(); From 8768579e0e1a3044644be8e8dd8c5f2dc8b27ad0 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 02:54:41 -0600 Subject: [PATCH 020/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee5beed22..94026dba4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.4-SNAPSHOT + 0.0.4 jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 60f22fb7baa0baf5dacc48334aadce2915eb4981 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 02:54:43 -0600 Subject: [PATCH 021/256] [maven-release-plugin] copy for tag jbake-maven-plugin-0.0.4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 17360ae5d..e76b8c5db 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 29a2a0ff369456f68e2f0f772a04428829335763 jbake-maven-plugin-0.0.1 a4cc0a5a7e191369db77919f9bb1424693f0ec8e jbake-maven-plugin-0.0.2 dac515355fb76185faba67020f44735a00e9fdd6 jbake-maven-plugin-0.0.3 +3cefc1a3c056ef859960b0cdcc0ceca49bfbc9da jbake-maven-plugin-0.0.4 From bc0730559e5c2922e67ec2cbf521fc5e7082d58b Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 02:54:45 -0600 Subject: [PATCH 022/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94026dba4..a0b3270d6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.4 + 0.0.5-SNAPSHOT jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ From 1545207bfcd851cba3303017b63481c322e077ad Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 03:07:04 -0600 Subject: [PATCH 023/256] Updating Prereqs and plugins --HG-- extra : amend_source : 31da5144387b274a1c962c35dbcb7746cab6c34a --- pom.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a0b3270d6..a7a4529dc 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,10 @@ maven-plugin 0.0.5-SNAPSHOT + + 3.1.1 + + jbake-maven-plugin is a plugin to integrate JBake into your projects http://docs.ingenieux.com.br/jbake-maven-plugin/ 2013 @@ -218,7 +222,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.1 1.7 @@ -228,14 +232,7 @@ org.apache.maven.plugins maven-site-plugin - 3.2 - - - org.apache.maven.doxia - doxia-module-markdown - 1.3 - - + 3.3 From 85298ad11266b4a1385cbad680f350f12cd12ddb Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 03:10:07 -0600 Subject: [PATCH 024/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7a4529dc..d12aae8b5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.5-SNAPSHOT + 0.0.5 3.1.1 From fb97ce571c8434824c53e3fba19b23244f1ec8d7 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 03:10:10 -0600 Subject: [PATCH 025/256] [maven-release-plugin] copy for tag jbake-maven-plugin-0.0.5 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e76b8c5db..13a119f53 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ a4cc0a5a7e191369db77919f9bb1424693f0ec8e jbake-maven-plugin-0.0.2 dac515355fb76185faba67020f44735a00e9fdd6 jbake-maven-plugin-0.0.3 3cefc1a3c056ef859960b0cdcc0ceca49bfbc9da jbake-maven-plugin-0.0.4 +cf9b1156b7ca9818a11814b19274fec23109c880 jbake-maven-plugin-0.0.5 From 1ef1e0802c5300a172b5b58e3939f7c1370a045c Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 03:10:13 -0600 Subject: [PATCH 026/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d12aae8b5..dd734870f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.5 + 0.0.6-SNAPSHOT 3.1.1 From 31503d745ed945f8837f3b8e45a283ef8ce421a3 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 07:57:49 -0300 Subject: [PATCH 027/256] Adding Seed Mojo --HG-- rename : src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java => src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java --- pom.xml | 5 + .../br/com/ingenieux/mojo/jbake/SeedMojo.java | 122 ++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java diff --git a/pom.xml b/pom.xml index dd734870f..0477ea8f9 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ io.vertx vertx-platform + + commons-io + commons-io + 2.4 + diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java new file mode 100644 index 000000000..b04fc4b94 --- /dev/null +++ b/src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java @@ -0,0 +1,122 @@ +package br.com.ingenieux.mojo.jbake; + +/* + * Copyright 2013 ingenieux Labs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.commons.io.IOUtils; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.util.LinkedList; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import static java.lang.String.format; +import static java.util.Arrays.asList; +import static org.apache.commons.lang.StringUtils.join; + +/** + * Seeds a new JBake Template into the (non-existing) directory defined by outputDirectory + */ +@Mojo(name = "seed", requiresProject = true, requiresDirectInvocation = true) +public class SeedMojo extends AbstractMojo { + /** + * Location of the Seeding Zip + */ + @Parameter(property = "jbake.seedUrl", defaultValue = "https://github.com/jbake-org/jbake-template-bootstrap/zipball/master/", required = true) + protected String seedUrl; + + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) + protected File outputDirectory; + + /** + * Really force overwrite if output dir exists? defaults to false + */ + @Parameter(property = "jbake.force", defaultValue = "false") + protected Boolean force; + + public void execute() throws MojoExecutionException { + if (outputDirectory.exists() && (! force)) + throw new MojoExecutionException(format("The outputDirectory %s must *NOT* exist. Invoke with jbake.force as true to disregard", outputDirectory.getName())); + + try { + URL url = new URL(seedUrl); + File tmpZipFile = File.createTempFile("jbake", ".zip"); + + getLog().info(format("Downloading contents from %s into %s", seedUrl, tmpZipFile)); + + final FileOutputStream fos = new FileOutputStream(tmpZipFile); + int length = IOUtils.copy(url.openStream(), fos); + + fos.close(); + + getLog().info(format("%d bytes downloaded. Unpacking into %s", length, outputDirectory)); + + unpackZip(tmpZipFile); + } catch (Exception e) { + getLog().info("Oops", e); + + throw new MojoExecutionException("Failure when running: ", e); + } + } + + private void unpackZip(File tmpZipFile) throws IOException { + ZipInputStream zis = + new ZipInputStream(new FileInputStream(tmpZipFile)); + //get the zipped file list entry + ZipEntry ze = zis.getNextEntry(); + + while(ze!=null){ + if (ze.isDirectory()) { + ze = zis.getNextEntry(); + continue; + } + + String fileName = stripLeadingPath(ze.getName()); + File newFile = new File(outputDirectory + File.separator + fileName); + + new File(newFile.getParent()).mkdirs(); + + FileOutputStream fos = new FileOutputStream(newFile); + + IOUtils.copy(zis, fos); + + fos.close(); + ze = zis.getNextEntry(); + } + + zis.closeEntry(); + zis.close(); + } + + private String stripLeadingPath(String name) { + LinkedList elements = new LinkedList<>(asList(name.split("/"))); + + elements.pop(); + + return join(elements.iterator(), '/'); + } +} From 564f4b61e40b99f8ee89f40bcd1570d1a3ad1e0d Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 04:59:21 -0600 Subject: [PATCH 028/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0477ea8f9..7b3905ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.6-SNAPSHOT + 0.0.6 3.1.1 From fe57867205ae4e689a2302e839b1c7acaee9f87a Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 04:59:23 -0600 Subject: [PATCH 029/256] [maven-release-plugin] copy for tag jbake-maven-plugin-0.0.6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 13a119f53..24dc6ec62 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ a4cc0a5a7e191369db77919f9bb1424693f0ec8e jbake-maven-plugin-0.0.2 dac515355fb76185faba67020f44735a00e9fdd6 jbake-maven-plugin-0.0.3 3cefc1a3c056ef859960b0cdcc0ceca49bfbc9da jbake-maven-plugin-0.0.4 cf9b1156b7ca9818a11814b19274fec23109c880 jbake-maven-plugin-0.0.5 +d2a88144f8c8b75504a6fafdce28eccc74e488cf jbake-maven-plugin-0.0.6 From 8be2128f611875c0f61d487180e40d84580fcdbb Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 25 Feb 2014 04:59:24 -0600 Subject: [PATCH 030/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b3905ac8..68e4ce35c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.6 + 0.0.7-SNAPSHOT 3.1.1 From 8e30720bed15634380e88b7d6ac8178e72b11098 Mon Sep 17 00:00:00 2001 From: ybonnel Date: Tue, 1 Jul 2014 11:25:18 +0200 Subject: [PATCH 031/256] Upgrade jbake to 2.3.0 --- pom.xml | 2 +- .../java/br/com/ingenieux/mojo/jbake/GenerateMojo.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68e4ce35c..9b209c051 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.jbake jbake-core - 2.2.1 + 2.3.0 org.apache.maven diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 2f1e55ce0..df002b28a 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -40,10 +40,16 @@ public class GenerateMojo extends AbstractMojo { */ @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) protected File inputDirectory; + + /** + * Set if cache is present or clear + */ + @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) + protected boolean isClearCache; public void execute() throws MojoExecutionException { try { - Oven oven = new Oven(inputDirectory, outputDirectory); + Oven oven = new Oven(inputDirectory, outputDirectory, isClearCache); oven.setupPaths(); oven.bake(); From 6598eb9e4db1498b578f2a11d2ac1f26f2456a7d Mon Sep 17 00:00:00 2001 From: ybonnel Date: Tue, 1 Jul 2014 11:57:19 +0200 Subject: [PATCH 032/256] Add livereload for inline goal --- pom.xml | 9 ++++++ .../com/ingenieux/mojo/jbake/InlineMojo.java | 30 +++++++++++++++++++ .../com/ingenieux/mojo/jbake/WatchMojo.java | 7 +++++ 3 files changed, 46 insertions(+) diff --git a/pom.xml b/pom.xml index 68e4ce35c..6eb10d202 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,10 @@ + + net.alchim31 + livereload-jvm + org.apache.maven maven-plugin-api @@ -121,6 +125,11 @@ + + net.alchim31 + livereload-jvm + 0.2.0 + org.jbake jbake-core diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index df2d6435a..78bde29ff 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -16,6 +16,8 @@ * limitations under the License. */ +import net_alchim31_livereload.LRServer; +import org.apache.commons.lang.BooleanUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -25,6 +27,10 @@ import org.vertx.java.platform.Verticle; import java.io.File; +import java.nio.file.FileSystems; +import java.nio.file.Path; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; /** * Runs jbake on a folder while watching and serving a folder with it @@ -49,7 +55,14 @@ public class InlineMojo extends WatchMojo { @Parameter(property = "jbake.port", defaultValue = "8080") private Integer port; + /** + * Use livereload. + */ + @Parameter(property = "jbake.livereload", defaultValue = "true") + private Boolean livereload; + Server server = new Server(); + LRServer lrServer; class Server extends Verticle { { @@ -66,7 +79,9 @@ public void handle(HttpServerRequest req) { if (new File(outputDirectory + file).isDirectory()) { req.response().setStatusCode(301).putHeader("Location", file + "/").close(); } else { + refreshLock.readLock().lock(); req.response().sendFile(outputDirectory.getAbsolutePath() + file); + refreshLock.readLock().unlock(); } } }).listen(port, listenAddress); @@ -74,10 +89,25 @@ public void handle(HttpServerRequest req) { } protected void stopServer() { + if (lrServer != null) { + try { + lrServer.stop(); + } catch (Exception e) { + e.printStackTrace(); + } + } server.stop(); } protected void initServer() throws MojoExecutionException { server.start(); + if (BooleanUtils.isTrue(livereload)) { + lrServer = new LRServer(35729, outputDirectory.toPath()); + try { + lrServer.start(); + } catch (Exception e) { + e.printStackTrace(); + } + } } } diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java index 38d672128..b44897ccd 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java @@ -24,12 +24,17 @@ import java.io.InputStreamReader; import java.nio.file.Paths; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; /** * Runs jbake on a folder while watching for changes */ @Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false) public class WatchMojo extends GenerateMojo { + + ReadWriteLock refreshLock = new ReentrantReadWriteLock(); + public void execute() throws MojoExecutionException { super.execute(); @@ -65,9 +70,11 @@ public void run() { if (Boolean.FALSE.equals(result)) { Thread.sleep(1000); } else if (Boolean.TRUE.equals(result)) { + refreshLock.writeLock().lock(); getLog().info("Refreshing"); super.execute(); + refreshLock.writeLock().unlock(); } else if (null == result) { break; } From a8967d93b2b266d6b6c733c3a509c0565e2645e6 Mon Sep 17 00:00:00 2001 From: ybonnel Date: Wed, 2 Jul 2014 10:50:14 +0200 Subject: [PATCH 033/256] Shutdown OrientDB to avoid error message on maven build --- src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java | 6 ++++++ src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index df002b28a..fce0f0892 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -16,6 +16,7 @@ * limitations under the License. */ +import com.orientechnologies.orient.core.Orient; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -53,10 +54,15 @@ public void execute() throws MojoExecutionException { oven.setupPaths(); oven.bake(); + shutdownDatabase(); } catch (Exception e) { getLog().info("Oops", e); throw new MojoExecutionException("Failure when running: ", e); } } + + protected void shutdownDatabase() { + Orient.instance().shutdown(); + } } diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java index 38d672128..fefe78cab 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java @@ -17,6 +17,7 @@ */ import br.com.ingenieux.mojo.jbake.util.DirWatcher; +import com.orientechnologies.orient.core.Orient; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -80,6 +81,7 @@ public void run() { getLog().info("Finishing"); stopServer(); + Orient.instance().shutdown(); } } @@ -88,4 +90,8 @@ protected void stopServer() { protected void initServer() throws MojoExecutionException { } + + @Override + protected void shutdownDatabase() { + } } From 1c3354efa27b7189e7bf470fb37099e9fd5eeb12 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 1 Aug 2014 10:38:55 -0300 Subject: [PATCH 034/256] Minor tweaks to avoid excess re-parsing --- .../ingenieux/mojo/jbake/GenerateMojo.java | 64 +++++---- .../com/ingenieux/mojo/jbake/WatchMojo.java | 126 +++++++++--------- .../ingenieux/mojo/jbake/util/DirWatcher.java | 30 ++--- 3 files changed, 103 insertions(+), 117 deletions(-) diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index fce0f0892..19442ba41 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -16,7 +16,6 @@ * limitations under the License. */ -import com.orientechnologies.orient.core.Orient; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -30,39 +29,38 @@ */ @Mojo(name = "generate", requiresProject = false) public class GenerateMojo extends AbstractMojo { - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.build.directory}/${project.build.finalName}", required = true) - protected File outputDirectory; - - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) - protected File inputDirectory; - /** - * Set if cache is present or clear - */ - @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) - protected boolean isClearCache; - - public void execute() throws MojoExecutionException { - try { - Oven oven = new Oven(inputDirectory, outputDirectory, isClearCache); - - oven.setupPaths(); - oven.bake(); - shutdownDatabase(); - } catch (Exception e) { - getLog().info("Oops", e); - - throw new MojoExecutionException("Failure when running: ", e); - } - } + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.outputDirectory", + defaultValue = "${project.build.directory}/${project.build.finalName}", + required = true) + protected File outputDirectory; - protected void shutdownDatabase() { - Orient.instance().shutdown(); + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", + required = true) + protected File inputDirectory; + + /** + * Set if cache is present or clear + */ + @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) + protected boolean isClearCache; + + public void execute() throws MojoExecutionException { + try { + Oven oven = new Oven(inputDirectory, outputDirectory); + + oven.setupPaths(); + oven.bake(); + } catch (Exception e) { + getLog().info("Oops", e); + + throw new MojoExecutionException("Failure when running: ", e); } + } } diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java index fefe78cab..1ae90b507 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java @@ -16,8 +16,6 @@ * limitations under the License. */ -import br.com.ingenieux.mojo.jbake.util.DirWatcher; -import com.orientechnologies.orient.core.Orient; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; @@ -26,72 +24,72 @@ import java.nio.file.Paths; import java.util.concurrent.atomic.AtomicBoolean; +import br.com.ingenieux.mojo.jbake.util.DirWatcher; + /** * Runs jbake on a folder while watching for changes */ @Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false) public class WatchMojo extends GenerateMojo { - public void execute() throws MojoExecutionException { - super.execute(); - - getLog().info( - "Now listening for changes on path " + inputDirectory.getPath()); - - initServer(); - - try { - final AtomicBoolean done = new AtomicBoolean(false); - final BufferedReader reader = new BufferedReader( - new InputStreamReader(System.in)); - - (new Thread() { - @Override - public void run() { - try { - getLog().info("Running. Hit to finish"); - reader.readLine(); - } catch (Exception exc) { - } finally { - done.set(true); - } - } - }).start(); - - DirWatcher dirWatcher = new DirWatcher(Paths.get(inputDirectory - .getPath())); - - do { - Boolean result = dirWatcher.processEvents(); - - if (Boolean.FALSE.equals(result)) { - Thread.sleep(1000); - } else if (Boolean.TRUE.equals(result)) { - getLog().info("Refreshing"); - - super.execute(); - } else if (null == result) { - break; - } - } while (!done.get()); - } catch (Exception exc) { - getLog().info("Oops", exc); - - throw new MojoExecutionException("Oops", exc); - } finally { - getLog().info("Finishing"); - - stopServer(); - Orient.instance().shutdown(); - } - } - - protected void stopServer() { - } - - protected void initServer() throws MojoExecutionException { - } - - @Override - protected void shutdownDatabase() { + + public void execute() throws MojoExecutionException { + super.execute(); + + getLog().info( + "Now listening for changes on path " + inputDirectory.getPath()); + + initServer(); + + try { + final AtomicBoolean done = new AtomicBoolean(false); + final BufferedReader reader = new BufferedReader( + new InputStreamReader(System.in)); + + (new Thread() { + @Override + public void run() { + try { + getLog().info("Running. Hit to finish"); + reader.readLine(); + } catch (Exception exc) { + } finally { + done.set(true); + } + } + }).start(); + + DirWatcher dirWatcher = new DirWatcher(Paths.get(inputDirectory + .getPath())); + + Long lastProcessed = Long.valueOf(System.currentTimeMillis()); + + do { + Long result = dirWatcher.processEvents(); + + if (null == result) { + Thread.sleep(1000); + } else if (result >= lastProcessed) { + getLog().info("Refreshing"); + + super.execute(); + + lastProcessed = Long.valueOf(System.currentTimeMillis()); + } + } while (!done.get()); + } catch (Exception exc) { + getLog().info("Oops", exc); + + throw new MojoExecutionException("Oops", exc); + } finally { + getLog().info("Finishing"); + + stopServer(); } + } + + protected void stopServer() { + } + + protected void initServer() throws MojoExecutionException { + } } diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java b/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java index 42f839cd7..e10c9fb4a 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java @@ -1,11 +1,5 @@ package br.com.ingenieux.mojo.jbake.util; -import static java.nio.file.LinkOption.NOFOLLOW_LINKS; -import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE; -import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE; -import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY; -import static java.nio.file.StandardWatchEventKinds.OVERFLOW; - import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.FileVisitResult; @@ -21,6 +15,12 @@ import java.util.Map; import java.util.concurrent.TimeUnit; +import static java.nio.file.LinkOption.NOFOLLOW_LINKS; +import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE; +import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE; +import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY; +import static java.nio.file.StandardWatchEventKinds.OVERFLOW; + /** * Example to watch a directory (or tree) for changes to files. */ @@ -41,16 +41,6 @@ static WatchEvent cast(WatchEvent event) { private void register(Path dir) throws IOException { WatchKey key = dir.register(watcher, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY); - // if (trace) { - // Path prev = keys.get(key); - // if (prev == null) { - // System.out.format("register: %s\n", dir); - // } else { - // if (!dir.equals(prev)) { - // System.out.format("update: %s -> %s\n", prev, dir); - // } - // } - // } keys.put(key, dir); } @@ -83,17 +73,17 @@ public DirWatcher(Path dir) throws IOException { /** * Process all events for keys queued to the watcher */ - public Boolean processEvents() { + public Long processEvents() { // wait for key to be signalled WatchKey key; try { key = watcher.poll(1L, TimeUnit.SECONDS); } catch (InterruptedException x) { - return Boolean.FALSE; + return null; } if (null == key) - return Boolean.FALSE; + return null; Path dir = keys.get(key); if (dir == null) @@ -136,7 +126,7 @@ public Boolean processEvents() { } } - return Boolean.TRUE; + return Long.valueOf(System.currentTimeMillis()); } static void usage() { From ac2a343d9e02522bd9cf7d74d2e7d65e0725f193 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 1 Aug 2014 12:08:32 -0300 Subject: [PATCH 035/256] Updating Coordinates --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5b1e2dfac..e98f0dab6 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ github - https://bitbucket.org/ingenieux/jbake-maven-plugin/ + https://github.com/ingenieux/jbake-maven-plugin/ @@ -59,9 +59,9 @@ - scm:hg:http://bitbucket.org/ingenieux/jbake-maven-plugin - scm:hg:ssh://hg@bitbucket.org/ingenieux/jbake-maven-plugin - http://bitbucket.org/ingenieux/jbake-maven-plugin + scm:git:http://github.com/ingenieux/jbake-maven-plugin + scm:git:ssh://git@github.com/ingenieux/jbake-maven-plugin.git + http://github.com/ingenieux/jbake-maven-plugin From a0161942ff0c1aa6118b555ca18bd310e9fc2938 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 1 Aug 2014 12:11:42 -0300 Subject: [PATCH 036/256] Disabling javadoc validation --- pom.xml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e98f0dab6..8218be632 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.sonatype.oss @@ -12,7 +14,7 @@ 0.0.7-SNAPSHOT - 3.1.1 + 3.1.1 jbake-maven-plugin is a plugin to integrate JBake into your projects @@ -60,7 +62,8 @@ scm:git:http://github.com/ingenieux/jbake-maven-plugin - scm:git:ssh://git@github.com/ingenieux/jbake-maven-plugin.git + scm:git:ssh://git@github.com/ingenieux/jbake-maven-plugin.git + http://github.com/ingenieux/jbake-maven-plugin @@ -250,8 +253,19 @@ org.apache.maven.plugins - maven-site-plugin - 3.3 + maven-javadoc-plugin + 2.9 + + + attach-javadocs + + jar + + + -Xdoclint:none + + + From 49f4f6098753c83456cc2cfd11b210ff45c69a65 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 1 Aug 2014 12:12:28 -0300 Subject: [PATCH 037/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.7 --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8218be632..43e609cf4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 org.sonatype.oss @@ -11,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.7-SNAPSHOT + 0.0.7 3.1.1 From 0db97db4de47ca13fbcb49bcbfe5886a4773c28c Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Fri, 1 Aug 2014 12:12:38 -0300 Subject: [PATCH 038/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43e609cf4..4542bd425 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.7 + 0.0.8-SNAPSHOT 3.1.1 From a073b3fc60c1fe2487f6307e1bdafe3b455f7891 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Thu, 16 Oct 2014 16:40:08 -0300 Subject: [PATCH 039/256] Updating for 2.3.2 --- pom.xml | 2 +- src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4542bd425..2e37334bb 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ org.jbake jbake-core - 2.3.1 + 2.3.2 org.apache.maven diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java index 35f9ba301..2ad69f5e6 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java @@ -85,7 +85,7 @@ public void run() { } else if (result >= lastProcessed) { getLog().info("Refreshing"); - super.execute(); + super.reRender(); lastProcessed = Long.valueOf(System.currentTimeMillis()); } From 6fc33843320e0c596fb965ffd671b420fbef1bf2 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Thu, 16 Oct 2014 16:43:51 -0300 Subject: [PATCH 040/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e37334bb..3bca3e9eb 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.8-SNAPSHOT + 0.0.8 3.1.1 From c891f6685ae98f6e292dec3f2eacb5d196b9447c Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Thu, 16 Oct 2014 16:44:01 -0300 Subject: [PATCH 041/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bca3e9eb..3232bf34a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.8 + 0.0.9-SNAPSHOT 3.1.1 From d0367f2672e83e8127fe97e07a1c6dfccc235cb5 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 29 Dec 2014 10:29:30 -0300 Subject: [PATCH 042/256] Adding PR #7 for fixing #6 --- pom.xml | 1 - src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3232bf34a..331df58fa 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,6 @@ commons-io commons-io - 2.4 diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 2f5d8e233..8436a5834 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -75,6 +75,9 @@ protected void executeInternal() throws MojoExecutionException { protected void reRender() throws MojoExecutionException { try { + // TODO: Smells bad. A lot + Orient.instance().startup(); + // TODO: At some point, reuse Oven Oven oven = new Oven(inputDirectory, outputDirectory, isClearCache); From 03321f024bb92a9e8a00fc830311863810b72cfa Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 29 Dec 2014 10:30:18 -0300 Subject: [PATCH 043/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 331df58fa..b76b12e37 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.9-SNAPSHOT + 0.0.9 3.1.1 From 5a6e6afa826138c43e834391fe455dda25207d9d Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Mon, 29 Dec 2014 10:30:32 -0300 Subject: [PATCH 044/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b76b12e37..ec5e15b49 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.9 + 0.0.10-SNAPSHOT 3.1.1 From 4b61ebaad8069183878f4e40fd2da6b7cef3abdf Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Tue, 17 Mar 2015 16:24:16 -0500 Subject: [PATCH 045/256] Update ctor to compile against latest JBake --- pom.xml | 2 +- .../br/com/ingenieux/mojo/jbake/GenerateMojo.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ec5e15b49..243399e3f 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ org.jbake jbake-core - 2.3.2 + 2.3.3-SNAPSHOT org.apache.maven diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 8436a5834..81d9037cd 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -25,6 +25,10 @@ import org.jbake.app.Oven; import java.io.File; +import org.apache.commons.configuration.CompositeConfiguration; +import org.apache.commons.configuration.ConfigurationException; +import org.jbake.app.ConfigUtil; +import org.jbake.app.JBakeException; /** * Runs jbake on a folder @@ -77,9 +81,16 @@ protected void reRender() throws MojoExecutionException { try { // TODO: Smells bad. A lot Orient.instance().startup(); + + final CompositeConfiguration config; + try { + config = ConfigUtil.load(inputDirectory); + } catch (final ConfigurationException e) { + throw new JBakeException("Configuration error: " + e.getMessage(), e); + } // TODO: At some point, reuse Oven - Oven oven = new Oven(inputDirectory, outputDirectory, isClearCache); + Oven oven = new Oven(inputDirectory, outputDirectory, config, isClearCache); oven.setupPaths(); From e60195d21a2422206f1fa6569fcb99ef9d70da7a Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 24 Apr 2015 08:41:38 -0500 Subject: [PATCH 046/256] Create new packaging type Add lifecycle mapping in components.xml to override the default and site lifecycles --- pom.xml | 7 ++++ .../resources/META-INF/plexus/components.xml | 40 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/main/resources/META-INF/plexus/components.xml diff --git a/pom.xml b/pom.xml index 243399e3f..46a0f58ac 100644 --- a/pom.xml +++ b/pom.xml @@ -201,6 +201,13 @@ + + + src/main/resources + true + + + org.kuali.maven.wagons diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml new file mode 100644 index 000000000..de378a50b --- /dev/null +++ b/src/main/resources/META-INF/plexus/components.xml @@ -0,0 +1,40 @@ + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + jbake + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + + ${project.groupId}:${project.artifactId}:${project.version}:generate + + + + + + + + + + + site + + + + ${project.groupId}:${project.artifactId}:${project.version}:generate + + + + + + + + + + \ No newline at end of file From 8551f2d14ce6b2d06498e138c1e342498f091db6 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 24 Apr 2015 08:51:47 -0500 Subject: [PATCH 047/256] Downgrade JBake version to most recent published --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46a0f58ac..7ca7f9616 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ org.jbake jbake-core - 2.3.3-SNAPSHOT + 2.3.2 org.apache.maven From dbc45b17f76fa5453428c9854eb0028bb6e106b9 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 24 Apr 2015 09:03:04 -0500 Subject: [PATCH 048/256] Revert "Downgrade JBake version to most recent published" This reverts commit 8551f2d14ce6b2d06498e138c1e342498f091db6. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ca7f9616..46a0f58ac 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ org.jbake jbake-core - 2.3.2 + 2.3.3-SNAPSHOT org.apache.maven From 666c26217e7de2122f44334039b5b780048aaa22 Mon Sep 17 00:00:00 2001 From: Philip Graf Date: Mon, 31 Aug 2015 00:17:02 +0200 Subject: [PATCH 049/256] Override JBake properties from plugin configuration This change allows to override JBake properties or define custom properties which can be used in the templates, e.g.: br.com.ingenieux jbake-maven-plugin ... true bar To make this possible an update to JBake 2.4.0 was necessary. This fixes #3 and resolves #11. --- pom.xml | 2 +- .../ingenieux/mojo/jbake/GenerateMojo.java | 25 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ec5e15b49..714329ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ org.jbake jbake-core - 2.3.2 + 2.4.0 org.apache.maven diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 8436a5834..335b7e830 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -18,13 +18,19 @@ 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; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.jbake.app.ConfigUtil; import org.jbake.app.Oven; import java.io.File; +import java.util.HashMap; +import java.util.Map; /** * Runs jbake on a folder @@ -53,6 +59,15 @@ public class GenerateMojo extends AbstractMojo { @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) protected boolean isClearCache; + /** + * Custom configuration properties. + * These properties override the properties in jbake.properties. + * In the templates the properties can be accessed using the prefix config. + * e.g. config.foo for the property <foo>bar</foo>. + */ + @Parameter(required = false) + protected Map properties = new HashMap<>(); + public final void execute() throws MojoExecutionException { try { executeInternal(); @@ -79,7 +94,7 @@ protected void reRender() throws MojoExecutionException { Orient.instance().startup(); // TODO: At some point, reuse Oven - Oven oven = new Oven(inputDirectory, outputDirectory, isClearCache); + Oven oven = new Oven(inputDirectory, outputDirectory, createConfiguration(), isClearCache); oven.setupPaths(); @@ -90,4 +105,12 @@ protected void reRender() throws MojoExecutionException { throw new MojoExecutionException("Failure when running: ", e); } } + + private CompositeConfiguration createConfiguration() throws ConfigurationException { + final CompositeConfiguration config = new CompositeConfiguration(); + config.addConfiguration(new MapConfiguration(properties)); + config.addConfiguration(ConfigUtil.load(inputDirectory)); + return config; + } + } From 3e7003645f89cca14cb21c7ae1d768b500f2bcd2 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:22:35 -0500 Subject: [PATCH 050/256] Interim Commit - pom updates + sparkjava --- pom.xml | 75 +++++++------------ .../com/ingenieux/mojo/jbake/InlineMojo.java | 44 ++++------- 2 files changed, 39 insertions(+), 80 deletions(-) diff --git a/pom.xml b/pom.xml index ec5e15b49..6928d0f84 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 org.sonatype.oss oss-parent - 7 + 9 br.com.ingenieux @@ -76,6 +78,10 @@ + + com.sparkjava + spark-core + net.alchim31 livereload-jvm @@ -109,14 +115,6 @@ org.codehaus.plexus plexus-utils - - io.vertx - vertx-core - - - io.vertx - vertx-platform - commons-io commons-io @@ -133,12 +131,12 @@ org.jbake jbake-core - 2.3.2 + 2.4.0 org.apache.maven maven-plugin-api - 3.0.4 + 3.3.9 commons-lang @@ -153,28 +151,28 @@ org.apache.maven.plugin-testing maven-plugin-testing-harness - 2.0-alpha-1 + 3.3.0 test log4j log4j - 1.2.12 + 1.2.17 org.apache.maven maven-settings - 3.0.4 + 3.3.9 org.apache.maven maven-core - 3.0.4 + 3.3.9 org.apache.maven.plugin-tools maven-plugin-annotations - 3.2 + 3.4 provided @@ -185,17 +183,12 @@ org.codehaus.plexus plexus-utils - 3.0.1 + 3.0.22 - io.vertx - vertx-core - 2.0.2-final - - - io.vertx - vertx-platform - 2.0.2-final + com.sparkjava + spark-core + 2.3 @@ -214,34 +207,18 @@ org.apache.maven.plugins maven-plugin-plugin - 3.2 - true + 3.4 1.7 true - - - mojo-descriptor - - descriptor - - - - - help-goal - - helpmojo - - - org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.3 1.7 @@ -251,7 +228,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 + 2.10.3 attach-javadocs @@ -273,22 +250,22 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.6 + 2.8.1 org.apache.maven.plugins maven-plugin-plugin - 3.2 + 3.4 org.apache.maven.plugins maven-javadoc-plugin - 2.9 + 2.10.3 org.apache.maven.plugins maven-jxr-plugin - 2.3 + 2.5 diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index 2f61682df..69952d6ed 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -19,14 +19,13 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.vertx.java.core.Handler; -import org.vertx.java.core.VertxFactory; -import org.vertx.java.core.http.HttpServerRequest; -import org.vertx.java.platform.Verticle; import java.io.File; +import static spark.Spark.*; + import net_alchim31_livereload.LRServer; +import spark.Spark; /** * Runs jbake on a folder while watching and serving a folder with it @@ -58,33 +57,8 @@ public class InlineMojo extends WatchMojo { @Parameter(property = "jbake.livereload", defaultValue = "true") private Boolean livereload; - Server server = new Server(); - LRServer lrServer; - class Server extends Verticle { - - { - vertx = VertxFactory.newVertx(); - } - - @Override - public void start() { - vertx.createHttpServer().requestHandler(new Handler() { - @Override - public void handle(HttpServerRequest req) { - String file = req.path().endsWith("/") ? req.path() + indexFile : req.path(); - - if (new File(outputDirectory + file).isDirectory()) { - req.response().setStatusCode(301).putHeader("Location", file + "/").close(); - } else { - req.response().sendFile(outputDirectory.getAbsolutePath() + file); - } - } - }).listen(port, listenAddress); - } - } - protected void stopServer() throws MojoExecutionException { if (lrServer != null) { try { @@ -93,11 +67,17 @@ protected void stopServer() throws MojoExecutionException { throw new MojoExecutionException("LiveReload Failure", e); } } - server.stop(); + + stop(); } protected void initServer() throws MojoExecutionException { - server.start(); + externalStaticFileLocation(outputDirectory.getPath()); + + ipAddress(listenAddress); + port(this.port); + + if (Boolean.TRUE.equals(livereload)) { lrServer = new LRServer(35729, outputDirectory.toPath()); @@ -107,5 +87,7 @@ protected void initServer() throws MojoExecutionException { throw new MojoExecutionException("LiveReload Failure", e); } } + + awaitInitialization(); } } From 7a160497848e786d9fefdd6c4b595667275d231b Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:38:14 -0500 Subject: [PATCH 051/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.1.0 --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6928d0f84..9fa805916 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 org.sonatype.oss @@ -11,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.0.10-SNAPSHOT + 0.1.0 3.1.1 From d4096ef34ff0f9c68c9966a5888cdcbb0e4d7d8d Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:38:18 -0500 Subject: [PATCH 052/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9fa805916..9f957f711 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.1.0 + 0.1.1-SNAPSHOT 3.1.1 From b4ae3fc0615be070f7160116133c303f975c7a58 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:40:13 -0500 Subject: [PATCH 053/256] Bumping versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9f957f711..8cda0fc2f 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ 3.4 - 1.7 + 1.8 true @@ -219,8 +219,8 @@ 3.3 - 1.7 - 1.7 + 1.8 + 1.8 From 7db71a098b07db1ff322164fdcb87a5c6d3c68f7 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:47:48 -0500 Subject: [PATCH 054/256] Fixing configuration --- .../br/com/ingenieux/mojo/jbake/GenerateMojo.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index 4847a436d..be570273c 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -81,13 +81,6 @@ protected void reRender() throws MojoExecutionException { try { // TODO: Smells bad. A lot Orient.instance().startup(); - - final CompositeConfiguration config; - try { - config = ConfigUtil.load(inputDirectory); - } catch (final ConfigurationException e) { - throw new JBakeException("Configuration error: " + e.getMessage(), e); - } // TODO: At some point, reuse Oven Oven oven = new Oven(inputDirectory, outputDirectory, createConfiguration(), isClearCache); @@ -105,10 +98,10 @@ protected void reRender() throws MojoExecutionException { protected CompositeConfiguration createConfiguration() throws ConfigurationException { final CompositeConfiguration config = new CompositeConfiguration(); - config.addConfiguration(new MapConfiguration(this.getPluginContext())); - config.addConfiguration(ConfigUtil.load(inputDirectory)); + config.addConfiguration(new MapConfiguration(this.getPluginContext())); + return config; } From 1701bb64f62742fce0132bbc96f1879736fbfb80 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:51:01 -0500 Subject: [PATCH 055/256] [maven-release-plugin] prepare release jbake-maven-plugin-0.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cda0fc2f..d640f7dce 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.1.1-SNAPSHOT + 0.2.0 3.1.1 From cc130add8ce8cd7d143b5b35de9a20100898ce54 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 23 Feb 2016 04:51:07 -0500 Subject: [PATCH 056/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d640f7dce..e55bea7a9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ br.com.ingenieux jbake-maven-plugin maven-plugin - 0.2.0 + 0.3.0-SNAPSHOT 3.1.1 From 37f6d2395e90a883252214e8197c86206722c9e3 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 10 Apr 2016 04:56:54 -0500 Subject: [PATCH 057/256] Updates --- pom.xml | 37 ++++++++++++++---- .../ingenieux/mojo/jbake/GenerateMojo.java | 9 ++++- .../com/ingenieux/mojo/jbake/InlineMojo.java | 38 +++---------------- 3 files changed, 41 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index e55bea7a9..4ed905594 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.sonatype.oss @@ -81,8 +83,12 @@ spark-core - net.alchim31 - livereload-jvm + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-server org.apache.maven @@ -117,15 +123,20 @@ commons-io commons-io + + org.freemarker + freemarker + 2.3.22 + + + org.asciidoctor + asciidoctorj + 1.5.2 + - - net.alchim31 - livereload-jvm - 0.2.0 - org.jbake jbake-core @@ -188,6 +199,16 @@ spark-core 2.3 + + org.eclipse.jetty + jetty-util + 9.3.2.v20150730 + + + org.eclipse.jetty + jetty-server + 9.3.2.v20150730 + diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java index be570273c..4f41b6ff1 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java @@ -25,6 +25,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; 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; @@ -34,8 +36,11 @@ /** * Runs jbake on a folder */ -@Mojo(name = "generate", requiresProject = false) +@Mojo(name = "generate", requiresProject = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) public class GenerateMojo extends AbstractMojo { + @Parameter(defaultValue="${project}") + protected MavenProject project; + /** * Location of the Output Directory. */ @@ -100,7 +105,7 @@ protected CompositeConfiguration createConfiguration() throws ConfigurationExcep config.addConfiguration(ConfigUtil.load(inputDirectory)); - config.addConfiguration(new MapConfiguration(this.getPluginContext())); + config.addConfiguration(new MapConfiguration(this.project.getProperties())); return config; } diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index 69952d6ed..b309dc1d8 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -20,12 +20,11 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import java.io.File; - -import static spark.Spark.*; - -import net_alchim31_livereload.LRServer; -import spark.Spark; +import static spark.Spark.awaitInitialization; +import static spark.Spark.externalStaticFileLocation; +import static spark.Spark.ipAddress; +import static spark.Spark.port; +import static spark.Spark.stop; /** * Runs jbake on a folder while watching and serving a folder with it @@ -51,23 +50,7 @@ public class InlineMojo extends WatchMojo { @Parameter(property = "jbake.port", defaultValue = "8080") private Integer port; - /** - * Use livereload. - */ - @Parameter(property = "jbake.livereload", defaultValue = "true") - private Boolean livereload; - - LRServer lrServer; - protected void stopServer() throws MojoExecutionException { - if (lrServer != null) { - try { - lrServer.stop(); - } catch (Exception e) { - throw new MojoExecutionException("LiveReload Failure", e); - } - } - stop(); } @@ -77,17 +60,6 @@ protected void initServer() throws MojoExecutionException { ipAddress(listenAddress); port(this.port); - - - if (Boolean.TRUE.equals(livereload)) { - lrServer = new LRServer(35729, outputDirectory.toPath()); - try { - lrServer.start(); - } catch (Exception e) { - throw new MojoExecutionException("LiveReload Failure", e); - } - } - awaitInitialization(); } } From 3342433d458906da86275df439e2781bec18f30a Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 10 Apr 2016 12:21:31 -0500 Subject: [PATCH 058/256] Lifecycle --- .../resources/META-INF/plexus/components.xml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml index de378a50b..50b1ab4c8 100644 --- a/src/main/resources/META-INF/plexus/components.xml +++ b/src/main/resources/META-INF/plexus/components.xml @@ -9,26 +9,14 @@ default - - - - ${project.groupId}:${project.artifactId}:${project.version}:generate - - - - - - - + ${project.groupId}:${project.artifactId}:${project.version}:generate site - - ${project.groupId}:${project.artifactId}:${project.version}:generate - + ${project.groupId}:${project.artifactId}:${project.version}:generate From 55970ca415279c6ecfd5b804829f42078fe1650a Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Sun, 10 Apr 2016 12:43:59 -0500 Subject: [PATCH 059/256] Trying to fix bom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ed905594..1dd2725c9 100644 --- a/pom.xml +++ b/pom.xml @@ -288,4 +288,4 @@ - + \ No newline at end of file From 08c6ede7a516e5665ffb3005c76589e2cea16295 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Thu, 28 Apr 2016 17:23:47 -0500 Subject: [PATCH 060/256] Minor changes --- pom.xml | 97 +++++++++++-------- .../com/ingenieux/mojo/jbake/InlineMojo.java | 3 + 2 files changed, 57 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index 1dd2725c9..290785855 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -221,47 +221,58 @@ - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.4 - - - 1.8 - - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - -Xdoclint:none - - - - - - + + + org.apache.maven.plugins + maven-plugin-plugin + 3.4 + + jbake + + 1.8 + + true + + + + default-descriptor + process-classes + + + help-goal + + helpmojo + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + -Xdoclint:none + + + + + diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java index b309dc1d8..e11d85c79 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java @@ -22,6 +22,7 @@ import static spark.Spark.awaitInitialization; import static spark.Spark.externalStaticFileLocation; +import static spark.Spark.init; import static spark.Spark.ipAddress; import static spark.Spark.port; import static spark.Spark.stop; @@ -60,6 +61,8 @@ protected void initServer() throws MojoExecutionException { ipAddress(listenAddress); port(this.port); + init(); + awaitInitialization(); } } From 6986fce226df249cb900815d8c50cb51425f09f9 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 13:36:59 +0100 Subject: [PATCH 061/256] [maven-release-plugin] prepare release v0.2.0 --- pom.xml | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 290785855..40fb4dade 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 org.sonatype.oss @@ -8,17 +6,18 @@ 9 - br.com.ingenieux + org.jbake jbake-maven-plugin + 0.2.0 maven-plugin - 0.3.0-SNAPSHOT 3.1.1 - - jbake-maven-plugin is a plugin to integrate JBake into your projects - http://docs.ingenieux.com.br/jbake-maven-plugin/ + + jbake-maven-plugin + jbake-maven-plugin is a Maven plugin allowing you to integrate JBake into your projects build + http://jbake.org 2013 @@ -28,17 +27,9 @@ - - - docs.ingenieux.com.br - ingenieux Beanstalker Site - s3://docs.ingenieux.com.br/projects/jbake-maven-plugin/ - - - - ingenieux - http://ingenieux.com.br + JBake + http://jbake.org @@ -50,8 +41,8 @@ - github - https://github.com/ingenieux/jbake-maven-plugin/ + GitHub Issues + https://github.com/jbake-org/jbake-maven-plugin/issues @@ -61,10 +52,9 @@ - scm:git:http://github.com/ingenieux/jbake-maven-plugin - scm:git:ssh://git@github.com/ingenieux/jbake-maven-plugin.git - - http://github.com/ingenieux/jbake-maven-plugin + scm:git:http://github.com/jbake-org/jbake-maven-plugin + scm:git:ssh://git@github.com/jbake-org/jbake-maven-plugin.git + http://github.com/jbake-org/jbake-maven-plugin @@ -213,13 +203,13 @@ - + From ccf4458c16096b2b45543c8b388f3a961fdd7fc5 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 13:39:31 +0100 Subject: [PATCH 062/256] [maven-release-plugin] prepare release v0.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40fb4dade..4c00908bc 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ scm:git:http://github.com/jbake-org/jbake-maven-plugin - scm:git:ssh://git@github.com/jbake-org/jbake-maven-plugin.git + scm:git:https://git@github.com/jbake-org/jbake-maven-plugin.git http://github.com/jbake-org/jbake-maven-plugin From 110ec36b6610929c4a617480356bfc8570ebc0ed Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 13:41:23 +0100 Subject: [PATCH 063/256] [maven-release-plugin] prepare release v0.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c00908bc..4f5459720 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ scm:git:http://github.com/jbake-org/jbake-maven-plugin - scm:git:https://git@github.com/jbake-org/jbake-maven-plugin.git + scm:git:https://github.com/jbake-org/jbake-maven-plugin.git http://github.com/jbake-org/jbake-maven-plugin From b2de3db99f561ae3cd0f4882ed80944892eed763 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 13:41:29 +0100 Subject: [PATCH 064/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f5459720..547c24b14 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.2.0 + 0.2.1-SNAPSHOT maven-plugin From f63698702283372a7989e8e20dbdce51bc58c41e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 13:57:23 +0100 Subject: [PATCH 065/256] Updated package names to match published group id. --- .../mojo/jbake => org/jbake/maven}/GenerateMojo.java | 2 +- .../ingenieux/mojo/jbake => org/jbake/maven}/InlineMojo.java | 2 +- .../ingenieux/mojo/jbake => org/jbake/maven}/SeedMojo.java | 2 +- .../ingenieux/mojo/jbake => org/jbake/maven}/WatchMojo.java | 5 ++--- .../mojo/jbake => org/jbake/maven}/util/DirWatcher.java | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) rename src/main/java/{br/com/ingenieux/mojo/jbake => org/jbake/maven}/GenerateMojo.java (98%) rename src/main/java/{br/com/ingenieux/mojo/jbake => org/jbake/maven}/InlineMojo.java (98%) rename src/main/java/{br/com/ingenieux/mojo/jbake => org/jbake/maven}/SeedMojo.java (99%) rename src/main/java/{br/com/ingenieux/mojo/jbake => org/jbake/maven}/WatchMojo.java (97%) rename src/main/java/{br/com/ingenieux/mojo/jbake => org/jbake/maven}/util/DirWatcher.java (97%) diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java similarity index 98% rename from src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java rename to src/main/java/org/jbake/maven/GenerateMojo.java index 4f41b6ff1..957a0f44d 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/GenerateMojo.java +++ b/src/main/java/org/jbake/maven/GenerateMojo.java @@ -1,4 +1,4 @@ -package br.com.ingenieux.mojo.jbake; +package org.jbake.maven; /* * Copyright 2013 ingenieux Labs diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java b/src/main/java/org/jbake/maven/InlineMojo.java similarity index 98% rename from src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java rename to src/main/java/org/jbake/maven/InlineMojo.java index e11d85c79..6f373a217 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/InlineMojo.java +++ b/src/main/java/org/jbake/maven/InlineMojo.java @@ -1,4 +1,4 @@ -package br.com.ingenieux.mojo.jbake; +package org.jbake.maven; /* * Copyright 2013 ingenieux Labs diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java b/src/main/java/org/jbake/maven/SeedMojo.java similarity index 99% rename from src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java rename to src/main/java/org/jbake/maven/SeedMojo.java index b04fc4b94..d92465e55 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/SeedMojo.java +++ b/src/main/java/org/jbake/maven/SeedMojo.java @@ -1,4 +1,4 @@ -package br.com.ingenieux.mojo.jbake; +package org.jbake.maven; /* * Copyright 2013 ingenieux Labs diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java b/src/main/java/org/jbake/maven/WatchMojo.java similarity index 97% rename from src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java rename to src/main/java/org/jbake/maven/WatchMojo.java index 2ad69f5e6..a3bd7be88 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/WatchMojo.java +++ b/src/main/java/org/jbake/maven/WatchMojo.java @@ -1,4 +1,4 @@ -package br.com.ingenieux.mojo.jbake; +package org.jbake.maven; /* * Copyright 2013 ingenieux Labs @@ -18,13 +18,12 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; +import org.jbake.maven.util.DirWatcher; import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicBoolean; -import br.com.ingenieux.mojo.jbake.util.DirWatcher; - import static org.apache.commons.lang.StringUtils.isBlank; /** diff --git a/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java b/src/main/java/org/jbake/maven/util/DirWatcher.java similarity index 97% rename from src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java rename to src/main/java/org/jbake/maven/util/DirWatcher.java index d46f49346..1c7a0602c 100644 --- a/src/main/java/br/com/ingenieux/mojo/jbake/util/DirWatcher.java +++ b/src/main/java/org/jbake/maven/util/DirWatcher.java @@ -1,4 +1,4 @@ -package br.com.ingenieux.mojo.jbake.util; +package org.jbake.maven.util; import org.apache.commons.io.monitor.FileAlterationListenerAdaptor; import org.apache.commons.io.monitor.FileAlterationMonitor; From dacbb81baa741d0f6ca9590f70a33e127a7faf07 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 14:08:11 +0100 Subject: [PATCH 066/256] Reverted change to version for tag. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 547c24b14..4f5459720 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.2.1-SNAPSHOT + 0.2.0 maven-plugin From 712e1340b583fbbbff1f995e7268a3fc70d1f42e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 14:09:44 +0100 Subject: [PATCH 067/256] Reverted version for tag. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 547c24b14..4f5459720 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.2.1-SNAPSHOT + 0.2.0 maven-plugin From d29993d12b3a25ee8f5a623cd2017a0d25fa7672 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 2 Jun 2017 21:49:56 +0100 Subject: [PATCH 068/256] Added README. --- README.asciidoc | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 README.asciidoc diff --git a/README.asciidoc b/README.asciidoc new file mode 100644 index 000000000..0d3d2acf0 --- /dev/null +++ b/README.asciidoc @@ -0,0 +1,36 @@ += JBake Maven Plugin +Jonathan Bullock +2017-06-02 +:idprefix: + +JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at +the following Maven coordinates: + +---- + + org.jbake + jbake-maven-plugin + 0.2.0 + +---- + +Special thanks must go to the original author of this plugin - Aldrin Leal[https://github.com/aldrinleal]. + +== Versioning + +The project adopts the http://semver.org[Semantic Versioning] spec to maintain an understandable backwards compatibility strategy. + +The version format is as follows: + +---- +..- @@ -130,7 +135,7 @@ org.jbake jbake-core - 2.4.0 + 2.5.1 org.apache.maven From 9a6e41c165185c90670b5c04692cfc0fcbbf8c0c Mon Sep 17 00:00:00 2001 From: rustamzh Date: Sun, 15 Apr 2018 14:04:08 +0600 Subject: [PATCH 076/256] fix #365 issue: add default 404 file generation --- .../main/java/org/jbake/app/ConfigUtil.java | 8 ++ .../src/main/java/org/jbake/app/Renderer.java | 10 +++ .../org/jbake/render/Error404Renderer.java | 27 ++++++ .../services/org.jbake.render.RenderingTool | 3 +- .../src/main/resources/default.properties | 6 ++ .../jbake/render/Error404RendererTest.java | 90 +++++++++++++++++++ .../fixture/freemarkerTemplates/error404.ftl | 8 ++ .../groovyMarkupTemplates/error404.tpl | 7 ++ .../fixture/groovyTemplates/error404.gsp | 4 + .../fixture/jadeTemplates/error404.jade | 5 ++ .../test/resources/fixture/jbake.properties | 1 + .../fixture/thymeleafTemplates/error404.thyme | 13 +++ 12 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 jbake-core/src/main/java/org/jbake/render/Error404Renderer.java create mode 100644 jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java create mode 100644 jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl create mode 100644 jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl create mode 100644 jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp create mode 100644 jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade create mode 100644 jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme diff --git a/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java b/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java index 8ae065bcc..03a4ff70d 100644 --- a/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java +++ b/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java @@ -101,6 +101,10 @@ public interface Keys { * Output filename for index, is only used when {@link #RENDER_INDEX} is true */ String INDEX_FILE = "index.file"; + /** + * Output filename for error 404 file, is only used when {@link #RENDER_ERROR404} is true + */ + String ERROR404_FILE = "error404.file"; /** * File extension to be used for all output files */ @@ -133,6 +137,10 @@ public interface Keys { * Flag indicating if tag index file should be generated */ String RENDER_TAGS_INDEX = "render.tagsindex"; + /** + * Flag indicating if error 404 file should be generated + */ + String RENDER_ERROR404= "render.error404"; /** * String used to separate the header from the body. */ diff --git a/jbake-core/src/main/java/org/jbake/app/Renderer.java b/jbake-core/src/main/java/org/jbake/app/Renderer.java index 4f89f98d0..77e3378d9 100644 --- a/jbake-core/src/main/java/org/jbake/app/Renderer.java +++ b/jbake-core/src/main/java/org/jbake/app/Renderer.java @@ -324,6 +324,16 @@ public void renderArchive(String archiveFile) throws Exception { render(new DefaultRenderingConfig(archiveFile, "archive")); } + /** + * Render an 404 file using the predefined template. + * + * @param errorFile The name of the output file + * @throws Exception if default rendering configuration is not loaded correctly + */ + public void renderError404(String errorFile) throws Exception { + render(new DefaultRenderingConfig(errorFile, "error404")); + } + /** * Render tag files using the supplied content. * diff --git a/jbake-core/src/main/java/org/jbake/render/Error404Renderer.java b/jbake-core/src/main/java/org/jbake/render/Error404Renderer.java new file mode 100644 index 000000000..44e09b1b2 --- /dev/null +++ b/jbake-core/src/main/java/org/jbake/render/Error404Renderer.java @@ -0,0 +1,27 @@ +package org.jbake.render; + +import java.io.File; + +import org.apache.commons.configuration.CompositeConfiguration; +import org.jbake.app.ConfigUtil.Keys; +import org.jbake.app.ContentStore; +import org.jbake.app.Renderer; +import org.jbake.template.RenderingException; + + +public class Error404Renderer implements RenderingTool { + + @Override + public int render(Renderer renderer, ContentStore db, File destination, File templatesPath, CompositeConfiguration config) throws RenderingException { + if (config.getBoolean(Keys.RENDER_ERROR404)) { + try { + renderer.renderError404(config.getString(Keys.ERROR404_FILE)); + return 1; + } catch (Exception e) { + throw new RenderingException(e); + } + } else { + return 0; + } + } +} diff --git a/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool b/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool index ff03c55c7..59a5fa822 100644 --- a/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool +++ b/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool @@ -3,4 +3,5 @@ org.jbake.render.DocumentsRenderer org.jbake.render.FeedRenderer org.jbake.render.IndexRenderer org.jbake.render.SitemapRenderer -org.jbake.render.TagsRenderer \ No newline at end of file +org.jbake.render.TagsRenderer +org.jbake.render.Error404Renderer \ No newline at end of file diff --git a/jbake-core/src/main/resources/default.properties b/jbake-core/src/main/resources/default.properties index 01a45d96f..95074bd44 100644 --- a/jbake-core/src/main/resources/default.properties +++ b/jbake-core/src/main/resources/default.properties @@ -10,6 +10,8 @@ template.folder=templates template.masterindex.file=index.ftl # filename of feed template file template.feed.file=feed.ftl +# filename of 404 error template file +template.error404.file=error404.ftl # filename of archive template file template.archive.file=archive.ftl # filename of tag template file @@ -32,6 +34,8 @@ render.index=true index.file=index.html # render feed file? render.feed=true +#render 404 page? +render.error404=true # character encoding MIME name used for rendering. # use one of http://www.iana.org/assignments/character-sets/character-sets.xhtml render.encoding=UTF-8 @@ -40,6 +44,8 @@ render.encoding=UTF-8 template.encoding=UTF-8 # filename to use for feed feed.file=feed.xml +# filename to use for 404 error +error404.file=404.html # render archive file? render.archive=true # filename to use for archive file diff --git a/jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java b/jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java new file mode 100644 index 000000000..b3cec8165 --- /dev/null +++ b/jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java @@ -0,0 +1,90 @@ +package org.jbake.render; + +import org.apache.commons.configuration.CompositeConfiguration; +import org.jbake.app.ContentStore; +import org.jbake.app.Renderer; +import org.jbake.render.support.MockCompositeConfiguration; +import org.jbake.template.RenderingException; +import org.junit.Test; + +import java.io.File; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.never; + +public class Error404RendererTest { + @Test + public void returnsZeroWhenConfigDoesNotRenderError404() throws RenderingException { + Error404Renderer renderer = new Error404Renderer(); + + CompositeConfiguration compositeConfiguration = new MockCompositeConfiguration().withDefaultBoolean(false); + ContentStore contentStore = mock(ContentStore.class); + + Renderer mockRenderer = mock(Renderer.class); + int renderResponse = renderer.render(mockRenderer, contentStore, + new File("fake"), new File("fake"), compositeConfiguration); + + assertThat(renderResponse).isEqualTo(0); + } + + @Test + public void doesNotRenderWhenConfigDoesNotRenderError404() throws Exception { + Error404Renderer renderer = new Error404Renderer(); + + CompositeConfiguration compositeConfiguration = new MockCompositeConfiguration().withDefaultBoolean(false); + ContentStore contentStore = mock(ContentStore.class); + Renderer mockRenderer = mock(Renderer.class); + + int renderResponse = renderer.render(mockRenderer, contentStore, + new File("fake"), new File("fake"), compositeConfiguration); + + verify(mockRenderer, never()).renderError404(anyString()); + } + + @Test + public void returnsOneWhenConfigRendersError404() throws RenderingException { + Error404Renderer renderer = new Error404Renderer(); + + CompositeConfiguration compositeConfiguration = new MockCompositeConfiguration().withDefaultBoolean(true); + ContentStore contentStore = mock(ContentStore.class); + + Renderer mockRenderer = mock(Renderer.class); + + int renderResponse = renderer.render(mockRenderer, contentStore, + new File("fake"), new File("fake"), compositeConfiguration); + + assertThat(renderResponse).isEqualTo(1); + } + + @Test + public void doesRenderWhenConfigDoesNotRenderError404() throws Exception { + Error404Renderer renderer = new Error404Renderer(); + + CompositeConfiguration compositeConfiguration = new MockCompositeConfiguration().withDefaultBoolean(true); + ContentStore contentStore = mock(ContentStore.class); + Renderer mockRenderer = mock(Renderer.class); + + int renderResponse = renderer.render(mockRenderer, contentStore, + new File("fake"), new File("fake"), compositeConfiguration); + + verify(mockRenderer, times(1)).renderError404("random string"); + } + + @Test(expected = RenderingException.class) + public void propogatesRenderingException() throws Exception { + Error404Renderer renderer = new Error404Renderer(); + + CompositeConfiguration compositeConfiguration = new MockCompositeConfiguration().withDefaultBoolean(true); + ContentStore contentStore = mock(ContentStore.class); + Renderer mockRenderer = mock(Renderer.class); + + doThrow(new Exception()).when(mockRenderer).renderError404(anyString()); + + int renderResponse = renderer.render(mockRenderer, contentStore, + new File("fake"), new File("fake"), compositeConfiguration); + + verify(mockRenderer, never()).renderError404("random string"); + } +} diff --git a/jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl b/jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl new file mode 100644 index 000000000..9fc79bae0 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl @@ -0,0 +1,8 @@ +<#include "header.ftl"> + + <#include "menu.ftl"> + +

404 Not found

+

The requested page is not found.

+ +<#include "footer.ftl"> \ No newline at end of file diff --git a/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl new file mode 100644 index 000000000..b8af2e0a0 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl @@ -0,0 +1,7 @@ +package fixture.groovyMarkupTemplates + +layout 'layout/main.tpl', + bodyContents: contents { + h1('404 Not found') + h2('The requested page is not found.') + } diff --git a/jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp b/jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp new file mode 100644 index 000000000..dc788c174 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp @@ -0,0 +1,4 @@ +%include "header.gsp"%> +

404 Not found

+

The requested page is not found.

+<%include "footer.gsp"%> \ No newline at end of file diff --git a/jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade b/jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade new file mode 100644 index 000000000..133ba0107 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade @@ -0,0 +1,5 @@ +extends layout.jade + +block content + h1 404 Not found + h2 The requested page is not found. \ No newline at end of file diff --git a/jbake-core/src/test/resources/fixture/jbake.properties b/jbake-core/src/test/resources/fixture/jbake.properties index ef678557d..a316aa78b 100644 --- a/jbake-core/src/test/resources/fixture/jbake.properties +++ b/jbake-core/src/test/resources/fixture/jbake.properties @@ -4,6 +4,7 @@ asset.folder=assets render.index=true index.file=index.html render.feed=true +render.error404=true feed.file=feed.xml render.archive=true render.encoding=UTF-8 diff --git a/jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme b/jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme new file mode 100644 index 000000000..7173f8c78 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme @@ -0,0 +1,13 @@ + + + + + +
+ +

404 Not found

+

The requested page is not found.

+
+ + \ No newline at end of file From fa50386f22089f4c624e214eaf8fff8b3f970d0b Mon Sep 17 00:00:00 2001 From: rustamzh Date: Mon, 16 Apr 2018 00:11:12 +0600 Subject: [PATCH 077/256] make error 404 non-default option --- jbake-core/src/main/resources/default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbake-core/src/main/resources/default.properties b/jbake-core/src/main/resources/default.properties index 95074bd44..9ed5b926e 100644 --- a/jbake-core/src/main/resources/default.properties +++ b/jbake-core/src/main/resources/default.properties @@ -35,7 +35,7 @@ index.file=index.html # render feed file? render.feed=true #render 404 page? -render.error404=true +render.error404=false # character encoding MIME name used for rendering. # use one of http://www.iana.org/assignments/character-sets/character-sets.xhtml render.encoding=UTF-8 From 58fa7d9d971119d003569befa756d4d28f21753d Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 22 Apr 2018 20:46:05 +0100 Subject: [PATCH 078/256] Fixes #5 Edited the incorrect opening tag. --- src/main/resources/META-INF/plexus/components.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml index 50b1ab4c8..b8cbddd62 100644 --- a/src/main/resources/META-INF/plexus/components.xml +++ b/src/main/resources/META-INF/plexus/components.xml @@ -9,7 +9,7 @@ default - ${project.groupId}:${project.artifactId}:${project.version}:generate + ${project.groupId}:${project.artifactId}:${project.version}:generate From 98cc1bd1fd5eaa97685818e1d85cf23ffd94ec3e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 22 Apr 2018 21:37:10 +0100 Subject: [PATCH 079/256] Fixes #8 Upgraded JBake dependency and cleaned up the rest declared. --- pom.xml | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index 9980b6aba..c1b90cb1f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,25 +66,11 @@ org.jbake jbake-core - - - org.eclipse.jetty - jetty-server - - com.sparkjava spark-core - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-server - org.apache.maven maven-plugin-api @@ -118,16 +104,6 @@ commons-io commons-io - @@ -135,7 +111,7 @@ org.jbake jbake-core - 2.5.1 + 2.6.1 org.apache.maven @@ -194,28 +170,10 @@ spark-core 2.3 - - org.eclipse.jetty - jetty-util - 9.3.2.v20150730 - - - org.eclipse.jetty - jetty-server - 9.3.2.v20150730 - - - org.apache.maven.plugins From d25bc69545fd6c9bdb15aabd7416e46a6ac3a91e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 23 Apr 2018 12:59:18 +0100 Subject: [PATCH 080/256] [maven-release-plugin] prepare release v0.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9980b6aba..4838ddd1b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.0-SNAPSHOT + 0.3.0 maven-plugin From 14f6b1074ddcf9e42cf4d4603850b72db22f3d18 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 23 Apr 2018 12:59:25 +0100 Subject: [PATCH 081/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4838ddd1b..4840eca6e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.0 + 0.4.0-SNAPSHOT maven-plugin From 88b3b0f02061312053c8182f5b73b427f0ada4d0 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 23 Apr 2018 13:12:30 +0100 Subject: [PATCH 082/256] [maven-release-plugin] prepare release v0.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ad9207f0..bdbf1256e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.4.0-SNAPSHOT + 0.3.1 maven-plugin From 17acfbbf976296db9dbce0adf072f7edfd5f6676 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 23 Apr 2018 13:12:36 +0100 Subject: [PATCH 083/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bdbf1256e..5ad9207f0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.1 + 0.4.0-SNAPSHOT maven-plugin From a4f74b355a67d698a22d2c8860449c6e7b9fd761 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 23 Apr 2018 13:28:25 +0100 Subject: [PATCH 084/256] Updated readme with details of goals. --- README.asciidoc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index 538a30a2e..eed9bc1ab 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,6 +1,6 @@ = JBake Maven Plugin Jonathan Bullock -2017-06-02 +2018-04-23 :idprefix: JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at @@ -10,12 +10,27 @@ the following Maven coordinates: org.jbake jbake-maven-plugin - 0.2.0 + 0.3.1 ---- Special thanks must go to the original author of this plugin - https://github.com/aldrinleal[Aldrin Leal]. +== Goals + +There are 4 goals provided by this plugin: + +* `jbake:seed` - seeds your project/site with example content and templates +* `jbake:generate` - bakes your project/site +* `jbake:watch` - watches to changes and bakes your site whenever a change is detected +* `jbake:inline` - bakes, watches and serves out content on http://localhost:8080[http://localhost:8080] + +You can also more details on each goal by running the help goal: + +---- +$ mvn jbake:help -Ddetail # -DgoalName=[seed|generate|watch|inline] +---- + == Versioning The project adopts the http://semver.org[Semantic Versioning] spec to maintain an understandable backwards compatibility strategy. From a998ccf97cf35854621ea874f25a0009553125be Mon Sep 17 00:00:00 2001 From: Konrad Windszus Date: Wed, 10 Oct 2018 13:12:29 +0200 Subject: [PATCH 085/256] Adjustments to make it compatible with JBake 2.6.2 This closes #16 --- pom.xml | 2 +- .../java/org/jbake/maven/GenerateMojo.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5ad9207f0..551cd0a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.jbake jbake-core - 2.6.1 + 2.6.2 org.apache.maven diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java index 957a0f44d..473aa7f45 100644 --- 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); } } From 1b4df424bf08d98e85eab0c3f6e7e29a5832b07c Mon Sep 17 00:00:00 2001 From: Daniel Schwering Date: Tue, 13 Nov 2018 12:39:55 +0100 Subject: [PATCH 086/256] Update to JBake 2.6.3 --- pom.xml | 4 ++-- .../java/org/jbake/maven/GenerateMojo.java | 24 ++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 5ad9207f0..5b169121d 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.jbake jbake-core - 2.6.1 + 2.6.3 org.apache.maven @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.4 + 3.6.0 jbake diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java index 957a0f44d..90ee7ba09 100644 --- 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; @@ -27,9 +26,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.ConfigUtil; +import org.jbake.app.configuration.DefaultJBakeConfiguration; +import org.jbake.app.configuration.JBakeConfiguration; import java.io.File; @@ -88,9 +88,7 @@ protected void reRender() throws MojoExecutionException { Orient.instance().startup(); // TODO: At some point, reuse Oven - Oven oven = new Oven(inputDirectory, outputDirectory, createConfiguration(), isClearCache); - - oven.setupPaths(); + Oven oven = new Oven(createConfiguration()); oven.bake(); } catch (Exception e) { @@ -100,14 +98,12 @@ protected void reRender() throws MojoExecutionException { } } - protected CompositeConfiguration createConfiguration() throws ConfigurationException { - final CompositeConfiguration config = new CompositeConfiguration(); - - config.addConfiguration(ConfigUtil.load(inputDirectory)); - - config.addConfiguration(new MapConfiguration(this.project.getProperties())); - - return config; + protected JBakeConfiguration createConfiguration() throws ConfigurationException { + DefaultJBakeConfiguration jBakeConfiguration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(inputDirectory); + jBakeConfiguration.getCompositeConfiguration().addConfiguration(new MapConfiguration(this.project.getProperties())); + jBakeConfiguration.setDestinationFolder(outputDirectory); + jBakeConfiguration.setClearCache(isClearCache); + return jBakeConfiguration; } } From f51050ffe3342f5b989cbaeec240ffbecb1e77ca Mon Sep 17 00:00:00 2001 From: Konrad Windszus Date: Fri, 16 Nov 2018 08:18:00 +0100 Subject: [PATCH 087/256] Fail build on baking errors This closes #13 --- src/main/java/org/jbake/maven/GenerateMojo.java | 16 +++++++++++++--- src/main/java/org/jbake/maven/WatchMojo.java | 3 ++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java index 473aa7f45..86cdbfbda 100644 --- a/src/main/java/org/jbake/maven/GenerateMojo.java +++ b/src/main/java/org/jbake/maven/GenerateMojo.java @@ -23,6 +23,7 @@ import org.apache.commons.configuration.MapConfiguration; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; @@ -57,13 +58,19 @@ public class GenerateMojo extends AbstractMojo { required = true) protected File inputDirectory; + /** + * Breaks the build when {@code true} and errors occur during baking in JBake oven. + */ + @Parameter(property = "jbake.failOnError", defaultValue = "true") + protected boolean failOnError; + /** * Set if cache is present or clear */ @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) protected boolean isClearCache; - public final void execute() throws MojoExecutionException { + public final void execute() throws MojoExecutionException, MojoFailureException { try { executeInternal(); } finally { @@ -79,11 +86,11 @@ protected final void closeQuietly() { } } - protected void executeInternal() throws MojoExecutionException { + protected void executeInternal() throws MojoExecutionException, MojoFailureException { reRender(); } - protected void reRender() throws MojoExecutionException { + protected void reRender() throws MojoExecutionException, MojoFailureException { try { // TODO: Smells bad. A lot Orient.instance().startup(); @@ -94,6 +101,9 @@ protected void reRender() throws MojoExecutionException { oven.setupPaths(); oven.bake(); + if (failOnError && !oven.getErrors().isEmpty()) { + throw new MojoFailureException("Baked with " + oven.getErrors().size() + " errors. Check output above for details!"); + } } catch (Exception e) { getLog().info("Oops", e); diff --git a/src/main/java/org/jbake/maven/WatchMojo.java b/src/main/java/org/jbake/maven/WatchMojo.java index a3bd7be88..6402af075 100644 --- a/src/main/java/org/jbake/maven/WatchMojo.java +++ b/src/main/java/org/jbake/maven/WatchMojo.java @@ -17,6 +17,7 @@ */ import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.jbake.maven.util.DirWatcher; @@ -32,7 +33,7 @@ @Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false) public class WatchMojo extends GenerateMojo { - public void executeInternal() throws MojoExecutionException { + public void executeInternal() throws MojoExecutionException, MojoFailureException { reRender(); Long lastProcessed = Long.valueOf(System.currentTimeMillis()); From a9eb7d9da7252a9bc7716047ceaf9e8fd3db6bae Mon Sep 17 00:00:00 2001 From: Gerd Aschemann Date: Sat, 5 Oct 2019 10:16:36 +0200 Subject: [PATCH 088/256] Update to JBake 2.6.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa504b11a..8f06372d4 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.jbake jbake-core - 2.6.3 + 2.6.4 org.apache.maven From ac0a641971d0f6f5dd6ead9b7fe942fd7015d5ec Mon Sep 17 00:00:00 2001 From: jaybob007 <4761262+jaybob007@users.noreply.github.com> Date: Sun, 27 Oct 2019 22:22:55 -0400 Subject: [PATCH 089/256] Added freemarker outputEncoding property to the config. --- .../jbake/app/configuration/DefaultJBakeConfiguration.java | 5 +++++ .../java/org/jbake/app/configuration/JBakeConfiguration.java | 5 +++++ .../main/java/org/jbake/app/configuration/JBakeProperty.java | 1 + jbake-core/src/main/resources/default.properties | 2 ++ 4 files changed, 13 insertions(+) diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java index 7a772acb8..503987602 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java @@ -344,6 +344,11 @@ public String getRenderEncoding() { return getAsString(JBakeProperty.RENDER_ENCODING); } + @Override + public String getOutputEncoding() { + return getAsString(JBakeProperty.OUTPUT_ENCODING); + } + @Override public boolean getRenderFeed() { return getAsBoolean(JBakeProperty.RENDER_FEED); diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java index 5e5435382..98c47a8eb 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java @@ -200,6 +200,11 @@ public interface JBakeConfiguration { */ String getRenderEncoding(); + /** + * @return Output encoding for freemarker url escaping + */ + String getOutputEncoding(); + /** * @return Flag indicating if feed file should be generated */ diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java index 375d8f903..7cdc45e67 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java @@ -33,6 +33,7 @@ public class JBakeProperty { public static final String RENDER_TAGS = "render.tags"; public static final String RENDER_TAGS_INDEX = "render.tagsindex"; public static final String RENDER_ENCODING = "render.encoding"; + public static final String OUTPUT_ENCODING = "freemarker.outputencoding"; public static final String SERVER_PORT = "server.port"; public static final String SITE_HOST = "site.host"; public static final String SITEMAP_FILE = "sitemap.file"; diff --git a/jbake-core/src/main/resources/default.properties b/jbake-core/src/main/resources/default.properties index 0ab5ff9a3..f8ba96666 100644 --- a/jbake-core/src/main/resources/default.properties +++ b/jbake-core/src/main/resources/default.properties @@ -112,6 +112,8 @@ uri.noExtension=false uri.noExtension.prefix= # default thymeleafe locale thymeleaf.locale=en_US +# default output_encoding setting for freemarker +freemarker.outputencoding=UTF-8 # paginate index index.paginate=false # number of post per page for pagination From 38d281e61c0ec39679970a2950b73f6b066c6bf9 Mon Sep 17 00:00:00 2001 From: jaybob007 <4761262+jaybob007@users.noreply.github.com> Date: Sun, 27 Oct 2019 22:23:56 -0400 Subject: [PATCH 090/256] Set output encoding property in Freemarker config. --- .../main/java/org/jbake/template/FreemarkerTemplateEngine.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java index 43c1e2158..d6c8f5f2e 100644 --- a/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java +++ b/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java @@ -50,6 +50,7 @@ public FreemarkerTemplateEngine(final JBakeConfiguration config, final ContentSt private void createTemplateConfiguration() { templateCfg = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); templateCfg.setDefaultEncoding(config.getRenderEncoding()); + templateCfg.setOutputEncoding(config.getOutputEncoding()); try { templateCfg.setDirectoryForTemplateLoading(config.getTemplateFolder()); } catch (IOException e) { From 18a26df335eae61b248ee827fcbc24bd9bb2ee44 Mon Sep 17 00:00:00 2001 From: jaybob007 <4761262+jaybob007@users.noreply.github.com> Date: Sun, 27 Oct 2019 22:24:21 -0400 Subject: [PATCH 091/256] Added test to make sure Freemarker url encoding is working. --- .../app/template/FreemarkerTemplateEngineRenderingTest.java | 2 ++ .../src/test/resources/fixture/freemarkerTemplates/index.ftl | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java b/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java index 908dafad3..de138b8c7 100644 --- a/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java +++ b/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java @@ -62,6 +62,8 @@ public void renderPaginatedIndex() throws Exception { for (String string : getOutputStrings("index")) { assertThat(output).contains(string); } + + assertThat(output).contains("Post Url: blog%2F2013%2Fsecond-post.html"); } @Test diff --git a/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl b/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl index 986219394..89b815758 100644 --- a/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl +++ b/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl @@ -11,6 +11,7 @@

${post.date?string("dd MMMM yyyy")}

${post.body}

+ Post Url: ${post.uri?url} ${db.getPublishedPages().size()}
@@ -23,4 +24,4 @@

Older posts are available in the archive.

-<#include "footer.ftl"> \ No newline at end of file +<#include "footer.ftl"> From d6fbf2e18e1a299edb52514d0b3fb1a5c5937509 Mon Sep 17 00:00:00 2001 From: jaybob007 <4761262+jaybob007@users.noreply.github.com> Date: Sun, 27 Oct 2019 23:02:52 -0400 Subject: [PATCH 092/256] removed empty ConfigUtil class --- jbake-core/src/main/java/org/jbake/app/ConfigUtil.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 jbake-core/src/main/java/org/jbake/app/ConfigUtil.java diff --git a/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java b/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java deleted file mode 100644 index e69de29bb..000000000 From c8205b9717d9be715085c494379f633fd0551a76 Mon Sep 17 00:00:00 2001 From: jaybob007 <4761262+jaybob007@users.noreply.github.com> Date: Sun, 27 Oct 2019 23:08:00 -0400 Subject: [PATCH 093/256] added back file --- jbake-core/src/main/java/org/jbake/app/ConfigUtil.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 jbake-core/src/main/java/org/jbake/app/ConfigUtil.java diff --git a/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java b/jbake-core/src/main/java/org/jbake/app/ConfigUtil.java new file mode 100644 index 000000000..e69de29bb From 755ef0a3a081feb831c4c7c3f846e69c8cac3bb5 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Wed, 15 Apr 2020 08:02:25 -0400 Subject: [PATCH 094/256] fix: Use same default port as the CLI tool --- src/main/java/org/jbake/maven/InlineMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jbake/maven/InlineMojo.java b/src/main/java/org/jbake/maven/InlineMojo.java index 6f373a217..a4c936bf0 100644 --- a/src/main/java/org/jbake/maven/InlineMojo.java +++ b/src/main/java/org/jbake/maven/InlineMojo.java @@ -48,7 +48,7 @@ public class InlineMojo extends WatchMojo { /** * Listen Port */ - @Parameter(property = "jbake.port", defaultValue = "8080") + @Parameter(property = "jbake.port", defaultValue = "8820") private Integer port; protected void stopServer() throws MojoExecutionException { From 9ad15de778bc3676267f2c08718bbc199f2eba92 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 15 Apr 2020 22:48:18 +0100 Subject: [PATCH 095/256] [maven-release-plugin] prepare release v0.3.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f06372d4..7d22e08de 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.4.0-SNAPSHOT + 0.3.2 maven-plugin From 59262e0b83a2c4b95d9290533087f76a79ea7714 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 15 Apr 2020 22:48:27 +0100 Subject: [PATCH 096/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d22e08de..18a0974ea 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.2 + 0.3.3-SNAPSHOT maven-plugin From f3b3ab8ccbf9bbf542675679694059402734a440 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Sat, 18 Apr 2020 16:13:03 -0400 Subject: [PATCH 097/256] fix: Use configuration, falling back on default if needed --- src/main/java/org/jbake/maven/InlineMojo.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jbake/maven/InlineMojo.java b/src/main/java/org/jbake/maven/InlineMojo.java index a4c936bf0..e99c6eb34 100644 --- a/src/main/java/org/jbake/maven/InlineMojo.java +++ b/src/main/java/org/jbake/maven/InlineMojo.java @@ -1,5 +1,7 @@ package org.jbake.maven; +import org.apache.commons.configuration.ConfigurationException; + /* * Copyright 2013 ingenieux Labs * @@ -48,9 +50,22 @@ public class InlineMojo extends WatchMojo { /** * Listen Port */ - @Parameter(property = "jbake.port", defaultValue = "8820") + @Parameter(property = "jbake.port") private Integer port; + private int getPort() { + if (this.port == null) { + try { + return createConfiguration().getServerPort(); + } catch (ConfigurationException e) { + // ignore since default will be returned + } + } else { + return this.port; + } + return 8820; + } + protected void stopServer() throws MojoExecutionException { stop(); } @@ -59,7 +74,7 @@ protected void initServer() throws MojoExecutionException { externalStaticFileLocation(outputDirectory.getPath()); ipAddress(listenAddress); - port(this.port); + port(getPort()); init(); From 432738dc29accfbee64143136b6b3c9679ee9437 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Sat, 18 Apr 2020 16:25:33 -0400 Subject: [PATCH 098/256] doc: Update version on maven and add "live" badge --- README.asciidoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index eed9bc1ab..abd8f7544 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -3,6 +3,8 @@ Jonathan Bullock 2018-04-23 :idprefix: +image:https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin/badge.svg[link="https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin"] + JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at the following Maven coordinates: @@ -10,7 +12,7 @@ the following Maven coordinates: org.jbake jbake-maven-plugin - 0.3.1 + 0.3.2 ---- @@ -48,4 +50,4 @@ The version format is as follows: == Copyright & License -This plugin is licensed under the Apache 2.0 License. \ No newline at end of file +This plugin is licensed under the Apache 2.0 License. From 1e8749a99aaf03a99393298a420d44836abc25b2 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Mon, 27 Apr 2020 06:38:26 -0400 Subject: [PATCH 099/256] feat: Allow the file used to ignore directories to be specified This allows a single directory to be used by one JBake configuration and ignored by another JBake configuration by setting the `ignore.file` property in `jbake.properties`. The default value for `ignore.file` is `.jbakeignore`. --- .../src/main/java/org/jbake/app/Asset.java | 8 +-- .../src/main/java/org/jbake/app/Crawler.java | 2 +- .../src/main/java/org/jbake/app/FileUtil.java | 72 ++++++++++++++++++- .../DefaultJBakeConfiguration.java | 5 ++ .../app/configuration/JBakeConfiguration.java | 5 ++ .../app/configuration/JBakeProperty.java | 1 + .../src/main/resources/default.properties | 7 +- 7 files changed, 91 insertions(+), 9 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/app/Asset.java b/jbake-core/src/main/java/org/jbake/app/Asset.java index cd9148cc0..f11e9f5ac 100644 --- a/jbake-core/src/main/java/org/jbake/app/Asset.java +++ b/jbake-core/src/main/java/org/jbake/app/Asset.java @@ -65,7 +65,7 @@ public void copy(File path) { FileFilter filter = new FileFilter() { @Override public boolean accept(File file) { - return (!config.getAssetIgnoreHidden() || !file.isHidden()) && (file.isFile() || FileUtil.directoryOnlyIfNotIgnored(file)); + return (!config.getAssetIgnoreHidden() || !file.isHidden()) && (file.isFile() || FileUtil.directoryOnlyIfNotIgnored(file, config)); } }; copy(path, config.getDestinationFolder(), filter); @@ -99,11 +99,11 @@ public boolean isAssetFile(File path) { boolean isAsset = false; try { - if(FileUtil.directoryOnlyIfNotIgnored(path.getParentFile())) { + if(FileUtil.directoryOnlyIfNotIgnored(path.getParentFile(), config)) { if (FileUtil.isFileInDirectory(path, config.getAssetFolder())) { isAsset = true; } else if (FileUtil.isFileInDirectory(path, config.getContentFolder()) - && FileUtil.getNotContentFileFilter().accept(path)) { + && FileUtil.getNotContentFileFilter(config).accept(path)) { isAsset = true; } } @@ -119,7 +119,7 @@ public boolean isAssetFile(File path) { * @param path of the content directory */ public void copyAssetsFromContent(File path) { - copy(path, config.getDestinationFolder(), FileUtil.getNotContentFileFilter()); + copy(path, config.getDestinationFolder(), FileUtil.getNotContentFileFilter(config)); } /** diff --git a/jbake-core/src/main/java/org/jbake/app/Crawler.java b/jbake-core/src/main/java/org/jbake/app/Crawler.java index 764a3e035..922ad1fb2 100644 --- a/jbake-core/src/main/java/org/jbake/app/Crawler.java +++ b/jbake-core/src/main/java/org/jbake/app/Crawler.java @@ -79,7 +79,7 @@ public void crawl() { * @param path Folder to start from */ private void crawl(File path) { - File[] contents = path.listFiles(FileUtil.getFileFilter()); + File[] contents = path.listFiles(FileUtil.getFileFilter(config)); if (contents != null) { Arrays.sort(contents); for (File sourceFile : contents) { diff --git a/jbake-core/src/main/java/org/jbake/app/FileUtil.java b/jbake-core/src/main/java/org/jbake/app/FileUtil.java index 2e1aa9e9d..33afc8893 100644 --- a/jbake-core/src/main/java/org/jbake/app/FileUtil.java +++ b/jbake-core/src/main/java/org/jbake/app/FileUtil.java @@ -26,8 +26,28 @@ public class FileUtil { /** * Filters files based on their file extension. * + * @param config the jbake configuration * @return Object for filtering files */ + public static FileFilter getFileFilter(JBakeConfiguration config) { + return new FileFilter() { + + @Override + public boolean accept(File pathname) { + //Accept if input is a non-hidden file with registered extension + //or if a non-hidden and not-ignored directory + return !pathname.isHidden() && (pathname.isFile() + && Engines.getRecognizedExtensions().contains(fileExt(pathname))) || (directoryOnlyIfNotIgnored(pathname, config)); + } + }; + } + + /** + * Filters files based on their file extension. + * + * @return Object for filtering files + */ + @Deprecated public static FileFilter getFileFilter() { return new FileFilter() { @@ -44,8 +64,31 @@ public boolean accept(File pathname) { /** * Gets the list of files that are not content files based on their extension. * + * @param config the jbake configuration * @return FileFilter object */ + public static FileFilter getNotContentFileFilter(JBakeConfiguration config) { + return new FileFilter() { + + @Override + public boolean accept(File pathname) { + //Accept if input is a non-hidden file with NOT-registered extension + //or if a non-hidden and not-ignored directory + return !pathname.isHidden() && (pathname.isFile() + //extension should not be from registered content extensions + && !Engines.getRecognizedExtensions().contains(fileExt(pathname))) + || (directoryOnlyIfNotIgnored(pathname, config)); + } + }; + } + + /** + * Gets the list of files that are not content files based on their extension. + * + * @return FileFilter object + * @deprecated use {@link #getNotContentFileFilter(JBakeConfiguration)} instead + */ + @Deprecated public static FileFilter getNotContentFileFilter() { return new FileFilter() { @@ -61,12 +104,37 @@ public boolean accept(File pathname) { }; } + /** + * Ignores directory (and children) if it contains a file named in the + * configuration as a marker to ignore the directory. + * + * @param file the file to test + * @param config the jbake configuration + * @return true if file is directory and not ignored + */ + public static boolean directoryOnlyIfNotIgnored(File file, JBakeConfiguration config) { + boolean accept = false; + + FilenameFilter ignoreFile = new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.equalsIgnoreCase(config.getIgnoreFileName()); + } + }; + + accept = file.isDirectory() && (file.listFiles(ignoreFile).length == 0); + + return accept; + } + /** * Ignores directory (and children) if it contains a file named ".jbakeignore". * - * @param file {@link File} - * @return {@link Boolean} true/false + * @param file the file to test + * @return true if file is directory and not ignored + * @deprecated use {@link #directoryOnlyIfNotIgnored(File, JBakeConfiguration)} instead */ + @Deprecated public static boolean directoryOnlyIfNotIgnored(File file) { boolean accept = false; diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java index 7a772acb8..be20b4681 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java @@ -272,6 +272,11 @@ public String getFeedFileName() { return getAsString(JBakeProperty.FEED_FILE); } + @Override + public String getIgnoreFileName() { + return getAsString(JBakeProperty.IGNORE_FILE); + } + @Override public String getIndexFileName() { return getAsString(JBakeProperty.INDEX_FILE); diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java index 5e5435382..eaa6c5f72 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java @@ -147,6 +147,11 @@ public interface JBakeConfiguration { */ String getHeaderSeparator(); + /** + * @return Filename to use to ignore a directory in addition to ".jbakeignore" + */ + String getIgnoreFileName(); + /** * @return Output filename for index, is only used when {@link #getRenderIndex()} is true */ diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java index 375d8f903..ff7d77da2 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java @@ -21,6 +21,7 @@ public class JBakeProperty { public static final String DRAFT_SUFFIX = "draft.suffix"; public static final String FEED_FILE = "feed.file"; public static final String HEADER_SEPARATOR = "header.separator"; + public static final String IGNORE_FILE = "ignore.file"; public static final String INDEX_FILE = "index.file"; public static final String MARKDOWN_EXTENSIONS = "markdown.extensions"; public static final String OUTPUT_EXTENSION = "output.extension"; diff --git a/jbake-core/src/main/resources/default.properties b/jbake-core/src/main/resources/default.properties index 0ab5ff9a3..028082b65 100644 --- a/jbake-core/src/main/resources/default.properties +++ b/jbake-core/src/main/resources/default.properties @@ -1,7 +1,7 @@ # application version version=v${jbakeVersion} # build timestamp -build.timestamp=${timestamp} +build.timestamp=${timestamp} # path to destination folder by default destination.folder=output # folder that contains all template files @@ -58,7 +58,7 @@ render.tagsindex=false # folder name to use for tag files tag.path=tags # sanitize tag value before it is used as filename (i.e. replace spaces with hyphens) -tag.sanitize=false +tag.sanitize=false # file extension for output content files output.extension=.html @@ -124,3 +124,6 @@ header.separator=~~~~~~ img.path.update=false # Prepend site.host to image paths img.path.prepend.host=true + +# file used to ignore a directory +ignore.file=.jbakeignore From 9192424e535cdf5d02c64f6e9384e0921df4a60a Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Fri, 1 May 2020 13:14:02 +0200 Subject: [PATCH 100/256] update jbake to 2.6.5 --- pom.xml | 27 ++-- .../java/org/jbake/maven/GenerateMojo.java | 126 ++++++++---------- src/main/java/org/jbake/maven/WatchMojo.java | 4 +- 3 files changed, 73 insertions(+), 84 deletions(-) diff --git a/pom.xml b/pom.xml index 18a0974ea..66b3d9e83 100644 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,12 @@ maven-plugin-api - commons-lang - commons-lang + org.apache.commons + commons-lang3 + + + commons-configuration + commons-configuration org.apache.maven @@ -111,7 +115,7 @@ org.jbake jbake-core - 2.6.4 + 2.6.5 org.apache.maven @@ -119,14 +123,19 @@ 3.3.9 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.10 + + + commons-configuration + commons-configuration + 1.10 commons-io commons-io - 2.4 + 2.6 org.apache.maven.plugin-testing @@ -233,12 +242,12 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8.1 + 2.9 org.apache.maven.plugins maven-plugin-plugin - 3.4 + 3.6.0 org.apache.maven.plugins diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/src/main/java/org/jbake/maven/GenerateMojo.java index c9ee76d53..499b82cfc 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 com.orientechnologies.orient.core.Orient; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.MapConfiguration; import org.apache.maven.plugin.AbstractMojo; @@ -28,9 +26,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; @@ -39,81 +37,63 @@ */ @Mojo(name = "generate", requiresProject = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) public class GenerateMojo extends AbstractMojo { - @Parameter(defaultValue="${project}") - protected MavenProject project; - - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.outputDirectory", - defaultValue = "${project.build.directory}/${project.build.finalName}", - required = true) - protected File outputDirectory; - - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", - required = true) - protected File inputDirectory; - - /** - * Breaks the build when {@code true} and errors occur during baking in JBake oven. - */ - @Parameter(property = "jbake.failOnError", defaultValue = "true") - protected boolean failOnError; - - /** - * Set if cache is present or clear - */ - @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) - protected boolean isClearCache; - - public final void execute() throws MojoExecutionException, MojoFailureException { - try { - executeInternal(); - } finally { - closeQuietly(); + @Parameter(defaultValue = "${project}") + protected MavenProject project; + + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.outputDirectory", + defaultValue = "${project.build.directory}/${project.build.finalName}", + required = true) + protected File outputDirectory; + + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake", + required = true) + protected File inputDirectory; + + /** + * Breaks the build when {@code true} and errors occur during baking in JBake oven. + */ + @Parameter(property = "jbake.failOnError", defaultValue = "true") + protected boolean failOnError; + + /** + * Set if cache is present or clear + */ + @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true) + protected boolean isClearCache; + + public final void execute() throws MojoExecutionException { + executeInternal(); } - } - protected final void closeQuietly() { - try { - Orient.instance().shutdown(); - } catch (Exception e) { - getLog().warn("Oops", e); + protected void executeInternal() throws MojoExecutionException { + reRender(); } - } - protected void executeInternal() throws MojoExecutionException, MojoFailureException { - reRender(); - } - - protected void reRender() throws MojoExecutionException, MojoFailureException { - try { - // TODO: Smells bad. A lot - Orient.instance().startup(); - - // TODO: At some point, reuse Oven - Oven oven = new Oven(createConfiguration()); - - oven.bake(); - if (failOnError && !oven.getErrors().isEmpty()) { - throw new MojoFailureException("Baked with " + oven.getErrors().size() + " errors. Check output above for details!"); - } - } catch (Exception e) { - getLog().info("Oops", e); - - throw new MojoExecutionException("Failure when running: ", e); + protected void reRender() throws MojoExecutionException { + try { + // TODO: At some point, reuse Oven + Oven oven = new Oven(createConfiguration()); + oven.bake(); + if (failOnError && !oven.getErrors().isEmpty()) { + throw new MojoFailureException("Baked with " + oven.getErrors().size() + " errors. Check output above for details!"); + } + } catch (Exception e) { + getLog().info("Oops", e); + + throw new MojoExecutionException("Failure when running: ", e); + } } - } - protected JBakeConfiguration createConfiguration() throws ConfigurationException { - DefaultJBakeConfiguration jBakeConfiguration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(inputDirectory); - jBakeConfiguration.getCompositeConfiguration().addConfiguration(new MapConfiguration(this.project.getProperties())); - jBakeConfiguration.setDestinationFolder(outputDirectory); - jBakeConfiguration.setClearCache(isClearCache); - return jBakeConfiguration; - } + protected JBakeConfiguration createConfiguration() throws ConfigurationException { + DefaultJBakeConfiguration jBakeConfiguration = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(inputDirectory, outputDirectory, isClearCache); + jBakeConfiguration.getCompositeConfiguration().addConfiguration(new MapConfiguration(this.project.getProperties())); + return jBakeConfiguration; + } } diff --git a/src/main/java/org/jbake/maven/WatchMojo.java b/src/main/java/org/jbake/maven/WatchMojo.java index 6402af075..5c47575b9 100644 --- a/src/main/java/org/jbake/maven/WatchMojo.java +++ b/src/main/java/org/jbake/maven/WatchMojo.java @@ -33,10 +33,10 @@ @Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false) public class WatchMojo extends GenerateMojo { - public void executeInternal() throws MojoExecutionException, MojoFailureException { + public void executeInternal() throws MojoExecutionException { reRender(); - Long lastProcessed = Long.valueOf(System.currentTimeMillis()); + Long lastProcessed = System.currentTimeMillis(); getLog().info( "Now listening for changes on path " + inputDirectory.getPath()); From d5f3fcc2215f0a7d15cd1aa0539b18bcfd3b88c5 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Sun, 31 May 2020 09:48:11 -0400 Subject: [PATCH 101/256] test: "ignore.file" property is respected when copying assets Also seems to fix `AssetTest.testIgnoredFolder()` by putting the folder to be ignored in the directory to be copied. --- .../test/java/org/jbake/app/AssetTest.java | 25 +++++++++++++++++++ .../fooignorablefolder/.fooignore} | 0 .../file_in_foo_ignored_folder.html | 16 ++++++++++++ .../assets/ignorablefolder/.jbakeignore | 0 .../file_in_ignored_folder.html | 0 5 files changed, 41 insertions(+) rename jbake-core/src/test/resources/fixture/{ignorablefolder/.jbakeignore => assets/fooignorablefolder/.fooignore} (100%) create mode 100644 jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html create mode 100644 jbake-core/src/test/resources/fixture/assets/ignorablefolder/.jbakeignore rename jbake-core/src/test/resources/fixture/{ => assets}/ignorablefolder/file_in_ignored_folder.html (100%) diff --git a/jbake-core/src/test/java/org/jbake/app/AssetTest.java b/jbake-core/src/test/java/org/jbake/app/AssetTest.java index 00ec74a6e..1b4914417 100644 --- a/jbake-core/src/test/java/org/jbake/app/AssetTest.java +++ b/jbake-core/src/test/java/org/jbake/app/AssetTest.java @@ -6,6 +6,7 @@ import org.jbake.TestUtils; import org.jbake.app.configuration.ConfigUtil; import org.jbake.app.configuration.DefaultJBakeConfiguration; +import org.jbake.app.configuration.JBakeProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -189,11 +190,35 @@ public void testJBakeIgnoredFolder() { File jsFile = new File(folder.toString() + File.separatorChar + "js" + File.separatorChar + "bootstrap.min.js"); Assertions.assertTrue(jsFile.exists(), () -> "File " + jsFile.getAbsolutePath() + " does not exist"); File ignorableFolder = new File(folder.toString() + File.separatorChar + "ignorablefolder"); + File fooIgnorableFolder = new File(folder.toString() + File.separatorChar + "fooignorablefolder"); Assertions.assertFalse(ignorableFolder.exists(), () -> "Folder " + ignorableFolder.getAbsolutePath() + " must not exist"); + Assertions.assertTrue(fooIgnorableFolder.exists(), () -> "Folder " + fooIgnorableFolder.getAbsolutePath() + " must exist"); Assertions.assertTrue(asset.getErrors().isEmpty(), "Errors during asset copying"); } + @Test + public void testFooIgnoredFolder() { + config.setProperty(JBakeProperty.IGNORE_FILE, ".fooignore"); + + URL assetsUrl = this.getClass().getResource("/fixture/assets"); + File assets = new File(assetsUrl.getFile()); + Asset asset = new Asset(config); + asset.copy(assets); + + File cssFile = new File(folder.toString() + File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css"); + Assertions.assertTrue(cssFile.exists(), () -> "File " + cssFile.getAbsolutePath() + " does not exist"); + File imgFile = new File(folder.toString() + File.separatorChar + "img" + File.separatorChar + "glyphicons-halflings.png"); + Assertions.assertTrue(imgFile.exists(), () -> "File " + imgFile.getAbsolutePath() + " does not exist"); + File jsFile = new File(folder.toString() + File.separatorChar + "js" + File.separatorChar + "bootstrap.min.js"); + Assertions.assertTrue(jsFile.exists(), () -> "File " + jsFile.getAbsolutePath() + " does not exist"); + File ignorableFolder = new File(folder.toString() + File.separatorChar + "ignorablefolder"); + File fooIgnorableFolder = new File(folder.toString() + File.separatorChar + "fooignorablefolder"); + Assertions.assertTrue(ignorableFolder.exists(), () -> "Folder " + ignorableFolder.getAbsolutePath() + " must exist"); + Assertions.assertFalse(fooIgnorableFolder.exists(), () -> "Folder " + fooIgnorableFolder.getAbsolutePath() + " must not exist"); + + Assertions.assertTrue(asset.getErrors().isEmpty(), "Errors during asset copying"); + } @Test public void testCopyAssetsFromContent() { diff --git a/jbake-core/src/test/resources/fixture/ignorablefolder/.jbakeignore b/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/.fooignore similarity index 100% rename from jbake-core/src/test/resources/fixture/ignorablefolder/.jbakeignore rename to jbake-core/src/test/resources/fixture/assets/fooignorablefolder/.fooignore diff --git a/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html b/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html new file mode 100644 index 000000000..7a285e582 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html @@ -0,0 +1,16 @@ +title=Second Post +date=2013-02-28 +type=post +tags=blog +status=published +og={"description": "Something"} +~~~~~~ + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus. +Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu, +mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo +ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet +ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus, +id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In +consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere +libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat. diff --git a/jbake-core/src/test/resources/fixture/assets/ignorablefolder/.jbakeignore b/jbake-core/src/test/resources/fixture/assets/ignorablefolder/.jbakeignore new file mode 100644 index 000000000..e69de29bb diff --git a/jbake-core/src/test/resources/fixture/ignorablefolder/file_in_ignored_folder.html b/jbake-core/src/test/resources/fixture/assets/ignorablefolder/file_in_ignored_folder.html similarity index 100% rename from jbake-core/src/test/resources/fixture/ignorablefolder/file_in_ignored_folder.html rename to jbake-core/src/test/resources/fixture/assets/ignorablefolder/file_in_ignored_folder.html From 173baaf0d69eee3d7f263c1f428a1269a2783b69 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Sun, 31 May 2020 10:23:15 -0400 Subject: [PATCH 102/256] test: test `JBakeConfiguration.getIgnoreFileName()` with default config --- .../java/org/jbake/app/configuration/ConfigUtilTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java b/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java index f3726cd32..a670ddc7d 100644 --- a/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java +++ b/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java @@ -317,6 +317,14 @@ public void shouldHandleCustomAssetFolder() throws Exception { assertThat(config.getAssetFolderName()).isEqualTo("my_custom_asset"); } + @Test + public void shouldReturnIgnoreFileFromConfiguration() throws Exception { + File sourceFolder = TestUtils.getTestResourcesAsSourceFolder(); + JBakeConfiguration config = util.loadConfig(sourceFolder); + + assertThat(config.getIgnoreFileName()).isEqualTo(".jbakeignore"); + } + private void assertDefaultPropertiesPresent(JBakeConfiguration config) throws IllegalAccessException { for (Field field : JBakeConfiguration.class.getFields()) { From 905fec295184c99f231015388d06c7c443639150 Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Sun, 31 May 2020 10:59:21 -0400 Subject: [PATCH 103/256] doc: add missing deprecation statement --- jbake-core/src/main/java/org/jbake/app/FileUtil.java | 3 ++- jbake-core/src/test/java/org/jbake/app/FileUtilTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/app/FileUtil.java b/jbake-core/src/main/java/org/jbake/app/FileUtil.java index 33afc8893..59d330740 100644 --- a/jbake-core/src/main/java/org/jbake/app/FileUtil.java +++ b/jbake-core/src/main/java/org/jbake/app/FileUtil.java @@ -46,6 +46,7 @@ public boolean accept(File pathname) { * Filters files based on their file extension. * * @return Object for filtering files + * @deprecated use {@link #getFileFilter(JBakeConfiguration)} instead */ @Deprecated public static FileFilter getFileFilter() { @@ -247,7 +248,7 @@ public static String asPath(File file) { * platform independent file.getPath() * * @param path the path to transform, or {@code null} - * @return The result will have alle platform path separators replaced by "/". + * @return The result will have all platform path separators replaced by "/". */ public static String asPath(String path) { if (path == null) { diff --git a/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java b/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java index 34d283ef0..359d75dc9 100644 --- a/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java +++ b/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java @@ -37,7 +37,7 @@ public void testIsFileInDirectory() throws Exception { assertFalse("jbake.properties file should not be in the /fixture/content directory", FileUtil.isFileInDirectory(jbakeFile, contentDir)); } - @Test + @Test public void testGetContentRoothPath() throws Exception { File source = TestUtils.getTestResourcesAsSourceFolder(); From 3cbeb33e7a807840dc4303141f481c9cdb015fcf Mon Sep 17 00:00:00 2001 From: Randall Wood <297232+rhwood@users.noreply.github.com> Date: Sun, 31 May 2020 17:10:12 -0400 Subject: [PATCH 104/256] Wrap usage at 80 characters instead of 100 Fixes #645 --- jbake-core/src/main/java/org/jbake/launcher/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbake-core/src/main/java/org/jbake/launcher/Main.java b/jbake-core/src/main/java/org/jbake/launcher/Main.java index 5f970d439..f4b0f1372 100644 --- a/jbake-core/src/main/java/org/jbake/launcher/Main.java +++ b/jbake-core/src/main/java/org/jbake/launcher/Main.java @@ -146,7 +146,7 @@ private void printUsage(Object options) { sw.append(ALT_USAGE_PREFIX + " [OPTION]... [...]\n\n"); sw.append("Options:"); System.out.println(sw.toString()); - parser.getProperties().withUsageWidth(100); + parser.getProperties().withUsageWidth(80); parser.printUsage(System.out); } From 0b250c1ddad887dbe50a81765c3bf53c0a4ada64 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 12 Sep 2020 17:41:59 +0100 Subject: [PATCH 105/256] [maven-release-plugin] prepare release v0.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66b3d9e83..08f203a6f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.3-SNAPSHOT + 0.3.3 maven-plugin From 0fb5ac0808ecf467441159199bfbf1ab1dc50569 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 12 Sep 2020 17:42:07 +0100 Subject: [PATCH 106/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08f203a6f..8a57cf159 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.3 + 0.3.4-SNAPSHOT maven-plugin From e839bb8caa549e2d164e91ba6a1d2526f8805a07 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 12 Sep 2020 21:52:55 +0100 Subject: [PATCH 107/256] Updated version info. --- README.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index abd8f7544..a4e675c92 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,6 +1,6 @@ = JBake Maven Plugin Jonathan Bullock -2018-04-23 +2020-09-12 :idprefix: image:https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin/badge.svg[link="https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin"] @@ -12,7 +12,7 @@ the following Maven coordinates: org.jbake jbake-maven-plugin - 0.3.2 + 0.3.3 ---- From 4d70a989b89638ac932894052d2dc2a4f88deb1f Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Wed, 28 Oct 2020 16:28:34 +0100 Subject: [PATCH 108/256] jbake issue #652: prev/next post navigation only uses published posts --- .../org/jbake/render/DocumentsRenderer.java | 48 +++++-- .../jbake/render/DocumentsRendererTest.java | 125 +++++++++--------- 2 files changed, 98 insertions(+), 75 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java index 78a4a4760..e439a0eba 100644 --- a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java +++ b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java @@ -22,7 +22,7 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) int renderedCount = 0; final List errors = new LinkedList<>(); for (String docType : DocumentTypes.getDocumentTypes()) { - DocumentList documentList = db.getUnrenderedContent(docType); + final DocumentList documentList = db.getUnrenderedContent(docType); if (documentList == null) { continue; @@ -30,30 +30,34 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) int index = 0; - Map nextDocument = null; + Map nextDocumentForNav = null; while (index < documentList.size()) { try { - Map document = documentList.get(index); - document.put("nextContent", null); - document.put("previousContent", null); + final Map documentToRender = documentList.get(index); + documentToRender.put("nextContent", null); + documentToRender.put("previousContent", null); - if (index > 0) { - document.put("nextContent", getContentForNav(nextDocument)); + if (nextDocumentForNav != null) { + documentToRender.put("nextContent", getContentForNav(nextDocumentForNav)); } if (index < documentList.size() - 1) { - Map tempNext = documentList.get(index + 1); - document.put("previousContent", getContentForNav(tempNext)); + Map prevDocumentForNav = findPrevPublishedDocument(documentList, index); + if (prevDocumentForNav != null) { + documentToRender.put("previousContent", getContentForNav(prevDocumentForNav)); + } } - nextDocument = document; + if (isPublished(documentToRender)) { + nextDocumentForNav = documentToRender; + } - renderer.render(document); + renderer.render(documentToRender); renderedCount++; } catch (Exception e) { - errors.add(e.getMessage()); + errors.add(e.getMessage() != null ? e.getMessage() : e.getClass().getName()); } index++; @@ -73,11 +77,27 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) } } + private Map findPrevPublishedDocument(DocumentList documentList, int index) { + for ( int prevDocIndex = index+1; prevDocIndex < documentList.size(); ++prevDocIndex ) { + Map prevDocument = documentList.get(prevDocIndex); + if (isPublished(prevDocument)) { + return prevDocument; + } + } + return null; + } + + private boolean isPublished(Map document) { + // Attributes.Status.PUBLISHED_DATE cannot occur here + // because it's converted TO either PUBLISHED or DRAFT in the Crawler. + return Attributes.Status.PUBLISHED.equals(document.get(Attributes.STATUS)); + } + /** * Creates a simple content model to use in individual post navigations. * - * @param document - * @return + * @param document original + * @return navigation model for the 'document' */ private Map getContentForNav(Map document) { Map navDocument = new HashMap<>(); diff --git a/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java b/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java index cc57bab39..139b3bf74 100644 --- a/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java +++ b/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.jupiter.api.Assertions; import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; @@ -19,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -30,9 +32,7 @@ public class DocumentsRendererTest { - @Rule - public ExpectedException exception = ExpectedException.none(); - private DocumentsRenderer documentsRenderer; + public DocumentsRenderer documentsRenderer; private ContentStore db; private Renderer renderer; private JBakeConfiguration configuration; @@ -87,94 +87,97 @@ public void shouldReturnCountOfProcessedDocuments() throws Exception { } @Test - public void shouldThrowAnExceptionWithCollectedErrorMessages() throws Exception { + public void shouldThrowAnExceptionWithCollectedErrorMessages() { String fakeExceptionMessage = "fake exception"; - // expect - exception.expect(RenderingException.class); - exception.expectMessage(fakeExceptionMessage + "\n" + fakeExceptionMessage); - - // given - DocumentTypes.addDocumentType("customType"); - DocumentList documentList = new DocumentList(); - HashMap document = emptyDocument(); - HashMap document2 = emptyDocument(); - documentList.add(document); - documentList.add(document2); - - // throw an exception for every call of renderer's render method - doThrow(new Exception(fakeExceptionMessage)).when(renderer).render(ArgumentMatchers.anyMap()); - when(db.getUnrenderedContent(anyString())).thenReturn(emptyDocumentList); - when(db.getUnrenderedContent("customType")).thenReturn(documentList); - - // when - int renderResponse = documentsRenderer.render(renderer, db, configuration); - - // then - assertThat(renderResponse).isEqualTo(2); + // expect + Assertions.assertThrows( + RenderingException.class, () -> { + + // given + DocumentTypes.addDocumentType("customType"); + + DocumentList documentList = new DocumentList(); + HashMap document = emptyDocument(); + HashMap document2 = emptyDocument(); + documentList.add(document); + documentList.add(document2); + + // throw an exception for every call of renderer's render method + doThrow(new Exception(fakeExceptionMessage)).when(renderer).render(ArgumentMatchers.anyMap()); + when(db.getUnrenderedContent(anyString())).thenReturn(emptyDocumentList); + when(db.getUnrenderedContent("customType")).thenReturn(documentList); + + // when + int renderResponse = documentsRenderer.render(renderer, db, configuration); + + // then + assertThat(renderResponse).isEqualTo(2); + }, + fakeExceptionMessage + "\n" + fakeExceptionMessage + ); } @Test public void shouldContainPostNavigation() throws Exception { + // given DocumentTypes.addDocumentType("customType"); - String first = "First Document"; - String second = "Second Document"; - String third = "Third Document"; - String fourth = "Fourth Document"; + String firstTitle = "First Document"; + String secondTitleIsDraft = "Second Document (draft)"; + String thirdTitle = "Third Document"; + String fourthTitle = "Fourth Document"; DocumentList documents = new DocumentList(); - documents.add(simpleDocument(fourth)); - documents.add(simpleDocument(third)); - documents.add(simpleDocument(second)); - documents.add(simpleDocument(first)); + // Attributes.Status.PUBLISHED_DATE cannot occur here + // because it's converted TO either PUBLISHED or DRAFT in the Crawler. + documents.add(simpleDocument(fourthTitle, Attributes.Status.PUBLISHED)); + documents.add(simpleDocument(thirdTitle, Attributes.Status.PUBLISHED)); + documents.add(simpleDocument(secondTitleIsDraft, Attributes.Status.DRAFT)); + documents.add(simpleDocument(firstTitle, Attributes.Status.PUBLISHED)); when(db.getUnrenderedContent("customType")).thenReturn(documents); + // when int renderResponse = documentsRenderer.render(renderer, db, configuration); - Map fourthDoc = simpleDocument(fourth); - fourthDoc.put("previousContent", simpleDocument(third)); - fourthDoc.put("nextContent", null); - - Map thirdDoc = simpleDocument(third); - thirdDoc.put("nextContent", simpleDocument(fourth)); - thirdDoc.put("previousContent", simpleDocument(second)); - - Map secondDoc = simpleDocument(second); - secondDoc.put("nextContent", simpleDocument(third)); - secondDoc.put("previousContent", simpleDocument(first)); - - Map firstDoc = simpleDocument(first); - firstDoc.put("nextContent", simpleDocument(second)); - firstDoc.put("previousContent", null); - + // then verify(renderer, times(4)).render(argument.capture()); - List> maps = argument.getAllValues(); - - assertThat(maps).contains(fourthDoc); - - assertThat(maps).contains(thirdDoc); - - assertThat(maps).contains(secondDoc); + final Map> renderedDocs = asTitleToDocMap(argument.getAllValues()); + assertDocumentNavigation(renderedDocs.get(firstTitle), null, thirdTitle); + assertDocumentNavigation(renderedDocs.get(secondTitleIsDraft), firstTitle, thirdTitle); + assertDocumentNavigation(renderedDocs.get(thirdTitle), firstTitle, fourthTitle); + assertDocumentNavigation(renderedDocs.get(fourthTitle), thirdTitle, null); + assertThat(renderResponse).isEqualTo(4); + } - assertThat(maps).contains(firstDoc); + private void assertDocumentNavigation( + final Map renderedDoc, + final String prevDocumentTitle, String nextDocumentTitle) { + assertThat(renderedDoc).flatExtracting( + "previousContent." + Attributes.TITLE, + "nextContent." + Attributes.TITLE) + .containsExactly(prevDocumentTitle, nextDocumentTitle); + } - assertThat(renderResponse).isEqualTo(4); + private Map> asTitleToDocMap(List> values) { + return values.stream() + .collect(Collectors.toMap(doc -> doc.get(Attributes.TITLE).toString(), doc -> doc)); } private HashMap emptyDocument() { return new HashMap<>(); } - private Map simpleDocument(String title) { + private Map simpleDocument(String title, String status) { Map simpleDoc = new HashMap<>(); String uri = title.replace(" ", "_"); simpleDoc.put(Attributes.NO_EXTENSION_URI, uri); simpleDoc.put(Attributes.URI, uri); simpleDoc.put(Attributes.TITLE, title); + simpleDoc.put(Attributes.STATUS, status); return simpleDoc; } -} \ No newline at end of file +} From 57b114fa24f00bb3549ebcf163570108cfaffce1 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 3 Mar 2021 23:46:26 +0000 Subject: [PATCH 109/256] Resolves #25, resolves #32 --- README.asciidoc | 124 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index a4e675c92..eaeb6e6d0 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,11 +1,11 @@ = JBake Maven Plugin Jonathan Bullock -2020-09-12 +2021-03-03 :idprefix: image:https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin/badge.svg[link="https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin"] -JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at +JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at the following Maven coordinates: ---- @@ -18,6 +18,126 @@ the following Maven coordinates: Special thanks must go to the original author of this plugin - https://github.com/aldrinleal[Aldrin Leal]. +== Usage + +To use JBake Maven Plugin in your build add the plugin into your pom.xml as shown below: + +---- + +... + + ... + + org.jbake + jbake-maven-plugin + 0.3.2 + + + + + + default-generate + generate-resources + + generate + + + + + + + + ... + +... + +---- + +=== Dependencies + +The plugin itself includes all required dependencies such as jbake-core, however you will need to explicitly declare dependencies for +the content formats and template engines used in your project. As these dependencies are marked as optional to reduce bloat. + +If you have AsciiDoc content you'll need this dependency: + +---- + + org.asciidoctor + asciidoctorj + 2.2.0 + +---- + +If you have Markdown content you'll need these dependencies: + +---- + + com.vladsch.flexmark + flexmark + 0.61.0 + + + com.vladsch.flexmark + flexmark-profile-pegdown + 0.61.0 + +---- + +If you have Freemarker templates then you'll need this dependency: + +---- + + org.freemarker + freemarker + 2.3.30 + +---- + +If you have Groovy templates then you'll need these dependencies: + +---- + + org.codehaus.groovy + groovy + 3.0.2 + + + org.codehaus.groovy + groovy-templates + 3.0.2 + + + org.codehaus.groovy + groovy-dateutil + 3.0.2 + +---- + +If you have Thymeleaf templates then you'll need this dependency: + +---- + + org.thymeleaf + thymeleaf + 3.0.11.RELEASE + +---- + +If you have Jade4J templates then you'll need this dependency: + +---- + + de.neuland-bfi + jade4j + 1.3.2 + +---- + +An example of the plugin being used can be found in this project: https://github.com/jonbullock/maven-jbake-site[https://github.com/jonbullock/maven-jbake-site] + == Goals There are 4 goals provided by this plugin: From ad85e942a1ba895306ddd8e8a17f0a7e237df0c4 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 3 Mar 2021 23:50:11 +0000 Subject: [PATCH 110/256] Fixed whitespace --- README.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index eaeb6e6d0..4d950df39 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -29,8 +29,8 @@ To use JBake Maven Plugin in your build add the plugin into your pom.xml as show ... org.jbake - jbake-maven-plugin - 0.3.2 + jbake-maven-plugin + 0.3.2 + diff --git a/jbake-dist/src/dist/lib/logging/logback.xml b/jbake-dist/src/dist/lib/logging/logback.xml index 22cd77f5a..12cd7dc19 100644 --- a/jbake-dist/src/dist/lib/logging/logback.xml +++ b/jbake-dist/src/dist/lib/logging/logback.xml @@ -14,6 +14,9 @@ + + + From fe280a27be5a69d9c84c542d82e42d57d53c120e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 22 May 2021 11:53:30 +0100 Subject: [PATCH 171/256] Improved handling of YAML files after switch to use of DocumentModel. Added extra output when unhandled scenarios are encountered. --- jbake-core/src/main/java/org/jbake/parser/YamlEngine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java b/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java index ed98ea487..bf65a81cc 100644 --- a/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java +++ b/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java @@ -38,12 +38,12 @@ private DocumentModel parseFile(File file) { if (result instanceof List) { model.put("data", result); } else if (result instanceof Map) { - model = (DocumentModel) result; + model.putAll((Map)result); } else { - + LOGGER.warn("Unexpected result [{}] while parsing YAML file {}", result.getClass(), file); } } catch (IOException e) { - LOGGER.error("Error while parsing file {}", file, e); + LOGGER.error("Error while parsing YAML file {}", file, e); } return model; } @@ -60,7 +60,7 @@ public DocumentModel parse(JBakeConfiguration config, File file) { */ @Override public void processHeader(final ParserContext context) { - Map fileContents = parseFile(context.getFile()); + DocumentModel fileContents = parseFile(context.getFile()); DocumentModel documentModel = context.getDocumentModel(); for (String key : fileContents.keySet()) { From a84524615b1346c9557a4740f3053ce77fdea982 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 23 May 2021 00:04:50 +0100 Subject: [PATCH 172/256] Updated version. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 13d0e3eeb..35bd27fac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-SNAPSHOT +version = 2.7.0-rc.1 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From 85301f4186af405d2cf9531ce73499099035e7db Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 23 May 2021 18:26:17 +0100 Subject: [PATCH 173/256] Added extra method so build plugins don't need to depend on Apache Commons Configuration library. --- .../jbake/app/configuration/DefaultJBakeConfiguration.java | 6 ++++++ .../org/jbake/app/configuration/JBakeConfiguration.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java index 9388ba896..5de7d8e3c 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java @@ -2,6 +2,7 @@ import org.apache.commons.configuration2.CompositeConfiguration; import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.MapConfiguration; import org.apache.commons.configuration2.SystemConfiguration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -678,6 +679,11 @@ public List getJbakeProperties() { return jbakeKeys; } + @Override + public void addConfiguration(Properties properties) { + compositeConfiguration.addConfiguration(new MapConfiguration(properties)); + } + @Override public String getAbbreviatedGitHash() { return getAsString(GIT_HASH.getKey()); diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java index 5c3cd0a01..3a18536b5 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Properties; /** * JBakeConfiguration gives you access to the project configuration. Typically located in a file called jbake.properties. @@ -367,5 +368,7 @@ public interface JBakeConfiguration { Map asHashMap(); List getJbakeProperties(); + + void addConfiguration(Properties properties); } From 87c5cea57d27ee2dab1d7bc02df5ecc66bb78a75 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Mon, 24 May 2021 16:14:15 +0200 Subject: [PATCH 174/256] add some tests. throw JBakeException to hide commons configuration dependency --- .../jbake/app/configuration/ConfigUtil.java | 12 ++++--- .../JBakeConfigurationFactory.java | 34 +++++++++++-------- .../main/java/org/jbake/launcher/Main.java | 4 +-- .../JBakeConfigurationFactoryTest.java | 16 +++++++++ .../java/org/jbake/launcher/MainTest.java | 8 +++++ 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java b/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java index 9ce72da10..c0c6260f4 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java @@ -97,11 +97,15 @@ private void displayLegacyConfigFileWarningIfRequired() { * @param source the source directory of the project * @param propertiesFile the properties file for the project * @return the configuration - * @throws ConfigurationException if unable to configure + * @throws JBakeException if unable to configure */ - public JBakeConfiguration loadConfig(File source, File propertiesFile) throws ConfigurationException { - CompositeConfiguration configuration = load(source, propertiesFile); - return new DefaultJBakeConfiguration(source, configuration); + public JBakeConfiguration loadConfig(File source, File propertiesFile) throws JBakeException { + try { + CompositeConfiguration configuration = load(source, propertiesFile); + return new DefaultJBakeConfiguration(source, configuration); + } catch (ConfigurationException e) { + throw new JBakeException(SystemExit.CONFIGURATION_ERROR, e.getMessage(), e); + } } /** diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java index 990b5f45b..1ff3fa764 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java @@ -2,7 +2,7 @@ import org.apache.commons.configuration2.CompositeConfiguration; -import org.apache.commons.configuration2.ex.ConfigurationException; +import org.jbake.app.JBakeException; import java.io.File; @@ -18,16 +18,15 @@ public JBakeConfigurationFactory() { } /** - * Creates a {@link DefaultJBakeConfiguration} + * Creates a {@link DefaultJBakeConfiguration} using default.properties and jbake.properties + * * @param sourceFolder The source folder of the project * @param destination The destination folder to render and copy files to * @param isClearCache Whether to clear database cache or not * @return A configuration by given parameters - * @throws ConfigurationException if loading the configuration fails - * @deprecated use {@link #createDefaultJbakeConfiguration(File, File, File, boolean)} instead + * @throws JBakeException if loading the configuration fails */ - @Deprecated - public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, boolean isClearCache) throws ConfigurationException { + public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, boolean isClearCache) throws JBakeException { return createDefaultJbakeConfiguration(sourceFolder, destination, (File) null, isClearCache); } @@ -38,9 +37,9 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold * @param propertiesFile The properties file for the project * @param isClearCache Whether to clear database cache or not * @return A configuration by given parameters - * @throws ConfigurationException if loading the configuration fails + * @throws JBakeException if loading the configuration fails */ - public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, File propertiesFile, boolean isClearCache) throws ConfigurationException { + public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, File propertiesFile, boolean isClearCache) throws JBakeException { DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) getConfigUtil().loadConfig(sourceFolder, propertiesFile); configuration.setDestinationFolder(destination); configuration.setClearCache(isClearCache); @@ -57,8 +56,10 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold * @param compositeConfiguration A given {@link CompositeConfiguration} * @param isClearCache Whether to clear database cache or not * @return A configuration by given parameters + * @deprecated use {@link #createDefaultJbakeConfiguration(File, File, File, boolean)} instead */ - public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration, boolean isClearCache) { + @Deprecated + public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration, boolean isClearCache) throws JBakeException { DefaultJBakeConfiguration configuration = new DefaultJBakeConfiguration(sourceFolder, compositeConfiguration); configuration.setDestinationFolder(destination); configuration.setClearCache(isClearCache); @@ -74,8 +75,10 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold * @param destination The destination folder to render and copy files to * @param compositeConfiguration A given {@link CompositeConfiguration} * @return A configuration by given parameters + * @deprecated use {@link #createDefaultJbakeConfiguration(File, File, File, boolean)} instead */ - public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration) { + @Deprecated + public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration) throws JBakeException { DefaultJBakeConfiguration configuration = new DefaultJBakeConfiguration(sourceFolder, compositeConfiguration); configuration.setDestinationFolder(destination); return configuration; @@ -89,7 +92,8 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold * @param config A {@link CompositeConfiguration} * @return A configuration by given parameters */ - public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, CompositeConfiguration config) { + @Deprecated + public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, CompositeConfiguration config) throws JBakeException { return new DefaultJBakeConfiguration(sourceFolder,config); } @@ -102,11 +106,11 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold * @param destinationFolder The destination folder to render and copy files to * @param isClearCache Whether to clear database cache or not * @return A configuration by given parameters - * @throws ConfigurationException if loading the configuration fails + * @throws JBakeException if loading the configuration fails * @deprecated use {@link #createJettyJbakeConfiguration(File, File, File, boolean)} instead */ @Deprecated - public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, boolean isClearCache) throws ConfigurationException { + public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, boolean isClearCache) throws JBakeException { return createJettyJbakeConfiguration(sourceFolder, destinationFolder, (File)null, isClearCache); } @@ -120,9 +124,9 @@ public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder * @param propertiesFile The properties file for the project * @param isClearCache Whether to clear database cache or not * @return A configuration by given parameters - * @throws ConfigurationException if loading the configuration fails + * @throws JBakeException if loading the configuration fails */ - public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, File propertiesFile, boolean isClearCache) throws ConfigurationException { + public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, File propertiesFile, boolean isClearCache) throws JBakeException { DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) getConfigUtil().loadConfig(sourceFolder, propertiesFile); configuration.setDestinationFolder(destinationFolder); configuration.setClearCache(isClearCache); diff --git a/jbake-core/src/main/java/org/jbake/launcher/Main.java b/jbake-core/src/main/java/org/jbake/launcher/Main.java index 2577a2163..c244848f7 100644 --- a/jbake-core/src/main/java/org/jbake/launcher/Main.java +++ b/jbake-core/src/main/java/org/jbake/launcher/Main.java @@ -82,8 +82,8 @@ public void run(String[] args) throws JBakeException { config = getJBakeConfigurationFactory().setEncoding(res.getPropertiesEncoding()).createDefaultJbakeConfiguration(res.getSource(), res.getDestination(), res.getConfig(), res.isClearCache()); } run(res, config); - } catch (final ConfigurationException e) { - throw new JBakeException(SystemExit.CONFIGURATION_ERROR, "Configuration error: " + e.getMessage(), e); + } catch (final JBakeException e) { + throw e; } catch (MissingParameterException mex) { throw new JBakeException(SystemExit.CONFIGURATION_ERROR, mex.getMessage(), mex); } catch (final Throwable e) { diff --git a/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java b/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java index 88a2a3e59..5fd60a39c 100644 --- a/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java +++ b/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java @@ -7,6 +7,7 @@ import java.io.File; import java.io.FileWriter; +import java.util.Properties; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.Mockito.spy; @@ -111,4 +112,19 @@ public void shouldUseCustomEncoding() throws Exception { assertThat(factory.getConfigUtil().getEncoding()).isEqualTo("latin1"); verify(util).loadConfig(sourceFolder, null); } + + @Test + void shouldBeAbleToAddCustomProperties() { + File sourceFolder = root; + File destinationFolder = TestUtils.newFolder(root, "output"); + DefaultJBakeConfiguration config = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(sourceFolder, destinationFolder, true); + Properties properties = new Properties(); + properties.setProperty("custom.key", "custom value"); + properties.setProperty("custom.key2", "custom value 2"); + + config.addConfiguration(properties); + + assertThat(config.get("custom.key")).isEqualTo("custom value"); + assertThat(config.get("custom.key2")).isEqualTo("custom value 2"); + } } diff --git a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java index 3aa61a998..0d2083929 100644 --- a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java +++ b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java @@ -219,6 +219,14 @@ void shouldThrowJBakeExceptionWithSystemExitCodeOnUnexpectedError(@TempDir Path assertThat(e.getExit()).isEqualTo(SystemExit.ERROR.getStatus()); } + @Test + void shouldThrowAJBakeExceptionWithConfigurationErrorIfLoadThrowsAnCompositeException() { + when(factory.setEncoding(any())).thenReturn(factory); + doThrow(new JBakeException(SystemExit.CONFIGURATION_ERROR, "something went wrong")).when(factory).createDefaultJbakeConfiguration(any(File.class), any(File.class), any(File.class), anyBoolean()); + JBakeException e = assertThrows(JBakeException.class, () -> main.run(new String[]{"-b"})); + assertThat(e.getExit()).isEqualTo(SystemExit.CONFIGURATION_ERROR.getStatus()); + } + @Test void shouldListCurrentSettings(@TempDir Path source) throws ConfigurationException { File src = newFolder(source, "src/jbake"); From a3fdbf0a2294b12c6b19ae3a6c38d8f060fc7eef Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 24 May 2021 22:14:14 +0100 Subject: [PATCH 175/256] Updated version to 2.7.0-rc.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 35bd27fac..9958b63f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.1 +version = 2.7.0-rc.2 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From c2abe66960a23f1487ea1f6c49773fe27d622d6b Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 24 May 2021 23:37:37 +0100 Subject: [PATCH 176/256] Updated jbake-core to 2.7.0-rc.2 Removed dependency on Apache Commons Configuration. --- pom.xml | 13 ++----------- src/main/java/org/jbake/maven/GenerateMojo.java | 7 +++---- src/main/java/org/jbake/maven/InlineMojo.java | 5 ++--- src/main/java/org/jbake/maven/SeedMojo.java | 3 +-- src/main/java/org/jbake/maven/WatchMojo.java | 2 +- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 63d7b07e5..fc0f0dc46 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.5-SNAPSHOT + 0.3.5-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.6 + 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 499b82cfc..fcb70cc91 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 e99c6eb34..5f2a5259f 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 d92465e55..231745705 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 5c47575b9..e359dc099 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 From 81708fd057dc29598b4109489f0e5b08e920bf08 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 24 May 2021 23:41:40 +0100 Subject: [PATCH 177/256] Updated version number. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc0f0dc46..5e944c7c2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.5-rc.2 + 0.3.6-rc.2 maven-plugin From a15db5017b47357259957e08ac2a627963ed2c8e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 24 May 2021 23:48:01 +0100 Subject: [PATCH 178/256] [maven-release-plugin] prepare release v0.3.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 119be58f6..7dc4c50e3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.5-SNAPSHOT + 0.3.5 maven-plugin From 680351fbc24665f3acb543356de62d66f607b365 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 24 May 2021 23:48:22 +0100 Subject: [PATCH 179/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7dc4c50e3..d1b04e2fd 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.5 + 0.3.6-SNAPSHOT maven-plugin From 7731b388401871f186e261b76f5914e3e6541915 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Tue, 25 May 2021 00:06:25 +0100 Subject: [PATCH 180/256] Updated version number. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e944c7c2..5d4abe877 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.6-rc.2 + 0.3.6-SNAPSHOT maven-plugin From 3f0f59ac79cf9dd23bb68be9742fc49df7191aad Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Tue, 25 May 2021 14:01:19 +0100 Subject: [PATCH 181/256] [maven-release-plugin] prepare release v0.3.6-rc.2 --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d4abe877..0119ff4fc 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,6 +79,10 @@ org.apache.commons commons-lang3 + + org.apache.commons + commons-configuration2 + org.apache.maven maven-settings @@ -123,6 +127,11 @@ commons-lang3 3.10 + + org.apache.commons + commons-configuration2 + 2.7 + commons-io commons-io From e550c42b1cea4b360c5bc81183ecc87122a4291e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Tue, 25 May 2021 14:01:37 +0100 Subject: [PATCH 182/256] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0119ff4fc..3a120eb14 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.jbake jbake-maven-plugin - 0.3.6-rc.2 + 0.3.7-SNAPSHOT maven-plugin From 582954177838879fc8e0ec9e18e8b2763cae57c2 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 5 Jun 2021 00:52:57 +0100 Subject: [PATCH 183/256] Fixes #692 --- .../src/main/java/org/jbake/app/Renderer.java | 2 +- .../DefaultJBakeConfiguration.java | 13 ++++++++-- .../app/configuration/JBakeConfiguration.java | 4 +++- .../app/configuration/ConfigUtilTest.java | 6 +++-- .../test/resources/fixture/content/team.html | 7 ++++++ .../groovyMarkupTemplates/special/team.tpl | 24 +++++++++++++++++++ .../test/resources/fixture/jbake.properties | 1 + 7 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 jbake-core/src/test/resources/fixture/content/team.html create mode 100644 jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl diff --git a/jbake-core/src/main/java/org/jbake/app/Renderer.java b/jbake-core/src/main/java/org/jbake/app/Renderer.java index 625d70998..5508fd327 100644 --- a/jbake-core/src/main/java/org/jbake/app/Renderer.java +++ b/jbake-core/src/main/java/org/jbake/app/Renderer.java @@ -100,7 +100,7 @@ public Renderer(ContentStore db, JBakeConfiguration config, DelegatingTemplateEn } private String findTemplateName(String docType) { - return config.getTemplateFileByDocType(docType).getName(); + return config.getTemplateByDocType(docType); } /** diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java index 5de7d8e3c..7e48bdada 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java @@ -468,16 +468,25 @@ public String getTemplateEncoding() { } @Override - public File getTemplateFileByDocType(String docType) { + public String getTemplateByDocType(String docType) { String templateKey = DOCTYPE_TEMPLATE_PREFIX + docType + DOCTYPE_FILE_POSTFIX; String templateFileName = getAsString(templateKey); if (templateFileName != null) { - return new File(getTemplateFolder(), templateFileName); + return templateFileName; } logger.warn("Cannot find configuration key '{}' for document type '{}'", templateKey, docType); return null; } + @Override + public File getTemplateFileByDocType(String docType) { + String templateFileName = getTemplateByDocType(docType); + if (templateFileName != null) { + return new File(getTemplateFolder(), templateFileName); + } + return null; + } + @Override public File getTemplateFolder() { return getAsFolder(TEMPLATE_FOLDER_KEY); diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java index 3a18536b5..cdd11e6bb 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java @@ -297,7 +297,9 @@ public interface JBakeConfiguration { */ String getTemplateEncoding(); - File getTemplateFileByDocType(String masterindex); + String getTemplateByDocType(String doctype); + + File getTemplateFileByDocType(String doctype); /** * @return the template folder diff --git a/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java b/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java index 4db87a457..e0863e45f 100644 --- a/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java +++ b/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java @@ -140,8 +140,10 @@ public void shouldGetTemplateFileDoctype() throws Exception { JBakeConfiguration config = util.loadConfig(sourceFolder); File templateFile = config.getTemplateFileByDocType("masterindex"); - assertThat(templateFile).isEqualTo(expectedTemplateFile); + + String templateFile2 = config.getTemplateByDocType("team"); + assertThat(templateFile2).isEqualTo("special/team.tpl"); } @Test @@ -190,7 +192,7 @@ public void shouldReturnConfiguredDocTypes() throws Exception { List docTypes = config.getDocumentTypes(); - assertThat(docTypes).containsExactly("allcontent", "masterindex", "feed", "error404", "archive", "tag", "tagsindex", "sitemap", "post", "page"); + assertThat(docTypes).containsExactly("allcontent", "team", "masterindex", "feed", "error404", "archive", "tag", "tagsindex", "sitemap", "post", "page"); } diff --git a/jbake-core/src/test/resources/fixture/content/team.html b/jbake-core/src/test/resources/fixture/content/team.html new file mode 100644 index 000000000..69047f288 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/content/team.html @@ -0,0 +1,7 @@ +title=About +date=2013-02-27 +type=team +status=published +~~~~~~ + +All about stuff! diff --git a/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl new file mode 100644 index 000000000..dde7509f9 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl @@ -0,0 +1,24 @@ +package fixture.groovyMarkupTemplates.special + +layout 'layout/main.tpl', + bodyContents: contents { + + div(class:"row-fluid marketing"){ + div(class:"span12"){ + h4("${content.title}") + p("${content.body}") + } + } + + hr() + + h5('Published Pages') + published_pages.each {page -> + a(href:"${config.site_host}${page.uri}","${page.title}") + } + + } + + + + diff --git a/jbake-core/src/test/resources/fixture/jbake.properties b/jbake-core/src/test/resources/fixture/jbake.properties index c7b8505b3..4f181c168 100644 --- a/jbake-core/src/test/resources/fixture/jbake.properties +++ b/jbake-core/src/test/resources/fixture/jbake.properties @@ -17,5 +17,6 @@ site.host=http://www.jbake.org template.feed.thymeleaf.mode=XML template.sitemap.thymeleaf.mode=XML template.allcontent.file=allcontent.ftl +template.team.file=special/team.tpl site.about=中文属性使用默认Properties编码(Property value in Chinese will let property `site.about` missing due to Apache Configuration implementation.) jvm.locale=fr From 643aeb68790d3cf9fd78d233c56694146ed7caca Mon Sep 17 00:00:00 2001 From: Manik Magar Date: Sat, 12 Jun 2021 21:34:19 -0400 Subject: [PATCH 184/256] Allow setting docker image timezone by env variable --- Dockerfile | 8 ++++++++ README.asciidoc | 3 +++ 2 files changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4359ce503..7d0d5504a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,14 @@ FROM adoptopenjdk/openjdk11:alpine-jre ENV JBAKE_USER=jbake ENV JBAKE_HOME=/opt/jbake ENV PATH ${JBAKE_HOME}/bin:$PATH +ENV TZ=UTC + +RUN apk --no-cache update && \ + apk --no-cache upgrade && \ + apk add --update tzdata && \ + rm -rf /var/cache/apk/* + +RUN echo ${TZ} > /etc/timezone RUN adduser -D -u 1000 -g "" ${JBAKE_USER} ${JBAKE_USER} diff --git a/README.asciidoc b/README.asciidoc index e0a6a9924..5e5383d65 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -91,6 +91,9 @@ This command will also expose port 8820 from the container, you'll also need to server.hostname=0.0.0.0 ---- +NOTE: Docker image timezone is _UTC_. This may affect the date and time expected in output content. To set different timezone, add `TZ` environment variable and set value to required https://en.wikipedia.org/wiki/List_of_tz_database_time_zones[timezone^]. Example - `docker run --rm -u jbake -e TZ=America/New_York -v "$PWD":/mnt/site jbake/jbake:latest` + + == Build System The project uses http://gradle.org[Gradle] 4.9+ as the build system. From 9bf06c16cbafdb2b460d6d94df97b4f02468c712 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 13 Jun 2021 12:01:28 +0100 Subject: [PATCH 185/256] Fixes #708 --- .../org/jbake/render/DocumentsRenderer.java | 72 ++++++++++++------- .../jbake/render/DocumentsRendererTest.java | 71 +++++++++++++----- 2 files changed, 97 insertions(+), 46 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java index 742cc473b..9e481922e 100644 --- a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java +++ b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java @@ -18,30 +18,14 @@ public class DocumentsRenderer implements RenderingTool { @Override public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) throws RenderingException { int renderedCount = 0; - int index = 0; final List errors = new LinkedList<>(); - DocumentModel nextDocument = null; DocumentList documentList = db.getUnrenderedContent(); for (DocumentModel document : documentList) { try { - document.setNextContent(null); - document.setPreviousContent(null); - - if (nextDocument != null && index > 0) { - document.setNextContent(getContentForNav(nextDocument)); - } - - if (index < documentList.size() - 1) { - DocumentModel tempNext = findPrevPublishedDocument(documentList, index); - if (tempNext != null) { - document.setPreviousContent(getContentForNav(tempNext)); - } - } - - if (isPublished(document)) { - nextDocument = document; - } + DocumentList typedDocList = db.getAllContent(document.getType()); + setPrevDoc(typedDocList, document); + setNextDoc(typedDocList, document); renderer.render(document); db.markContentAsRendered(document); @@ -50,8 +34,6 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) } catch (Exception e) { errors.add(e.getMessage()); } - - index++; } if (!errors.isEmpty()) { @@ -66,14 +48,50 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) } } - private DocumentModel findPrevPublishedDocument(DocumentList documentList, int index) { - for ( int prevDocIndex = index+1; prevDocIndex < documentList.size(); ++prevDocIndex ) { - DocumentModel prevDocument = documentList.get(prevDocIndex); - if (isPublished(prevDocument)) { - return prevDocument; + private void setNextDoc(DocumentList typedList, DocumentModel doc) { + int typedListIndex = typedList.indexOf(doc); + if (typedList.getFirst().equals(doc)) { + // initial doc in typed list so there is no next + doc.setNextContent(null); + } else { + boolean found = false; + while (!found) { + try { + DocumentModel nextDoc = typedList.get(typedListIndex - 1); + if (isPublished(nextDoc)) { + doc.setNextContent(getContentForNav(nextDoc)); + found = true; + } else { + typedListIndex--; + } + } catch (IndexOutOfBoundsException ex) { + found = true; + } + } + } + } + + private void setPrevDoc(DocumentList typedList, DocumentModel doc) { + int typedListIndex = typedList.indexOf(doc); + if (typedList.getLast().equals(doc)) { + // last doc in typed list so there is no previous + doc.setPreviousContent(null); + } else { + boolean found = false; + while (!found) { + try { + DocumentModel prevDoc = typedList.get(typedListIndex + 1); + if (isPublished(prevDoc)) { + doc.setPreviousContent(getContentForNav(prevDoc)); + found = true; + } else { + typedListIndex++; + } + } catch (IndexOutOfBoundsException ex) { + found = true; + } } } - return null; } private boolean isPublished(DocumentModel document) { diff --git a/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java b/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java index 9003ef3d6..5985ccc15 100644 --- a/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java +++ b/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java @@ -75,6 +75,7 @@ public void shouldReturnCountOfProcessedDocuments() throws Exception { // return given DocumentList for DocumentType 'custom type' when(db.getUnrenderedContent()).thenReturn(templateModelList); + when(db.getAllContent(any())).thenReturn(templateModelList); // when: int renderResponse = documentsRenderer.render(renderer, db, configuration); @@ -120,32 +121,63 @@ public void shouldContainPostNavigation() throws Exception { DocumentTypes.addDocumentType("customType"); String firstTitle = "First Document"; - String secondTitleIsDraft = "Second Document (draft)"; + DocumentModel firstDoc = simpleDocument(firstTitle, ModelAttributes.Status.PUBLISHED, "page"); + String secondTitle = "Second Document"; + DocumentModel secondDoc = simpleDocument(secondTitle, ModelAttributes.Status.PUBLISHED, "post"); String thirdTitle = "Third Document"; - String fourthTitle = "Fourth Document"; - - DocumentList documents = new DocumentList(); - // Attributes.Status.PUBLISHED_DATE cannot occur here - // because it's converted TO either PUBLISHED or DRAFT in the Crawler. - documents.add(simpleDocument(fourthTitle, ModelAttributes.Status.PUBLISHED)); - documents.add(simpleDocument(thirdTitle, ModelAttributes.Status.PUBLISHED)); - documents.add(simpleDocument(secondTitleIsDraft, ModelAttributes.Status.DRAFT)); - documents.add(simpleDocument(firstTitle, ModelAttributes.Status.PUBLISHED)); - - when(db.getUnrenderedContent()).thenReturn(documents); + DocumentModel thirdDoc = simpleDocument(thirdTitle, ModelAttributes.Status.PUBLISHED, "page"); + String fourthTitle = "Fourth Document (draft)"; + DocumentModel fourthDoc = simpleDocument(fourthTitle, ModelAttributes.Status.DRAFT, "post"); + String fifthTitle = "Fifth Document"; + DocumentModel fifthDoc = simpleDocument(fifthTitle, ModelAttributes.Status.PUBLISHED, "page"); + String sixthTitle = "Sixth Document"; + DocumentModel sixthDoc = simpleDocument(sixthTitle, ModelAttributes.Status.PUBLISHED, "post"); + String seventhTitle = "Seventh Document"; + DocumentModel seventhDoc = simpleDocument(seventhTitle, ModelAttributes.Status.PUBLISHED, "post"); + + DocumentList allDocs = new DocumentList(); + allDocs.add(seventhDoc); + allDocs.add(sixthDoc); + allDocs.add(fifthDoc); + allDocs.add(fourthDoc); + allDocs.add(thirdDoc); + allDocs.add(secondDoc); + allDocs.add(firstDoc); + + DocumentList pageDocs = new DocumentList(); + pageDocs.add(fifthDoc); + pageDocs.add(thirdDoc); + pageDocs.add(firstDoc); + + DocumentList postDocs = new DocumentList(); + postDocs.add(seventhDoc); + postDocs.add(sixthDoc); + postDocs.add(fourthDoc); + postDocs.add(secondDoc); + + when(db.getUnrenderedContent()).thenReturn(allDocs); + when(db.getAllContent("page")).thenReturn(pageDocs); + when(db.getAllContent("post")).thenReturn(postDocs); // when int renderResponse = documentsRenderer.render(renderer, db, configuration); // then - verify(renderer, times(4)).render(argument.capture()); - + verify(renderer, times(7)).render(argument.capture()); final Map> renderedDocs = asTitleToDocMap(argument.getAllValues()); + + // page checks + assertDocumentNavigation(renderedDocs.get(fifthTitle), thirdTitle, null); + assertDocumentNavigation(renderedDocs.get(thirdTitle), firstTitle, fifthTitle); assertDocumentNavigation(renderedDocs.get(firstTitle), null, thirdTitle); - assertDocumentNavigation(renderedDocs.get(secondTitleIsDraft), firstTitle, thirdTitle); - assertDocumentNavigation(renderedDocs.get(thirdTitle), firstTitle, fourthTitle); - assertDocumentNavigation(renderedDocs.get(fourthTitle), thirdTitle, null); - assertThat(renderResponse).isEqualTo(4); + + // post checks + assertDocumentNavigation(renderedDocs.get(seventhTitle), sixthTitle, null); + assertDocumentNavigation(renderedDocs.get(sixthTitle), secondTitle, seventhTitle); + assertDocumentNavigation(renderedDocs.get(fourthTitle), secondTitle, sixthTitle); + assertDocumentNavigation(renderedDocs.get(secondTitle), null, sixthTitle); + + assertThat(renderResponse).isEqualTo(7); } private void assertDocumentNavigation( @@ -166,11 +198,12 @@ private DocumentModel emptyDocument() { return new DocumentModel(); } - private DocumentModel simpleDocument(String title, String status) { + private DocumentModel simpleDocument(String title, String status, String docType) { DocumentModel simpleDoc = new DocumentModel(); String uri = title.replace(" ", "_"); simpleDoc.setNoExtensionUri(uri); simpleDoc.setUri(uri); + simpleDoc.setType(docType); simpleDoc.setTitle(title); simpleDoc.setStatus(status); return simpleDoc; From e70d424b49ffdfd28df1a2244777bc8a05687443 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 20 Jun 2021 23:13:45 +0100 Subject: [PATCH 186/256] Updated version to 2.7.0-rc.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9958b63f4..1643c92b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.2 +version = 2.7.0-rc.3 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From bfc8bdfd815cad8cce05f840d734d3d2aa6249bb Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 24 Jun 2021 23:27:25 -0500 Subject: [PATCH 187/256] Pointing documentation to changed default port introduced in #28 --- README.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 295e1b9d4..00d5d38d1 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -145,7 +145,7 @@ There are 4 goals provided by this plugin: * `jbake:seed` - seeds your project/site with example content and templates * `jbake:generate` - bakes your project/site * `jbake:watch` - watches to changes and bakes your site whenever a change is detected -* `jbake:inline` - bakes, watches and serves out content on http://localhost:8080[http://localhost:8080] +* `jbake:inline` - bakes, watches and serves out content on http://localhost:8820[http://localhost:8820] You can also more details on each goal by running the help goal: From 0fcb8626deb0d84416588ae47c44103cf8081e70 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Tue, 20 Jul 2021 12:10:46 +0100 Subject: [PATCH 188/256] Fix for #714 --- .../org/jbake/render/DocumentsRenderer.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java index 9e481922e..066c89d7f 100644 --- a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java +++ b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java @@ -24,8 +24,10 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) for (DocumentModel document : documentList) { try { DocumentList typedDocList = db.getAllContent(document.getType()); - setPrevDoc(typedDocList, document); - setNextDoc(typedDocList, document); + DocumentModel prev = getPrevDoc(typedDocList, document); + DocumentModel next = getNextDoc(typedDocList, document); + document.setPreviousContent(prev); + document.setNextContent(next); renderer.render(document); db.markContentAsRendered(document); @@ -48,47 +50,43 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) } } - private void setNextDoc(DocumentList typedList, DocumentModel doc) { + private DocumentModel getNextDoc(DocumentList typedList, DocumentModel doc) { int typedListIndex = typedList.indexOf(doc); if (typedList.getFirst().equals(doc)) { // initial doc in typed list so there is no next - doc.setNextContent(null); + return null; } else { - boolean found = false; - while (!found) { + while (true) { try { DocumentModel nextDoc = typedList.get(typedListIndex - 1); if (isPublished(nextDoc)) { - doc.setNextContent(getContentForNav(nextDoc)); - found = true; + return getContentForNav(nextDoc); } else { typedListIndex--; } } catch (IndexOutOfBoundsException ex) { - found = true; + return null; } } } } - private void setPrevDoc(DocumentList typedList, DocumentModel doc) { + private DocumentModel getPrevDoc(DocumentList typedList, DocumentModel doc) { int typedListIndex = typedList.indexOf(doc); if (typedList.getLast().equals(doc)) { // last doc in typed list so there is no previous - doc.setPreviousContent(null); + return null; } else { - boolean found = false; - while (!found) { + while (true) { try { DocumentModel prevDoc = typedList.get(typedListIndex + 1); if (isPublished(prevDoc)) { - doc.setPreviousContent(getContentForNav(prevDoc)); - found = true; + return getContentForNav(prevDoc); } else { typedListIndex++; } } catch (IndexOutOfBoundsException ex) { - found = true; + return null; } } } From 13584ed85d8b8a4e39fafe374aac55eff55d8068 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 21 Jul 2021 19:15:48 +0100 Subject: [PATCH 189/256] Update version to 2.7.0-rc.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1643c92b7..2c4a9ef9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.3 +version = 2.7.0-rc.4 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From bb4de1db765ab4d7a13e7e3c8526611f98407d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Thu, 2 Sep 2021 20:32:28 +0200 Subject: [PATCH 190/256] Change protocol used to clone examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git > On the Git protocol side, unencrypted git://... > We’ll be disabling support for this protocol. --- gradle/application.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/application.gradle b/gradle/application.gradle index 522ecd86a..db96255dd 100644 --- a/gradle/application.gradle +++ b/gradle/application.gradle @@ -6,11 +6,11 @@ applicationName = "jbake" def examplesBase = "$project.buildDir/examples" def exampleRepositories = [ - "example_project_freemarker": "git://github.com/jbake-org/jbake-example-project-freemarker.git", - "example_project_groovy" : "git://github.com/jbake-org/jbake-example-project-groovy.git", - "example_project_thymeleaf" : "git://github.com/jbake-org/jbake-example-project-thymeleaf.git", - "example_project_groovy-mte": "git://github.com/jbake-org/jbake-example-project-groovy-mte.git", - "example_project_jade" : "git://github.com/jbake-org/jbake-example-project-jade.git" + "example_project_freemarker": "https://github.com/jbake-org/jbake-example-project-freemarker.git", + "example_project_groovy" : "https://github.com/jbake-org/jbake-example-project-groovy.git", + "example_project_thymeleaf" : "https://github.com/jbake-org/jbake-example-project-thymeleaf.git", + "example_project_groovy-mte": "https://github.com/jbake-org/jbake-example-project-groovy-mte.git", + "example_project_jade" : "https://github.com/jbake-org/jbake-example-project-jade.git" ] //create clone and Zip Task for each repository From 295f249ee49972d817470de8f8ee4b980f2ed9d7 Mon Sep 17 00:00:00 2001 From: Craig McDonald Date: Thu, 16 Sep 2021 00:26:53 +0100 Subject: [PATCH 191/256] Documentation - contribution document updated to reflect support for Java 8 --- CONTRIBUTING.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc index a22c2253b..e3ba82bd3 100644 --- a/CONTRIBUTING.asciidoc +++ b/CONTRIBUTING.asciidoc @@ -96,5 +96,5 @@ review the JBake documentation and make... === Supported Java Versions -At present JBake supports Java 7 and above and any contributions shouldn't use Java 8+ syntax, please see -the {uri-issues}[roadmap] for when support for Java 8 is planned. \ No newline at end of file +At present JBake supports Java 8 and above so any contributions shouldn't use Java 9+ syntax, please see +the {uri-issues}[roadmap] for when support for later Java versions is planned. From 95e277654688f210aba39a7a1d59928e4bba486f Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 18 Oct 2021 19:06:42 -0400 Subject: [PATCH 192/256] Fixes #726 Allows you to override the time zone used to display date and time in Freemarker templates. --- .../app/configuration/DefaultJBakeConfiguration.java | 9 +++++++++ .../org/jbake/app/configuration/JBakeConfiguration.java | 7 +++++++ .../java/org/jbake/app/configuration/PropertyList.java | 5 +++++ .../org/jbake/template/FreemarkerTemplateEngine.java | 4 ++++ 4 files changed, 25 insertions(+) diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java index 7e48bdada..223b0f624 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java @@ -702,4 +702,13 @@ public String getAbbreviatedGitHash() { public String getJvmLocale() { return getAsString(JVM_LOCALE.getKey()); } + + @Override + public TimeZone getFreemarkerTimeZone() { + String timezone = getAsString(FREEMARKER_TIMEZONE.getKey()); + if (StringUtils.isNotEmpty(timezone)) { + return TimeZone.getTimeZone(timezone); + } + return null; + } } diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java index cdd11e6bb..98e2625db 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.TimeZone; /** * JBakeConfiguration gives you access to the project configuration. Typically located in a file called jbake.properties. @@ -367,6 +368,12 @@ public interface JBakeConfiguration { */ String getJvmLocale(); + /** + * + * @return TimeZone to use within Freemarker + */ + TimeZone getFreemarkerTimeZone(); + Map asHashMap(); List getJbakeProperties(); diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java b/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java index f212c9bec..99db20081 100644 --- a/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java +++ b/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java @@ -110,6 +110,11 @@ public abstract class PropertyList { "filename to use for feed" ); + public static final Property FREEMARKER_TIMEZONE = new Property( + "freemarker.timezone", + "TimeZone to use within Freemarker" + ); + public static final Property GIT_HASH = new Property( "git.hash", "abbreviated git hash" diff --git a/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java index c8f6f0be0..2935e067e 100644 --- a/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java +++ b/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java @@ -51,6 +51,10 @@ private void createTemplateConfiguration() { templateCfg = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); templateCfg.setDefaultEncoding(config.getRenderEncoding()); templateCfg.setOutputEncoding(config.getOutputEncoding()); + if (config.getFreemarkerTimeZone() != null) { + templateCfg.setTimeZone(config.getFreemarkerTimeZone()); + templateCfg.setSQLDateAndTimeTimeZone(config.getFreemarkerTimeZone()); + } try { templateCfg.setDirectoryForTemplateLoading(config.getTemplateFolder()); } catch (IOException e) { From 5bbc76b08a7a8b3f2539e97bc55f830f412abb96 Mon Sep 17 00:00:00 2001 From: Anthony Fryer Date: Wed, 3 Nov 2021 09:53:18 +1000 Subject: [PATCH 193/256] upgraded sparq-core version from 2.3 to 2.9.3 to fix https://github.com/jbake-org/jbake/issues/466 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a120eb14..d1870f17b 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ com.sparkjava spark-core - 2.3 + 2.9.3 From a3df558b38e2c4f6afbcdbe696c2fa032bb58de5 Mon Sep 17 00:00:00 2001 From: shisheng-1 <240274530@qq.com> Date: Tue, 9 Nov 2021 07:57:07 +0800 Subject: [PATCH 194/256] Improve GRADLE build Performance --- gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle.properties b/gradle.properties index 2c4a9ef9d..657fe8e46 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,3 +45,5 @@ grgitVersion = 4.1.0 org.gradle.caching=true org.gradle.parallel=true +org.gradle.configureondemand = true +org.gradle.vfs.watch = true From e9f570cd83b27bfcf6a74faa939902d358523ba8 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Fri, 19 Nov 2021 23:59:20 +0000 Subject: [PATCH 195/256] Update version to 2.7.0-rc.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 657fe8e46..d1e77fef3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.4 +version = 2.7.0-rc.5 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From aa11e2955a08831f1670122f910815c7a1e05575 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 22 Dec 2021 21:24:43 +0000 Subject: [PATCH 196/256] Fix data files being referenced from Pebble templates. --- .../java/org/jbake/template/model/DataExtractor.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java index 2f33ea29d..b818825e6 100644 --- a/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java +++ b/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java @@ -1,23 +1,17 @@ package org.jbake.template.model; import org.jbake.app.ContentStore; -import org.jbake.app.DocumentList; import org.jbake.template.ModelExtractor; import org.jbake.util.DataFileUtil; - -import static org.jbake.app.configuration.PropertyList.*; - -import java.util.HashMap; import java.util.Map; +import static org.jbake.app.configuration.PropertyList.*; public class DataExtractor implements ModelExtractor { @Override public DataFileUtil get(ContentStore db, Map model, String key) { - DocumentList dl = new DocumentList(); Map config = (Map) model.get("config"); - - String defaultDocType = config.get(DATA_FILE_DOCTYPE.getKey()).toString(); + String defaultDocType = config.get(DATA_FILE_DOCTYPE.getKey().replace(".", "_")).toString(); DataFileUtil dataUtil = new DataFileUtil(db, defaultDocType); return dataUtil; } From 9cb1dca37b74d40158c978fa736023e6d737cba7 Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Tue, 28 Dec 2021 14:07:33 +0100 Subject: [PATCH 197/256] Moved all files into subdir jbake-maven-plugin to prepare to merge into jbake repo. --- .gitignore => jbake-maven-plugin/.gitignore | 0 .hgignore => jbake-maven-plugin/.hgignore | 0 .hgtags => jbake-maven-plugin/.hgtags | 0 .travis.yml => jbake-maven-plugin/.travis.yml | 0 README.asciidoc => jbake-maven-plugin/README.asciidoc | 0 pom.xml => jbake-maven-plugin/pom.xml | 0 .../src}/main/java/org/jbake/maven/GenerateMojo.java | 0 .../src}/main/java/org/jbake/maven/InlineMojo.java | 0 .../src}/main/java/org/jbake/maven/SeedMojo.java | 0 .../src}/main/java/org/jbake/maven/WatchMojo.java | 0 .../src}/main/java/org/jbake/maven/util/DirWatcher.java | 0 .../src}/main/resources/META-INF/plexus/components.xml | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => jbake-maven-plugin/.gitignore (100%) rename .hgignore => jbake-maven-plugin/.hgignore (100%) rename .hgtags => jbake-maven-plugin/.hgtags (100%) rename .travis.yml => jbake-maven-plugin/.travis.yml (100%) rename README.asciidoc => jbake-maven-plugin/README.asciidoc (100%) rename pom.xml => jbake-maven-plugin/pom.xml (100%) rename {src => jbake-maven-plugin/src}/main/java/org/jbake/maven/GenerateMojo.java (100%) rename {src => jbake-maven-plugin/src}/main/java/org/jbake/maven/InlineMojo.java (100%) rename {src => jbake-maven-plugin/src}/main/java/org/jbake/maven/SeedMojo.java (100%) rename {src => jbake-maven-plugin/src}/main/java/org/jbake/maven/WatchMojo.java (100%) rename {src => jbake-maven-plugin/src}/main/java/org/jbake/maven/util/DirWatcher.java (100%) rename {src => jbake-maven-plugin/src}/main/resources/META-INF/plexus/components.xml (100%) diff --git a/.gitignore b/jbake-maven-plugin/.gitignore similarity index 100% rename from .gitignore rename to jbake-maven-plugin/.gitignore diff --git a/.hgignore b/jbake-maven-plugin/.hgignore similarity index 100% rename from .hgignore rename to jbake-maven-plugin/.hgignore diff --git a/.hgtags b/jbake-maven-plugin/.hgtags similarity index 100% rename from .hgtags rename to jbake-maven-plugin/.hgtags diff --git a/.travis.yml b/jbake-maven-plugin/.travis.yml similarity index 100% rename from .travis.yml rename to jbake-maven-plugin/.travis.yml diff --git a/README.asciidoc b/jbake-maven-plugin/README.asciidoc similarity index 100% rename from README.asciidoc rename to jbake-maven-plugin/README.asciidoc diff --git a/pom.xml b/jbake-maven-plugin/pom.xml similarity index 100% rename from pom.xml rename to jbake-maven-plugin/pom.xml diff --git a/src/main/java/org/jbake/maven/GenerateMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java similarity index 100% rename from src/main/java/org/jbake/maven/GenerateMojo.java rename to jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java diff --git a/src/main/java/org/jbake/maven/InlineMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java similarity index 100% rename from src/main/java/org/jbake/maven/InlineMojo.java rename to jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java diff --git a/src/main/java/org/jbake/maven/SeedMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java similarity index 100% rename from src/main/java/org/jbake/maven/SeedMojo.java rename to jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java diff --git a/src/main/java/org/jbake/maven/WatchMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java similarity index 100% rename from src/main/java/org/jbake/maven/WatchMojo.java rename to jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java diff --git a/src/main/java/org/jbake/maven/util/DirWatcher.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java similarity index 100% rename from src/main/java/org/jbake/maven/util/DirWatcher.java rename to jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java diff --git a/src/main/resources/META-INF/plexus/components.xml b/jbake-maven-plugin/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from src/main/resources/META-INF/plexus/components.xml rename to jbake-maven-plugin/src/main/resources/META-INF/plexus/components.xml From 05f2d386799c8484ef7e711d7a0c96ad9ad1a21a Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Tue, 28 Dec 2021 15:39:52 +0100 Subject: [PATCH 198/256] Remove dead Mercurial files --- jbake-maven-plugin/.hgignore | 9 --------- jbake-maven-plugin/.hgtags | 6 ------ 2 files changed, 15 deletions(-) delete mode 100644 jbake-maven-plugin/.hgignore delete mode 100644 jbake-maven-plugin/.hgtags diff --git a/jbake-maven-plugin/.hgignore b/jbake-maven-plugin/.hgignore deleted file mode 100644 index 6bcb865b6..000000000 --- a/jbake-maven-plugin/.hgignore +++ /dev/null @@ -1,9 +0,0 @@ -.settings -.idea -target -.classpath -.project -syntax:glob -*.log -syntax:glob -*.iml diff --git a/jbake-maven-plugin/.hgtags b/jbake-maven-plugin/.hgtags deleted file mode 100644 index 24dc6ec62..000000000 --- a/jbake-maven-plugin/.hgtags +++ /dev/null @@ -1,6 +0,0 @@ -29a2a0ff369456f68e2f0f772a04428829335763 jbake-maven-plugin-0.0.1 -a4cc0a5a7e191369db77919f9bb1424693f0ec8e jbake-maven-plugin-0.0.2 -dac515355fb76185faba67020f44735a00e9fdd6 jbake-maven-plugin-0.0.3 -3cefc1a3c056ef859960b0cdcc0ceca49bfbc9da jbake-maven-plugin-0.0.4 -cf9b1156b7ca9818a11814b19274fec23109c880 jbake-maven-plugin-0.0.5 -d2a88144f8c8b75504a6fafdce28eccc74e488cf jbake-maven-plugin-0.0.6 From cc82c034ea327a49142cdd4cff88e793e55ed3cc Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Tue, 28 Dec 2021 15:47:59 +0100 Subject: [PATCH 199/256] Align gitignore and travis files of maven plugin with root gitignore and travis files. --- jbake-maven-plugin/.gitignore | 6 ------ jbake-maven-plugin/.travis.yml | 5 ----- 2 files changed, 11 deletions(-) delete mode 100644 jbake-maven-plugin/.travis.yml diff --git a/jbake-maven-plugin/.gitignore b/jbake-maven-plugin/.gitignore index e729b3880..eb5a316cb 100644 --- a/jbake-maven-plugin/.gitignore +++ b/jbake-maven-plugin/.gitignore @@ -1,7 +1 @@ -.settings -.idea target -.classpath -.project -*.log -*.iml diff --git a/jbake-maven-plugin/.travis.yml b/jbake-maven-plugin/.travis.yml deleted file mode 100644 index a754654d5..000000000 --- a/jbake-maven-plugin/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ -language: java - -jdk: - - oraclejdk11 - - openjdk11 From e475de0959b80c2d4036dd3ef29d641b85028a7e Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Tue, 28 Dec 2021 15:51:24 +0100 Subject: [PATCH 200/256] The maven plugin uses Apache License 2 as noted in the readme and copyright headers. Add license.txt to signal that clearly now that it's part of the jbake repo which is mostly MIT. --- jbake-maven-plugin/LICENSE.txt | 201 +++++++++++++++++++++++++++++ jbake-maven-plugin/README.asciidoc | 9 +- 2 files changed, 206 insertions(+), 4 deletions(-) create mode 100644 jbake-maven-plugin/LICENSE.txt diff --git a/jbake-maven-plugin/LICENSE.txt b/jbake-maven-plugin/LICENSE.txt new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/jbake-maven-plugin/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/jbake-maven-plugin/README.asciidoc b/jbake-maven-plugin/README.asciidoc index 00d5d38d1..e5bd5e4a1 100644 --- a/jbake-maven-plugin/README.asciidoc +++ b/jbake-maven-plugin/README.asciidoc @@ -3,8 +3,6 @@ Jonathan Bullock 2021-04-20 :idprefix: -image:https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin/badge.svg[link="https://maven-badges.herokuapp.com/maven-central/org.jbake/jbake-maven-plugin"] - JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at the following Maven coordinates: @@ -12,10 +10,12 @@ the following Maven coordinates: org.jbake jbake-maven-plugin - 0.3.4 + ... ---- +The JBake Maven Plugin version now matches the JBake version. + Special thanks must go to the original author of this plugin - https://github.com/aldrinleal[Aldrin Leal]. == Usage @@ -30,7 +30,7 @@ To use JBake Maven Plugin in your build add the plugin into your pom.xml as show org.jbake jbake-maven-plugin - 0.3.4 + ... - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - -Xdoclint:none - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.6.0 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - - - From 50b5980836974c14de3c3a79129c3ab78c4b0b08 Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Thu, 30 Dec 2021 09:52:57 +0100 Subject: [PATCH 207/256] jbake-maven-plugin: BUILD.adoc mention --- BUILD.adoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BUILD.adoc b/BUILD.adoc index 024b8d136..dc4f0ffea 100644 --- a/BUILD.adoc +++ b/BUILD.adoc @@ -25,7 +25,7 @@ To get an overview of all available tasks with a short description run `./gradle == Structure -There are 3 projects +There are 4 projects: root aka. jbake-base:: configures subprojects, jacoco execution aggregation and coveralls @@ -34,6 +34,9 @@ jbake-core:: - the core library. produces jbake-core-{version}.jar (`build/libs`) - publishes to bintray maven repository jbake-core +jbake-maven-plugin:: + - the JBake maven plugin, build by Gradle too + jbake-dist:: - bundles the cli to an distribution (`build/distribution`) - publishes to bintray binary repository jbake From 52b7ef4bd75916c061935c528d0e51b76c89eac5 Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Thu, 30 Dec 2021 10:50:32 +0100 Subject: [PATCH 208/256] Restore the optional dependencies --- jbake-core/build.gradle | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 8c05afd28..706d070b2 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -4,6 +4,7 @@ plugins { id "org.jbake.convention.java-common" id 'java-library' id 'org.ajoberstar.grgit' version "$grgitVersion" + id 'nebula.optional-base' version '3.0.3' } apply from: "$rootDir/gradle/maven-publishing.gradle" @@ -21,22 +22,22 @@ dependencies { exclude group: "junit", module: "junit" } implementation "com.orientechnologies:orientdb-core:$orientDbVersion" - api "org.asciidoctor:asciidoctorj:$asciidoctorjVersion" - api "org.codehaus.groovy:groovy:$groovyVersion" - api "org.codehaus.groovy:groovy-templates:$groovyVersion" - api "org.codehaus.groovy:groovy-dateutil:$groovyVersion" - api "org.freemarker:freemarker:$freemarkerVersion" - api "org.thymeleaf:thymeleaf:$thymeleafVersion" - api "de.neuland-bfi:jade4j:$jade4jVersion" - api "com.vladsch.flexmark:flexmark:$flexmarkVersion" - api "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion" - api "io.pebbletemplates:pebble:$pebbleVersion" + api "org.asciidoctor:asciidoctorj:$asciidoctorjVersion", optional + api "org.codehaus.groovy:groovy:$groovyVersion", optional + api "org.codehaus.groovy:groovy-templates:$groovyVersion", optional + api "org.codehaus.groovy:groovy-dateutil:$groovyVersion", optional + api "org.freemarker:freemarker:$freemarkerVersion", optional + api "org.thymeleaf:thymeleaf:$thymeleafVersion", optional + api "de.neuland-bfi:jade4j:$jade4jVersion", optional + api "com.vladsch.flexmark:flexmark:$flexmarkVersion", optional + api "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion", optional + api "io.pebbletemplates:pebble:$pebbleVersion", optional implementation "org.jsoup:jsoup:$jsoupVersion" - implementation "org.yaml:snakeyaml:$snakeYamlVersion" + implementation "org.yaml:snakeyaml:$snakeYamlVersion", optional // cli specific dependencies - implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion" - implementation "info.picocli:picocli:$picocli" + implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion", optional + implementation "info.picocli:picocli:$picocli", optional } processResources { From 8ba2515abe8a6ec059c3359290c6d467acc62116 Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Thu, 30 Dec 2021 11:46:49 +0100 Subject: [PATCH 209/256] jbake-maven-plugin: mention that all optional dependencies are now included out of the box --- jbake-maven-plugin/README.asciidoc | 94 ++++-------------------------- 1 file changed, 10 insertions(+), 84 deletions(-) diff --git a/jbake-maven-plugin/README.asciidoc b/jbake-maven-plugin/README.asciidoc index e5bd5e4a1..dbfebd365 100644 --- a/jbake-maven-plugin/README.asciidoc +++ b/jbake-maven-plugin/README.asciidoc @@ -30,12 +30,10 @@ To use JBake Maven Plugin in your build add the plugin into your pom.xml as show org.jbake jbake-maven-plugin - ... + ... - + + @@ -46,9 +44,6 @@ To use JBake Maven Plugin in your build add the plugin into your pom.xml as show - - - ... @@ -58,83 +53,14 @@ To use JBake Maven Plugin in your build add the plugin into your pom.xml as show === Dependencies -The plugin itself includes all required dependencies such as jbake-core, however you will need to explicitly declare dependencies for -the content formats and template engines used in your project. As these dependencies are marked as optional to reduce bloat. +The plugin automatically includes all optional dependencies of `jbake-core`, +including freemarker, thymeleaf, asciidoctor, flexmark (markdown), etc. +This makes it easy to get started with the plugin. +It also reduces maintenance when upgrading to a new JBake version, +because you don't need to align the versions of freemarker, thymeleaf, asciidoctor, flexmark, etc. -If you have AsciiDoc content you'll need this dependency: - ----- - - org.asciidoctor - asciidoctorj - 2.4.3 - ----- - -If you have Markdown content you'll need these dependencies: - ----- - - com.vladsch.flexmark - flexmark - 0.62.2 - - - com.vladsch.flexmark - flexmark-profile-pegdown - 0.62.2 - ----- - -If you have Freemarker templates then you'll need this dependency: - ----- - - org.freemarker - freemarker - 2.3.31 - ----- - -If you have Groovy templates then you'll need these dependencies: - ----- - - org.codehaus.groovy - groovy - 3.0.7 - - - org.codehaus.groovy - groovy-templates - 3.0.7 - - - org.codehaus.groovy - groovy-dateutil - 3.0.7 - ----- - -If you have Thymeleaf templates then you'll need this dependency: - ----- - - org.thymeleaf - thymeleaf - 3.0.12.RELEASE - ----- - -If you have Jade4J templates then you'll need this dependency: - ----- - - de.neuland-bfi - jade4j - 1.3.2 - ----- +However, if you want your build to only download the bare minimum it needs, +you can use `` to exclude the dependencies you don't need. An example of the plugin being used can be found in this project: https://github.com/jonbullock/maven-jbake-site[https://github.com/jonbullock/maven-jbake-site] From 941c706c59dc3f4690e0774fdcfb19080638422a Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Fri, 31 Dec 2021 21:56:00 +0100 Subject: [PATCH 210/256] Restore optional flag for commons-vfs2 too --- jbake-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 706d070b2..e6b9c4ad7 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -16,7 +16,7 @@ dependencies { api "commons-io:commons-io:$commonsIoVersion" api "org.apache.commons:commons-configuration2:$commonsConfigurationVersion" implementation "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion" - implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version" + implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version", optional implementation "org.apache.commons:commons-lang3:$commonsLangVersion" implementation("com.googlecode.json-simple:json-simple:$jsonSimpleVersion") { exclude group: "junit", module: "junit" From c24275746c604828cfea158f48b11a93e4ab235d Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sat, 1 Jan 2022 19:31:54 +0100 Subject: [PATCH 211/256] add pom definition and enable signatures for jbake-maven-plugin switch back to maven plugin development gradle plugin from Benedikt Ritter https://github.com/britter/maven-plugin-development --- build.gradle | 8 + .../org.jbake.convention.java-common.gradle | 10 ++ gradle/maven-publishing.gradle | 150 ++++++++---------- jbake-core/build.gradle | 19 ++- jbake-dist/build.gradle | 1 - jbake-maven-plugin/build.gradle | 22 ++- jbake-maven-plugin/gradle.properties | 4 +- 7 files changed, 121 insertions(+), 93 deletions(-) diff --git a/build.gradle b/build.gradle index cb3399642..6a2f560a7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,15 @@ +import java.time.format.DateTimeFormatter + plugins { id "io.github.gradle-nexus.publish-plugin" version "1.0.0" id 'com.github.ben-manes.versions' version '0.38.0' + id 'org.ajoberstar.grgit' version "$grgitVersion" id "eclipse" id "idea" } +def buildTimeAndDate = grgit.head().dateTime + // common variables ext { isTravis = (System.getenv("TRAVIS") == "true") @@ -17,6 +22,9 @@ ext { sonarDefaultProjectKey = "org.jbake:jbake-base:jbake-core" sonarURL = System.getenv("SONARHOST") ?: sonarDefaultURL sonarProjectKey = System.getenv("SONARPROJECTKEY") ?: sonarDefaultProjectKey + buildDate = buildTimeAndDate.format(DateTimeFormatter.ofPattern('yyyy-MM-dd')) + buildTime = buildTimeAndDate.format(DateTimeFormatter.ofPattern('HH:mm:ss.SSSZ')) + isReleaseVersion = !version.endsWith("SNAPSHOT") } nexusPublishing { diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index 33f605252..359ba6d88 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -48,6 +48,16 @@ tasks.withType(Test) { jvmArgs args } +task javadocJar(type: Jar) { + archiveClassifier.set('javadoc') + from javadoc +} + +task sourcesJar(type: Jar) { + archiveClassifier.set('sources') + from sourceSets.main.allSource +} + tasks.withType(AbstractArchiveTask) { preserveFileTimestamps = false reproducibleFileOrder = true diff --git a/gradle/maven-publishing.gradle b/gradle/maven-publishing.gradle index c49e0c4b9..f5fb4f554 100644 --- a/gradle/maven-publishing.gradle +++ b/gradle/maven-publishing.gradle @@ -1,111 +1,85 @@ -import java.time.format.DateTimeFormatter - apply plugin: 'maven-publish' -def buildTimeAndDate = grgit.head().dateTime -ext { - buildDate = buildTimeAndDate.format(DateTimeFormatter.ofPattern('yyyy-MM-dd')) - buildTime = buildTimeAndDate.format(DateTimeFormatter.ofPattern('HH:mm:ss.SSSZ')) - isReleaseVersion = !version.endsWith("SNAPSHOT") -} - -task javadocJar(type: Jar) { - archiveClassifier.set('javadoc') - from javadoc -} - -task sourcesJar(type: Jar) { - archiveClassifier.set('sources') - from sourceSets.main.allSource -} - publishing { publications { - mavenJava(MavenPublication) { - from components.java + mavenJava(MavenPublication) { + from components.java - artifact javadocJar - artifact sourcesJar + artifact javadocJar + artifact sourcesJar - pom { - name = "jbake" - description = project.description - url = project.website - developers { - developer { - id = 'jonbullock' - name = 'Jonathan Bullock' - email = 'jonbullock@gmail.com' - url = 'http://jonathanbullock.com' - timezone = 'Europe/London' - } - developer { - id = 'ancho' - name = 'Frank Becker' - email = 'frank@calmdevelopment.de' - timezone = 'Europe/Berlin' - } - developer { - id = 'manikmagar' - name = 'Manik Magar' - url = 'https://manik.magar.me/' - timezone = 'America/New_York' - } - developer { - id = 'aldrinleal' - name = 'Aldrin Leal' - timezone = 'America/Bogota' - } + pom { + name = "jbake" + description = project.description + url = project.website + developers { + developer { + id = 'jonbullock' + name = 'Jonathan Bullock' + email = 'jonbullock@gmail.com' + url = 'http://jonathanbullock.com' + timezone = 'Europe/London' } - scm { - url = project.vcs - connection = 'scm:git:git@github.com:jbake-org/jbake.git' - developerConnection = 'scm:git:https://github.com/jbake-org/jbake.git' + developer { + id = 'ancho' + name = 'Frank Becker' + email = 'frank@calmdevelopment.de' + timezone = 'Europe/Berlin' } - issueManagement { - system = 'GitHub Issues' - url = project.issues + developer { + id = 'manikmagar' + name = 'Manik Magar' + url = 'https://manik.magar.me/' + timezone = 'America/New_York' } - mailingLists { - - mailingList { - name = 'jbake-dev' - subscribe = 'jbake-dev@googlegroups.com' - unsubscribe = 'jbake-dev+unsubscribe@googlegroups.com' - archive = 'http://groups.google.com/group/jbake-dev' - } - mailingList { - name = 'jbake-user' - subscribe = 'jbake-user@googlegroups.com' - unsubscribe = 'jbake-user+unsubscribe@googlegroups.com' - archive = 'http://groups.google.com/group/jbake-user' - } + developer { + id = 'aldrinleal' + name = 'Aldrin Leal' + timezone = 'America/Bogota' } + } + scm { + url = project.vcs + connection = 'scm:git:git@github.com:jbake-org/jbake.git' + developerConnection = 'scm:git:https://github.com/jbake-org/jbake.git' + } + issueManagement { + system = 'GitHub Issues' + url = project.issues + } + mailingLists { - licenses { - license { - name = 'The MIT License (MIT)' - url = 'http://opensource.org/licenses/MIT' - } + mailingList { + name = 'jbake-dev' + subscribe = 'jbake-dev@googlegroups.com' + unsubscribe = 'jbake-dev+unsubscribe@googlegroups.com' + archive = 'http://groups.google.com/group/jbake-dev' + } + mailingList { + name = 'jbake-user' + subscribe = 'jbake-user@googlegroups.com' + unsubscribe = 'jbake-user+unsubscribe@googlegroups.com' + archive = 'http://groups.google.com/group/jbake-user' } } } } } +} jar { manifest { attributes( - 'Built-By': System.properties['user.name'], - 'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(), - 'Build-Date': buildDate, - 'Build-Time': buildTime, - 'Specification-Title': project.name, - 'Specification-Version': project.version, - 'Specification-Vendor': project.name, - 'Implementation-Title': project.name, - 'Implementation-Version': project.version, - 'Implementation-Vendor': project.name + 'Built-By': System.properties['user.name'], + 'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(), + 'Build-Date': buildDate, + 'Build-Time': buildTime, + 'Specification-Title': project.name, + 'Specification-Version': project.version, + 'Specification-Vendor': project.name, + 'Implementation-Title': project.name, + 'Implementation-Version': project.version, + 'Implementation-Vendor': project.name ) } } diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index e6b9c4ad7..b935114ff 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -3,7 +3,6 @@ import java.time.format.DateTimeFormatter plugins { id "org.jbake.convention.java-common" id 'java-library' - id 'org.ajoberstar.grgit' version "$grgitVersion" id 'nebula.optional-base' version '3.0.3' } @@ -12,6 +11,24 @@ apply from: "$rootDir/gradle/signing.gradle" description = "The core library of JBake" +publishing { + publications { + mavenJava(MavenPublication) { + pom { + name = "jbake-core" + + licenses { + license { + name = 'The MIT License (MIT)' + url = 'http://opensource.org/licenses/MIT' + } + } + } + } + } +} + + dependencies { api "commons-io:commons-io:$commonsIoVersion" api "org.apache.commons:commons-configuration2:$commonsConfigurationVersion" diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle index 30aed7798..bd5567bdf 100644 --- a/jbake-dist/build.gradle +++ b/jbake-dist/build.gradle @@ -1,7 +1,6 @@ plugins { id "io.sdkman.vendors" version "2.0.0" id "com.github.breadmoirai.github-release" version "2.2.12" - id 'org.ajoberstar.grgit' version "$grgitVersion" id "org.jbake.convention.java-common" id 'application' } diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index 1a82b8e13..eb119626c 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -1,10 +1,30 @@ plugins { - id "io.freefair.maven-plugin" version "6.3.0" + id 'de.benediktritter.maven-plugin-development' version '0.3.1' id "org.jbake.convention.java-common" } group = "org.jbake" +apply from: "$rootDir/gradle/maven-publishing.gradle" +apply from: "$rootDir/gradle/signing.gradle" + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + name = "jbake-maven-plugin" + + licenses { + license { + name = 'Apache License, Version 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + } + } + } +} + dependencies { implementation project(":jbake-core") diff --git a/jbake-maven-plugin/gradle.properties b/jbake-maven-plugin/gradle.properties index a6af4c9d6..ec2427b8b 100644 --- a/jbake-maven-plugin/gradle.properties +++ b/jbake-maven-plugin/gradle.properties @@ -1,2 +1,2 @@ -project_description = JBake Maven Plugin -pluginDisplayName = JBake Maven Plugin +name = jbake-maven-plugin +description = JBake Maven Plugin is a Maven plugin allowing you to integrate JBake into your projects build From fe42958a66e844496feedab58963365d47bece02 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Thu, 30 Dec 2021 12:17:56 +0100 Subject: [PATCH 212/256] security update logback and other dependency updates --- build.gradle | 4 +- .../org.jbake.convention.java-common.gradle | 6 +- gradle.properties | 55 +++++++++++-------- gradle/github-releases.gradle | 2 +- jbake-core/build.gradle | 2 +- .../src/main/java/org/jbake/app/Asset.java | 2 +- jbake-dist/build.gradle | 4 +- 7 files changed, 41 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index 6a2f560a7..d0bb98f42 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ import java.time.format.DateTimeFormatter plugins { - id "io.github.gradle-nexus.publish-plugin" version "1.0.0" - id 'com.github.ben-manes.versions' version '0.38.0' + id "io.github.gradle-nexus.publish-plugin" version "$nexusPublishPluginVersion" + id 'com.github.ben-manes.versions' version "$versionsPluginVersion" id 'org.ajoberstar.grgit' version "$grgitVersion" id "eclipse" id "idea" diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index 359ba6d88..0b91690b6 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation "org.assertj:assertj-core:$assertjCoreVersion" testImplementation "org.mockito:mockito-core:$mockitoVersion" testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion" - testImplementation 'org.itsallcode:junit5-system-extensions:1.1.0' + testImplementation "org.itsallcode:junit5-system-extensions:$junit5SystemExtVersion" } tasks.withType(JavaCompile) { @@ -91,7 +91,7 @@ jacocoTestReport.dependsOn test tasks.withType(Checkstyle) { reports { - xml.enabled false - html.enabled true + xml.required.set false + html.required.set true } } diff --git a/gradle.properties b/gradle.properties index 9f511a888..3e1f0d23b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,48 +7,55 @@ issues = https://github.com/jbake-org/jbake/issues vcs = https://github.com/jbake-org/jbake/ # runtime dependencies -asciidoctorjVersion = 2.4.3 -asciidoctorjDiagramVersion = 2.1.0 +asciidoctorjVersion = 2.5.2 +asciidoctorjDiagramVersion = 2.2.1 args4jVersion = 2.33 -commonsIoVersion = 2.8.0 +commonsIoVersion = 2.11.0 commonsConfigurationVersion = 2.7 commonsBeanutilsVersion = 1.9.4 commonsLangVersion = 3.12.0 -commonsVfs2Version = 2.7.0 +commonsVfs2Version = 2.9.0 freemarkerVersion = 2.3.31 flexmarkVersion = 0.62.2 -groovyVersion = 3.0.7 -jettyServerVersion = 9.4.36.v20210114 +groovyVersion = 3.0.9 +jettyServerVersion = 9.4.44.v20210927 jsonSimpleVersion = 1.1.1 jade4jVersion = 1.3.2 -jsoupVersion = 1.13.1 -jgitVersion = 5.10.0.202012080955-r -logbackVersion = 1.2.3 -orientDbVersion = 3.0.37 +jsoupVersion = 1.14.3 +jgitVersion = 6.0.0.202111291000-r +logbackVersion = 1.2.10 +orientDbVersion = 3.0.41 pebbleVersion = 3.1.5 -slf4jVersion = 1.7.30 -snakeYamlVersion = 1.28 -thymeleafVersion = 3.0.12.RELEASE -picocli = 4.6.1 +slf4jVersion = 1.7.32 +snakeYamlVersion = 1.30 +thymeleafVersion = 3.0.14.RELEASE +picocli = 4.6.2 # testing dependencies junit4Version = 4.13.2 -junit5Version = 5.7.1 -junitPioneer = 1.3.8 -assertjCoreVersion = 3.19.0 -mockitoVersion = 3.8.0 +junit5Version = 5.8.2 +junit5SystemExtVersion = 1.2.0 +junitPioneer = 1.5.0 +assertjCoreVersion = 3.21.0 +mockitoVersion = 4.2.0 # build dependencies -jacocoVersion = 0.8.6 -grgitVersion = 4.1.0 +jacocoVersion = 0.8.7 +grgitVersion = 4.1.1 +nexusPublishPluginVersion = 1.1.0 +versionsPluginVersion = 0.40.0 +sdkmanVersion = 3.0.0 +githubReleaseVersion = 2.2.12 +optionalBaseVersion = 7.0.0 + +# jbake-maven-plugin dependencies +mavenVersion = 3.8.4 +mavenAnnotationsVersion = 3.6.2 +sparkVersion = 2.9.3 org.gradle.caching=true org.gradle.parallel=true org.gradle.configureondemand = true org.gradle.vfs.watch = true -# jbake-maven-plugin dependencies -mavenVersion = 3.8.1 -mavenAnnotationsVersion = 3.6.2 -sparkVersion = 2.9.3 diff --git a/gradle/github-releases.gradle b/gradle/github-releases.gradle index 69c94696d..116c8ac07 100644 --- a/gradle/github-releases.gradle +++ b/gradle/github-releases.gradle @@ -6,7 +6,7 @@ rootProject.ext { } afterEvaluate { - def name = project(':jbake-dist').tasks.getByName("distZip").archiveName + def name = project(':jbake-dist').tasks.getByName("distZip").archiveFileName.getOrNull() def files = project(':jbake-dist').tasks.getByName("distZip").outputs.files.files if (!project.hasProperty('skipSigning')) { def signatureFile = project(':jbake-dist').tasks.getByName("signArchives").outputs.files.files.find { it.name.contains(name) } diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index b935114ff..476112c38 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -3,7 +3,7 @@ import java.time.format.DateTimeFormatter plugins { id "org.jbake.convention.java-common" id 'java-library' - id 'nebula.optional-base' version '3.0.3' + id 'nebula.optional-base' version "$optionalBaseVersion" } apply from: "$rootDir/gradle/maven-publishing.gradle" diff --git a/jbake-core/src/main/java/org/jbake/app/Asset.java b/jbake-core/src/main/java/org/jbake/app/Asset.java index 5bbc5d88e..7eefa962f 100644 --- a/jbake-core/src/main/java/org/jbake/app/Asset.java +++ b/jbake-core/src/main/java/org/jbake/app/Asset.java @@ -158,7 +158,7 @@ private void copyFile(File asset, File targetFolder) { try { FileUtils.copyFile(asset, targetFolder); LOGGER.info("Copying [{}]... done!", asset.getPath()); - } catch (IOException e) { + } catch (IOException|IllegalArgumentException e) { LOGGER.error("Copying [{}]... failed!", asset.getPath(), e); errors.add(e); } diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle index bd5567bdf..bbf846f0d 100644 --- a/jbake-dist/build.gradle +++ b/jbake-dist/build.gradle @@ -1,6 +1,6 @@ plugins { - id "io.sdkman.vendors" version "2.0.0" - id "com.github.breadmoirai.github-release" version "2.2.12" + id "io.sdkman.vendors" version "$sdkmanVersion" + id "com.github.breadmoirai.github-release" version "$githubReleaseVersion" id "org.jbake.convention.java-common" id 'application' } From a61dc67492d227fd2b5bf0abfa8e44577e2d6ccb Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 2 Jan 2022 15:22:33 +0100 Subject: [PATCH 213/256] add jdk 17 in appveyor / travis-ci and remove older versions --- .travis.yml | 4 ++-- appveyor.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88c3844f5..b9607695a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,13 +17,13 @@ script: - "./gradlew check --stacktrace" jdk: - - openjdk15 + - openjdk17 - openjdk11 jobs: include: - - jdk: openjdk15 + - jdk: openjdk17 os: osx - jdk: openjdk11 diff --git a/appveyor.yml b/appveyor.yml index 65894fc34..2875b1793 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,9 +8,8 @@ clone_depth: 10 environment: TERM: dumb matrix: - - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 - JAVA_HOME: C:\Program Files\Java\jdk11 - - JAVA_HOME: C:\Program Files\Java\jdk15 + - JAVA_HOME: C:\Program Files\Java\jdk17 install: - SET PATH=%JAVA_HOME%\bin;%PATH% From 3a2b0a2813c6dd163745cdd13dbc4bcd214b362b Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 2 Jan 2022 15:43:56 +0100 Subject: [PATCH 214/256] use latest xcode image for osx jobs --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9607695a..3c9153e84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ jdk: jobs: include: - - jdk: openjdk17 - os: osx + - os: osx + osx_image: xcode13.2 - jdk: openjdk11 os: osx From 0a3ce8e2f82fc762be8e2fa2bc1957854e3e8ad0 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 2 Jan 2022 16:42:47 +0100 Subject: [PATCH 215/256] next try to fix osx build --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c9153e84..4fa72351a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,13 +16,13 @@ install: true script: - "./gradlew check --stacktrace" -jdk: - - openjdk17 - - openjdk11 - jobs: include: + - jdk: openjdk17 + + - jdk: openjdk11 + - os: osx osx_image: xcode13.2 @@ -42,7 +42,6 @@ jobs: # - "./gradlew -PskipSigning jacocoRootReport coveralls -i --stacktrace" notifications: - irc: "irc.freenode.org#jbake" webhooks: urls: - https://webhooks.gitter.im/e/2d332fabb02dba68a36b From 89c022b642bfa285ef2dd4d99a43f78e58bd2031 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 3 Jan 2022 18:25:31 +0000 Subject: [PATCH 216/256] Manually merged #737 --- .github/workflows/build.yml | 46 ++++++++++++++++++++++++ .github/workflows/early-access.yml | 55 ++++++++++++++++++++++++++++ build.gradle | 1 + gradle/github-releases.gradle | 35 ------------------ gradle/release.gradle | 58 ++++++++++++++++++++++++++++++ gradle/sdkman.gradle | 32 ----------------- gradle/signing.gradle | 20 ----------- jbake-core/build.gradle | 1 - jbake-dist/build.gradle | 17 +-------- jbake-maven-plugin/build.gradle | 1 - 10 files changed, 161 insertions(+), 105 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/early-access.yml delete mode 100644 gradle/github-releases.gradle create mode 100644 gradle/release.gradle delete mode 100644 gradle/sdkman.gradle delete mode 100644 gradle/signing.gradle diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..cce9a1cee --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,46 @@ +name: Build + +on: + pull_request: + +jobs: + build: + name: Build + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest, windows-latest ] + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + + - name: Set up Java + uses: actions/setup-java@v2 + with: + java-version: 11 + distribution: 'zulu' + + - uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - uses: actions/cache@v2 + with: + path: ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} + restore-keys: | + ${{ runner.os }}-gradlew- + - name: Build + run: ./gradlew build -S + + - name: Upload Reports + uses: actions/upload-artifact@v1 + if: failure() + with: + name: reports-${{ runner.os }} + path: | + jbake-core/build + jbake-dist/build diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml new file mode 100644 index 000000000..9d9aba2b6 --- /dev/null +++ b/.github/workflows/early-access.yml @@ -0,0 +1,55 @@ +name: EarlyAccess + +on: + push: + branches: [ master ] + +jobs: + earlyaccess: + name: EarlyAccess + if: github.repository == 'jbake-org/jbake' + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up Java + uses: actions/setup-java@v2 + with: + java-version: 11 + distribution: 'zulu' + + - uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - uses: actions/cache@v2 + with: + path: ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} + restore-keys: | + ${{ runner.os }}-gradlew- + - name: Build + run: ./gradlew build -S + + - name: Release + run: ./gradlew jreleaserRelease -S + env: + JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} + + - name: JReleaser output + if: always() + uses: actions/upload-artifact@v2 + with: + name: jreleaser-logs + path: | + jbake-dist/build/jreleaser/trace.log + jbake-dist/build/jreleaser/output.properties diff --git a/build.gradle b/build.gradle index 6a2f560a7..b78764e40 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id "io.github.gradle-nexus.publish-plugin" version "1.0.0" id 'com.github.ben-manes.versions' version '0.38.0' id 'org.ajoberstar.grgit' version "$grgitVersion" + id 'org.jreleaser' version "0.10.0" apply false id "eclipse" id "idea" } diff --git a/gradle/github-releases.gradle b/gradle/github-releases.gradle deleted file mode 100644 index 69c94696d..000000000 --- a/gradle/github-releases.gradle +++ /dev/null @@ -1,35 +0,0 @@ -rootProject.ext { - githubToken = project.hasProperty("github.token") ? project.getProperty("github.token") : System.getenv("GITHUBTOKEN") - githubReleaseOwner = project.hasProperty("github.release.owner") ? getProperty("github.release.owner") : System.getenv("GITHUB_RELEASE_OWNER") - githubReleaseRepo = project.hasProperty("github.release.repo") ? getProperty("github.release.repo") : System.getenv("GITHUB_RELEASE_REPO") - githubReleaseDryRun = System.getenv("GITHUB_RELEASE_DRY_RUN") ?: false -} - -afterEvaluate { - def name = project(':jbake-dist').tasks.getByName("distZip").archiveName - def files = project(':jbake-dist').tasks.getByName("distZip").outputs.files.files - if (!project.hasProperty('skipSigning')) { - def signatureFile = project(':jbake-dist').tasks.getByName("signArchives").outputs.files.files.find { it.name.contains(name) } - files << signatureFile - } - - // add checksum files - project(':jbake-dist').tasks.getByName("distZip").outputs.files.files.each { - files << new File(it.toString() + ".sha256") - } - - githubRelease { - token "$rootProject.githubToken" // This is your personal access token with Repo permissions - // You get this from your user settings > developer settings > Personal Access Tokens - owner "$rootProject.githubReleaseOwner" - // default is the last part of your group. Eg group: "com.github.breadmoirai" => owner: "breadmoirai" - repo "$rootProject.githubReleaseRepo" // by default this is set to your project name - targetCommitish "master" // by default this is set to "master" - draft false // by default this is false - releaseAssets files - // this points to which files you want to upload as assets with your release - dryRun rootProject.githubReleaseDryRun as boolean - // by default false; you can use this to see what actions would be taken without making a release - } -} - diff --git a/gradle/release.gradle b/gradle/release.gradle new file mode 100644 index 000000000..e51348c42 --- /dev/null +++ b/gradle/release.gradle @@ -0,0 +1,58 @@ +apply plugin: 'org.jreleaser' + +// cannot reference project. properties inside jreleaser config block +// as that collides with the "project" DSL element of the config extension +ext.releaseIsDryrun = (project.rootProject.findProperty('dryrun') ?: false).toBoolean() +ext.projectWebsite = project.website + +jreleaser { + dryrun = releaseIsDryrun + gitRootSearch = true + + project { + website = projectWebsite + authors = ['Jonathan Bullock'] + license = 'MIT' + extraProperties.put('inceptionYear', '2012') + } + + release { + github { + overwrite = true + branch = 'master' + changelog { + formatted = 'always' + format = '- {{commitShortHash}} {{commitTitle}}' + contributors { + format = '- {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}}' + } + hide { + contributors = ['GitHub'] + } + } + } + } + + signing { + active = 'always' + armored = true + } + + checksum { + individual = true + } + + distributions { + jbake { + sdkman { + active = 'release' + } + artifact { + path = 'build/distributions/{{distributionName}}-{{projectVersion}}-bin.zip' + } + artifact { + path = 'build/distributions/{{distributionName}}-{{projectVersion}}.tar' + } + } + } +} diff --git a/gradle/sdkman.gradle b/gradle/sdkman.gradle deleted file mode 100644 index 3e907362c..000000000 --- a/gradle/sdkman.gradle +++ /dev/null @@ -1,32 +0,0 @@ -ext.sdkman_consumer_key = project.hasProperty('sdkman_consumer_key')?sdkman_consumer_key:'' -ext.sdkman_consumer_token = project.hasProperty('sdkman_consumer_token')?sdkman_consumer_token:'' - -sdkman { - consumerKey = project.sdkman_consumer_key - consumerToken = project.sdkman_consumer_token - candidate = "jbake" - version = rootProject.version - hashtag = "#JBake" - url = "https://github.com/jbake-org/jbake/releases/download/v${project.version}/${distZip.archiveFileName.get()}" -} - -task distributionAvailable() { - group = "Verification" - description = "Check if distribution is available on bintray" - - doLast { - String errorMsg = "Distribution is not available at $sdkman.url" - - HttpURLConnection connection = sdkman.url.toURL().openConnection() - connection.setRequestMethod("HEAD") - connection.connect() - - if ( connection.responseCode != 200 ){ - throw new GradleException(errorMsg) - } - } -} - -tasks.findAll{ it.name ==~ /sdk.*(Release|Version)/ }.each { - it.dependsOn distributionAvailable -} diff --git a/gradle/signing.gradle b/gradle/signing.gradle deleted file mode 100644 index 72cc887bb..000000000 --- a/gradle/signing.gradle +++ /dev/null @@ -1,20 +0,0 @@ -if ( !project.hasProperty('skipSigning') ) { - apply plugin: 'signing' - - if (!signing.signatory) { - logger.warn "No Signatory configured for project $project.name. Skip signing! See https://docs.gradle.org/current/userguide/signing_plugin.html" - ext.skipSigning = true - } - else { - if ( project.name != "jbake-dist" ) { - signing { - sign publishing.publications.mavenJava - } - } - else { - signing { - sign configurations.archives - } - } - } -} diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index b935114ff..72f66c0d5 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -7,7 +7,6 @@ plugins { } apply from: "$rootDir/gradle/maven-publishing.gradle" -apply from: "$rootDir/gradle/signing.gradle" description = "The core library of JBake" diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle index bd5567bdf..85461d45a 100644 --- a/jbake-dist/build.gradle +++ b/jbake-dist/build.gradle @@ -1,15 +1,11 @@ plugins { - id "io.sdkman.vendors" version "2.0.0" id "com.github.breadmoirai.github-release" version "2.2.12" id "org.jbake.convention.java-common" id 'application' } apply from: "$rootDir/gradle/application.gradle" -apply from: "$rootDir/gradle/sdkman.gradle" -apply from: "$rootDir/gradle/signing.gradle" -apply from: "$rootDir/gradle/github-releases.gradle" - +apply from: "$rootDir/gradle/release.gradle" description = "The binary distribution package that bundles JBake cli" sourceSets { @@ -58,17 +54,6 @@ smokeTest { } } -task buildChecksum(dependsOn: distZip, group: "distribution") { - description "creates a sha256 checksum file for the distribution" - doLast { - distZip.outputs.files.files.each { - ant.checksum(file: it, fileext: ".sha256", algorithm: "SHA-256", pattern: "{0} {1}") - } - } -} - check.dependsOn smokeTest -distZip.finalizedBy buildChecksum - jar.enabled=false diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index eb119626c..c1482dbd7 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -6,7 +6,6 @@ plugins { group = "org.jbake" apply from: "$rootDir/gradle/maven-publishing.gradle" -apply from: "$rootDir/gradle/signing.gradle" publishing { publications { From e4aa9a8fc30ceb2d1705110a32ca2675f51ff503 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 5 Jan 2022 21:23:41 +0000 Subject: [PATCH 217/256] Added generation of HelpMojo. --- jbake-maven-plugin/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index c1482dbd7..68a8da43a 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -5,6 +5,10 @@ plugins { group = "org.jbake" +mavenPlugin { + helpMojoPackage = 'org.jbake.maven' +} + apply from: "$rootDir/gradle/maven-publishing.gradle" publishing { From 6b200da86aad4241e32d5f2fd38159a69ed7da8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Wed, 5 Jan 2022 22:37:33 +0100 Subject: [PATCH 218/256] Use blocking method rather than the throwing one Avoid: Exception in thread Thread-7 java.lang.IllegalStateException: Queue full at java.base/java.util.AbstractQueue.add(AbstractQueue.java:98) at java.base/java.util.concurrent.ArrayBlockingQueue.add(ArrayBlockingQueue.java:326) at org.jbake.maven.util.DirWatcher.onUpdated(DirWatcher.java:57) at org.jbake.maven.util.DirWatcher.accessbash00(DirWatcher.java:17) at org.jbake.maven.util.DirWatcher.onFileChange(DirWatcher.java:40) at org.apache.commons.io.monitor.FileAlterationObserver.doMatch(FileAlterationObserver.java:410) at org.apache.commons.io.monitor.FileAlterationObserver.checkAndNotify(FileAlterationObserver.java:333) at org.apache.commons.io.monitor.FileAlterationObserver.checkAndNotify(FileAlterationObserver.java:334) at org.apache.commons.io.monitor.FileAlterationObserver.checkAndNotify(FileAlterationObserver.java:303) at org.apache.commons.io.monitor.FileAlterationMonitor.run(FileAlterationMonitor.java:183) at java.base/java.lang.Thread.run(Thread.java:829) which stops further processing of changed files. --- .../src/main/java/org/jbake/maven/util/DirWatcher.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java index 1c7a0602c..6f8a40d4b 100644 --- a/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java +++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java @@ -54,7 +54,11 @@ public void stop() { } private void onUpdated() { - changeQueue.add(Long.valueOf(System.currentTimeMillis())); + try { + changeQueue.put(Long.valueOf(System.currentTimeMillis())); + } catch (InterruptedException iex) { + Thread.currentThread().interrupt(); + } } /** From 039d6faa58d4a12c18d9e0a9e9531939ded12752 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 5 Jan 2022 22:27:15 +0000 Subject: [PATCH 219/256] Removed github-release plugin, replaced with JReleaser. --- jbake-dist/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle index 85461d45a..110718421 100644 --- a/jbake-dist/build.gradle +++ b/jbake-dist/build.gradle @@ -1,5 +1,4 @@ plugins { - id "com.github.breadmoirai.github-release" version "2.2.12" id "org.jbake.convention.java-common" id 'application' } From 9afb5521947079f8adb8deca816384c31cd0da76 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Wed, 5 Jan 2022 22:39:52 +0000 Subject: [PATCH 220/256] Moved all plugin versions into gradle.properties --- build.gradle | 2 +- gradle.properties | 4 ++-- jbake-maven-plugin/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 07741c18f..9a3787aa2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "io.github.gradle-nexus.publish-plugin" version "$nexusPublishPluginVersion" id 'com.github.ben-manes.versions' version "$versionsPluginVersion" id 'org.ajoberstar.grgit' version "$grgitVersion" - id 'org.jreleaser' version "0.10.0" apply false + id 'org.jreleaser' version "$jreleaserVersion" apply false id "eclipse" id "idea" } diff --git a/gradle.properties b/gradle.properties index 3e1f0d23b..cb81cde7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,9 +45,9 @@ jacocoVersion = 0.8.7 grgitVersion = 4.1.1 nexusPublishPluginVersion = 1.1.0 versionsPluginVersion = 0.40.0 -sdkmanVersion = 3.0.0 -githubReleaseVersion = 2.2.12 optionalBaseVersion = 7.0.0 +jreleaserVersion = 0.10.0 +mavenPluginDevVersion = 0.3.1 # jbake-maven-plugin dependencies mavenVersion = 3.8.4 diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index 68a8da43a..fabf47e20 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'de.benediktritter.maven-plugin-development' version '0.3.1' + id 'de.benediktritter.maven-plugin-development' version "$mavenPluginDevVersion" id "org.jbake.convention.java-common" } From 7a38eedab2ea88a8063f4128ac5064cdafd14d71 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 6 Mar 2022 23:49:17 +0000 Subject: [PATCH 221/256] Updated secret reference. --- .github/workflows/early-access.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 9d9aba2b6..0a6b7345f 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -40,7 +40,7 @@ jobs: - name: Release run: ./gradlew jreleaserRelease -S env: - JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JRELEASER_GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} From 1d97619bc6d0e3f177ce3c25cf742c21a42a6467 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 7 Mar 2022 00:03:28 +0000 Subject: [PATCH 222/256] Added SDKMAN secrets. --- .github/workflows/early-access.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 0a6b7345f..23367b2a7 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -44,6 +44,8 @@ jobs: JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} + JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.SDKMAN_CONSUMER_KEY }} + JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.SDKMAN_CONSUMER_TOKEN }} - name: JReleaser output if: always() From ccd29ad3c0278867388f2b10a183fc17efe18979 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 7 Mar 2022 20:43:33 +0000 Subject: [PATCH 223/256] Reverted to SNAPSHOT suffix. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cb81cde7c..e108df7a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.5 +version = 2.7.0-SNAPSHOT description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From 6e2a49545086b6b3dd58915169b7431cf3d366aa Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 7 Mar 2022 23:20:03 +0000 Subject: [PATCH 224/256] Added transform to JReleaser based artifacts. --- gradle/release.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gradle/release.gradle b/gradle/release.gradle index e51348c42..474481d4e 100644 --- a/gradle/release.gradle +++ b/gradle/release.gradle @@ -49,9 +49,11 @@ jreleaser { } artifact { path = 'build/distributions/{{distributionName}}-{{projectVersion}}-bin.zip' + transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}-bin.zip' } artifact { path = 'build/distributions/{{distributionName}}-{{projectVersion}}.tar' + transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar' } } } From 8f7b8beea06ea0258da3418a02c10342aecedc79 Mon Sep 17 00:00:00 2001 From: georgecao Date: Fri, 18 Mar 2022 19:55:55 +0800 Subject: [PATCH 225/256] Change DuplicatesStrategy from EXCLUDE to INHERIT --- jbake-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index a64a6f07c..ca7c7e90b 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -58,7 +58,7 @@ dependencies { processResources { from("src/main/resources") { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE + duplicatesStrategy = DuplicatesStrategy.INHERIT include 'default.properties' expand jbakeVersion: project.version, timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")), From ffbc0c99fe418cad8f44005c35840df07fd47271 Mon Sep 17 00:00:00 2001 From: georgecao Date: Fri, 18 Mar 2022 20:08:58 +0800 Subject: [PATCH 226/256] Change DuplicatesStrategy from EXCLUDE to INCLUDE --- jbake-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index ca7c7e90b..1296651c1 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -58,7 +58,7 @@ dependencies { processResources { from("src/main/resources") { - duplicatesStrategy = DuplicatesStrategy.INHERIT + duplicatesStrategy = DuplicatesStrategy.INCLUDE include 'default.properties' expand jbakeVersion: project.version, timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")), From 06e4c0d47c36c2b38237dfede79d43d973bc783e Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 20 Mar 2022 16:52:37 +0000 Subject: [PATCH 227/256] Fixes #747 Force the OrientDB type rather than let OrientDB decide. --- .../src/main/java/org/jbake/app/ContentStore.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/app/ContentStore.java b/jbake-core/src/main/java/org/jbake/app/ContentStore.java index 7dc71e887..352e97ae5 100644 --- a/jbake-core/src/main/java/org/jbake/app/ContentStore.java +++ b/jbake-core/src/main/java/org/jbake/app/ContentStore.java @@ -32,10 +32,8 @@ import com.orientechnologies.orient.core.metadata.schema.OClass; import com.orientechnologies.orient.core.metadata.schema.OSchema; import com.orientechnologies.orient.core.metadata.schema.OType; -import com.orientechnologies.orient.core.record.impl.ODocument; +import com.orientechnologies.orient.core.record.OElement; import com.orientechnologies.orient.core.sql.executor.OResultSet; -import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery; -import org.jbake.launcher.SystemExit; import org.jbake.model.DocumentModel; import org.jbake.model.DocumentTypes; import org.jbake.model.ModelAttributes; @@ -408,9 +406,9 @@ public boolean isActive() { } public void addDocument(DocumentModel document) { - ODocument doc = new ODocument(Schema.DOCUMENTS); - doc.fromMap(document); - doc.save(); + OElement element = db.newElement(Schema.DOCUMENTS); + document.forEach((k, v) -> element.setProperty(k, v, OType.ANY)); + element.save(); } protected abstract class Schema { From fe75f079c78b7afda34e93edaf2d4365da22f2e2 Mon Sep 17 00:00:00 2001 From: Sebastian Basner Date: Thu, 24 Mar 2022 14:00:42 +0100 Subject: [PATCH 228/256] As adoptopenjdk is deprecated the dependencies should be adopted to its successor adoptium/temurin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d0d5504a..e17527c5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN set -o errexit -o nounset \ && cp -r jbake-dist/build/install/jbake/* $JBAKE_HOME \ && rm -r ~/.gradle /usr/src/jbake -FROM adoptopenjdk/openjdk11:alpine-jre +FROM eclipse-temurin:11-jre-alpine ENV JBAKE_USER=jbake ENV JBAKE_HOME=/opt/jbake From 973204ed248b3a8c54d67b3431ba958549cf1d96 Mon Sep 17 00:00:00 2001 From: georgecao Date: Tue, 29 Mar 2022 08:53:25 +0800 Subject: [PATCH 229/256] Stops the duplication and the need for a strategy at all. --- jbake-core/build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 1296651c1..820938c4b 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -57,11 +57,9 @@ dependencies { } processResources { - from("src/main/resources") { - duplicatesStrategy = DuplicatesStrategy.INCLUDE - include 'default.properties' + filesMatching("default.properties") { expand jbakeVersion: project.version, - timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")), - gitHash: grgit.head().abbreviatedId + timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")), + gitHash: grgit.head().abbreviatedId } } From 3fdfd65f2f8f980eb430c72d92090299395879aa Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 3 Apr 2022 23:55:58 +0100 Subject: [PATCH 230/256] Regression test for fix. --- .../test/java/org/jbake/app/CrawlerTest.java | 24 ++++++++++++++----- .../test/resources/fixture/data/authors.yaml | 23 ++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 jbake-core/src/test/resources/fixture/data/authors.yaml diff --git a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java index 73d9cfc12..de0aa14b9 100644 --- a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java +++ b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java @@ -1,5 +1,6 @@ package org.jbake.app; +import com.orientechnologies.orient.core.db.record.OTrackedMap; import org.apache.commons.io.FilenameUtils; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -12,6 +13,8 @@ import org.junit.BeforeClass; import org.junit.Test; +import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; @@ -59,12 +62,21 @@ public void crawlDataFiles() { DocumentTypes.addDocumentType(config.getDataFileDocType()); db.updateSchema(); crawler.crawlDataFiles(); - Assert.assertEquals(1, db.getDocumentCount("data")); - - DataFileUtil util = new DataFileUtil(db, "data"); - Map data = util.get("videos.yaml"); - Assert.assertFalse(data.isEmpty()); - Assert.assertNotNull(data.get("data")); + Assert.assertEquals(2, db.getDocumentCount("data")); + + DataFileUtil dataFileUtil = new DataFileUtil(db, "data"); + Map videos = dataFileUtil.get("videos.yaml"); + Assert.assertFalse(videos.isEmpty()); + Assert.assertNotNull(videos.get("data")); + + // regression test for issue 747 + Map authorsFileContents = dataFileUtil.get("authors.yaml"); + Assert.assertFalse(authorsFileContents.isEmpty()); + Object authorsList = authorsFileContents.get("authors"); + assertThat(authorsList).isNotInstanceOf(OTrackedMap.class); + assertThat(authorsList).isInstanceOf(LinkedHashMap.class); + LinkedHashMap> authors = (LinkedHashMap>) authorsList; + assertThat(authors.get("Joe Bloggs").get("last_name")).isEqualTo("Bloggs"); } @Test diff --git a/jbake-core/src/test/resources/fixture/data/authors.yaml b/jbake-core/src/test/resources/fixture/data/authors.yaml new file mode 100644 index 000000000..eb3f2bd08 --- /dev/null +++ b/jbake-core/src/test/resources/fixture/data/authors.yaml @@ -0,0 +1,23 @@ +authors: + + John Smith: + first_name: John + last_name: Smith + twitter: "@jsmith" + facebook: "https://www.facebook.com/jsmith" + + Jane Smith: + first_name: Jane + last_name: Smith + twitter: "@janesmith" + + Joe Bloggs: + first_name: Joe + last_name: Bloggs + twitter: "@jblogs" + + Tom Harry: + first_name: Tom + last_name: Harry + twitter: "@tharry" + facebook: "https://www.facebook.com/tharry" From 7505683559b9d29600aea86e94877af6c2961409 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 18 Sep 2022 01:09:48 +0100 Subject: [PATCH 231/256] Fixes #709 Upgraded OrientDB to 3.1.20. Updated tests as OrientDB v3.1.x doesn't allow DB name to be a path. Groovy template test was flaky, so removed override which made it more reliable. --- gradle.properties | 2 +- .../java/org/jbake/app/ContentStoreIntegrationTest.java | 3 ++- jbake-core/src/test/java/org/jbake/app/CrawlerTest.java | 4 ++-- .../template/GroovyMarkupTemplateEngineRenderingTest.java | 8 -------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index e108df7a1..a39392548 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ jade4jVersion = 1.3.2 jsoupVersion = 1.14.3 jgitVersion = 6.0.0.202111291000-r logbackVersion = 1.2.10 -orientDbVersion = 3.0.41 +orientDbVersion = 3.1.20 pebbleVersion = 3.1.5 slf4jVersion = 1.7.32 snakeYamlVersion = 1.30 diff --git a/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java b/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java index a2f2603a0..06e27877d 100644 --- a/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java +++ b/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java @@ -34,7 +34,8 @@ public static void setUpClass() throws Exception { Assert.assertEquals(".html", config.getOutputExtension()); config.setDatabaseStore(storageType.toString()); - String dbPath = folder.newFolder("documents" + System.currentTimeMillis()).getAbsolutePath(); + // OrientDB v3.1.x doesn't allow DB name to be a path even though docs say it's allowed + String dbPath = folder.newFolder("documents" + System.currentTimeMillis()).getName(); // setting the database path with a colon creates an invalid url for OrientDB. // only one colon is expected. there is no documentation about proper url path for windows available :( diff --git a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java index de0aa14b9..326f001a0 100644 --- a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java +++ b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java @@ -74,8 +74,8 @@ public void crawlDataFiles() { Assert.assertFalse(authorsFileContents.isEmpty()); Object authorsList = authorsFileContents.get("authors"); assertThat(authorsList).isNotInstanceOf(OTrackedMap.class); - assertThat(authorsList).isInstanceOf(LinkedHashMap.class); - LinkedHashMap> authors = (LinkedHashMap>) authorsList; + assertThat(authorsList).isInstanceOf(HashMap.class); + HashMap> authors = (HashMap>) authorsList; assertThat(authors.get("Joe Bloggs").get("last_name")).isEqualTo("Bloggs"); } diff --git a/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java b/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java index cbc52455b..c40819a19 100644 --- a/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java +++ b/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java @@ -19,14 +19,6 @@ public class GroovyMarkupTemplateEngineRenderingTest extends AbstractTemplateEngineRenderingTest { - @BeforeClass - public static void setUpTest() { - //switch to PLOCAL mode for this test class as Travis sometimes runs out of memory - db.close(); - config.setDatabaseStore(StorageType.PLOCAL.toString()); - db = DBUtil.createDataStore(config); - } - public GroovyMarkupTemplateEngineRenderingTest() { super("groovyMarkupTemplates", "tpl"); From 563be7520ad4b1ffbcc29fdbc1e11003a40c0738 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 19 Sep 2022 19:21:03 +0100 Subject: [PATCH 232/256] Resolved issue when getting tags back for content, following OrientDB upgrade. --- jbake-core/src/main/java/org/jbake/app/DBUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jbake-core/src/main/java/org/jbake/app/DBUtil.java b/jbake-core/src/main/java/org/jbake/app/DBUtil.java index 73fce3fdb..33568b450 100644 --- a/jbake-core/src/main/java/org/jbake/app/DBUtil.java +++ b/jbake-core/src/main/java/org/jbake/app/DBUtil.java @@ -6,6 +6,8 @@ import org.jbake.app.configuration.JBakeConfiguration; import org.jbake.model.DocumentModel; +import java.util.ArrayList; + public class DBUtil { private static ContentStore contentStore; @@ -56,6 +58,9 @@ public static String[] toStringArray(Object entry) { } else if (entry instanceof OTrackedList) { OTrackedList list = (OTrackedList) entry; return list.toArray(new String[list.size()]); + } else if (entry instanceof ArrayList) { + ArrayList list = (ArrayList) entry; + return list.toArray(new String[list.size()]); } return new String[0]; } From e1fae710bd21dbff1e96262ec8114448693c3f23 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 19 Sep 2022 19:57:38 +0100 Subject: [PATCH 233/256] Included file encoding parameter to cover execution on Windows. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cce9a1cee..b2d7b786f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradlew- - name: Build - run: ./gradlew build -S + run: ./gradlew -Dfile.encoding=UTF-8 build -S - name: Upload Reports uses: actions/upload-artifact@v1 From 857cf2e8b5db776454acb16621d13bcf14a28a01 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 19 Sep 2022 22:41:04 +0100 Subject: [PATCH 234/256] Used runner context to detect OS build is running on. --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2d7b786f..7a57a1267 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,12 @@ jobs: key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} restore-keys: | ${{ runner.os }}-gradlew- - - name: Build - run: ./gradlew -Dfile.encoding=UTF-8 build -S + - name: Build-win + if: runner.os == 'Windows' + run: gradlew.bat -Dfile.encoding=UTF-8 build -S + - name: Build-nix + if: runner.os != 'Windows' + run: ./gradlew build -S - name: Upload Reports uses: actions/upload-artifact@v1 From 7aeb4c6de3f51fe72e66c44d6545c6c66f8d66ff Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Mon, 19 Sep 2022 22:47:33 +0100 Subject: [PATCH 235/256] Altered shell for Windows. --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a57a1267..8a12a50eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: ${{ runner.os }}-gradlew- - name: Build-win if: runner.os == 'Windows' + shell: cmd run: gradlew.bat -Dfile.encoding=UTF-8 build -S - name: Build-nix if: runner.os != 'Windows' From 4db36fe86afe2f78a7fa4affdb8c4402568e970d Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Tue, 20 Sep 2022 23:50:19 +0100 Subject: [PATCH 236/256] Update version to 2.7.0-rc.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a39392548..cffffe912 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-SNAPSHOT +version = 2.7.0-rc.6 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From 8341bd103ae366a3be6df14b96ea1076bdda06af Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Thu, 22 Sep 2022 00:30:42 +0100 Subject: [PATCH 237/256] Fixed signing for publishing to Maven Central. --- gradle/signing.gradle | 15 +++++++++++++++ jbake-core/build.gradle | 1 + jbake-maven-plugin/build.gradle | 1 + 3 files changed, 17 insertions(+) create mode 100644 gradle/signing.gradle diff --git a/gradle/signing.gradle b/gradle/signing.gradle new file mode 100644 index 000000000..a8b0abece --- /dev/null +++ b/gradle/signing.gradle @@ -0,0 +1,15 @@ +if ( !project.hasProperty('skipSigning') ) { + apply plugin: 'signing' + + if (!signing.signatory) { + logger.warn "No Signatory configured for project $project.name. Skip signing! See https://docs.gradle.org/current/userguide/signing_plugin.html" + ext.skipSigning = true + } + else { + if ( project.name != "jbake-dist" ) { + signing { + sign publishing.publications.mavenJava + } + } + } +} diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 820938c4b..626a11a6b 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -7,6 +7,7 @@ plugins { } apply from: "$rootDir/gradle/maven-publishing.gradle" +apply from: "$rootDir/gradle/signing.gradle" description = "The core library of JBake" diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index fabf47e20..6238eef09 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -10,6 +10,7 @@ mavenPlugin { } apply from: "$rootDir/gradle/maven-publishing.gradle" +apply from: "$rootDir/gradle/signing.gradle" publishing { publications { From 701f9dcd47f78bb29d7cfd84955fcf798dfc7a76 Mon Sep 17 00:00:00 2001 From: Jarkko Piiroinen <183207+jmp@users.noreply.github.com> Date: Tue, 8 Nov 2022 17:09:50 +0200 Subject: [PATCH 238/256] Upgrade AsciidoctorJ to version 2.5.7 This fixes a library loading issue on Apple's M1 hardware. The problem is caused by a version of JRuby that does not support macos-aarch64. By upgrading AsciidoctorJ, a newer version of JRuby supporting M1 is used. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cffffe912..b537839f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ issues = https://github.com/jbake-org/jbake/issues vcs = https://github.com/jbake-org/jbake/ # runtime dependencies -asciidoctorjVersion = 2.5.2 +asciidoctorjVersion = 2.5.7 asciidoctorjDiagramVersion = 2.2.1 args4jVersion = 2.33 commonsIoVersion = 2.11.0 From ee903bac88f4a3e93c8fa80e909768fda2374865 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 25 Feb 2023 13:20:04 +0000 Subject: [PATCH 239/256] Reverted to SNAPSHOT suffix. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b537839f7..b1554c042 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.6 +version = 2.7.0-SNAPSHOT description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From 9a246275af10c99f98e626dbbb1b113d6ff79f21 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 25 Feb 2023 18:36:15 +0000 Subject: [PATCH 240/256] Fix openjdk11 build on Travis. --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fa72351a..45b645ac7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,13 @@ jobs: - jdk: openjdk11 - os: osx - osx_image: xcode13.2 + osx_image: xcode13.2 # defaults to openjdk17 - - jdk: openjdk11 - os: osx + - os: osx + osx_image: xcode9.4 + script: + - jdk_switcher use openjdk11 + - "./gradlew check --stacktrace" # - stage: Quality Check # name: sonarqube From 00bc27639629058bb09f87c01e61bb365fe69f72 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 25 Feb 2023 18:53:59 +0000 Subject: [PATCH 241/256] Still trying to get openjdk11 working on OSX. --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45b645ac7..29c45c090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,7 @@ jobs: - os: osx osx_image: xcode9.4 - script: - - jdk_switcher use openjdk11 - - "./gradlew check --stacktrace" + jdk: openjdk11 # - stage: Quality Check # name: sonarqube From 8a8101a16606764c2ff60818e5c55f8e6fff731a Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sat, 25 Feb 2023 21:49:22 +0000 Subject: [PATCH 242/256] Removed MacOS build with openjdk11 for time being. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29c45c090..b37531a29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,9 +26,10 @@ jobs: - os: osx osx_image: xcode13.2 # defaults to openjdk17 - - os: osx - osx_image: xcode9.4 - jdk: openjdk11 +# below config fails +# - os: osx +# osx_image: xcode9.4 +# jdk: openjdk11 # - stage: Quality Check # name: sonarqube From c4ab637674101f41a573eb771375d219de6fc3fb Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 26 Feb 2023 11:08:41 +0000 Subject: [PATCH 243/256] Bumped version for next RC. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b1554c042..4607c44e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-SNAPSHOT +version = 2.7.0-rc.7 description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From 5921ee529e324d71e00a96a12968021ea12dd103 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 26 Feb 2023 11:19:26 +0000 Subject: [PATCH 244/256] Reverted to SNAPSHOT suffix. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4607c44e3..b1554c042 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.jbake -version = 2.7.0-rc.7 +version = 2.7.0-SNAPSHOT description = JBake is a Java based open source static site/blog generator for developers. website = http://jbake.org From faa0c6c1d4a27b99a195924cfc25503303460489 Mon Sep 17 00:00:00 2001 From: Manik Magar Date: Sat, 22 Nov 2025 10:09:16 +0530 Subject: [PATCH 245/256] chore: upgrade github actions version --- .github/workflows/build.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a12a50eb..ccb93b463 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,15 @@ name: Build on: + push: + branches: + - 'master' + - 'chore/**' + - 'feat/**' + - 'fix/**' pull_request: + branches: + - 'master' jobs: build: @@ -13,21 +21,23 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - name: Set up Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: 11 - distribution: 'zulu' + distribution: 'temurin' + cache: 'gradle' - - uses: actions/cache@v2 + + - uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} @@ -42,7 +52,7 @@ jobs: run: ./gradlew build -S - name: Upload Reports - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: failure() with: name: reports-${{ runner.os }} From d3a21e39e7a3369ebd5800f301fc23ff0e5c2c69 Mon Sep 17 00:00:00 2001 From: Manik Magar Date: Sat, 22 Nov 2025 10:41:14 +0530 Subject: [PATCH 246/256] chore: upgrade github actions version --- .github/workflows/early-access.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 23367b2a7..309a4ba28 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -12,23 +12,24 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v5 with: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: 11 - distribution: 'zulu' + distribution: 'temurin' + cache: 'gradle' - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} @@ -49,7 +50,7 @@ jobs: - name: JReleaser output if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: jreleaser-logs path: | From 61a12e3bae8c47d94ead1335e52dfd81ec118857 Mon Sep 17 00:00:00 2001 From: Manik Magar Date: Sat, 22 Nov 2025 15:51:40 +0530 Subject: [PATCH 247/256] chore: use gradle action for cache --- .github/workflows/build.yml | 15 ++------------- .github/workflows/early-access.yml | 16 +++------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ccb93b463..b38bef2f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,21 +28,10 @@ jobs: with: java-version: 11 distribution: 'temurin' - cache: 'gradle' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 - - uses: actions/cache@v4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - uses: actions/cache@v4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} - restore-keys: | - ${{ runner.os }}-gradlew- - name: Build-win if: runner.os == 'Windows' shell: cmd diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 309a4ba28..ddf6aaf6d 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -21,20 +21,10 @@ jobs: with: java-version: 11 distribution: 'temurin' - cache: 'gradle' - - uses: actions/cache@v4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - uses: actions/cache@v4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} - restore-keys: | - ${{ runner.os }}-gradlew- + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 + - name: Build run: ./gradlew build -S From 7e81a5e74396cb96cc9f7800b6b38b57f2d3df95 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Wed, 12 Nov 2025 21:43:05 +0100 Subject: [PATCH 248/256] update to asciidoctorj 3.0.1 and bump some other dependency versions as well --- .../org.jbake.convention.java-common.gradle | 4 +- gradle.properties | 54 ++++++++--------- .../java/org/jbake/model/DocumentModel.java | 2 +- .../org/jbake/parser/AsciidoctorEngine.java | 60 +++++++++++++------ .../jbake/template/JadeTemplateEngine.java | 4 +- .../template/ThymeleafTemplateEngine.java | 2 +- .../test/java/org/jbake/app/AssetTest.java | 4 +- 7 files changed, 77 insertions(+), 53 deletions(-) diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index 0b91690b6..b882da242 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -29,8 +29,8 @@ dependencies { } tasks.withType(JavaCompile) { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } //set jvm for all Test tasks (like test and smokeTest) diff --git a/gradle.properties b/gradle.properties index b1554c042..569f6cc09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,52 +7,52 @@ issues = https://github.com/jbake-org/jbake/issues vcs = https://github.com/jbake-org/jbake/ # runtime dependencies -asciidoctorjVersion = 2.5.7 -asciidoctorjDiagramVersion = 2.2.1 +asciidoctorjVersion = 3.0.1 +asciidoctorjDiagramVersion = 3.0.1 args4jVersion = 2.33 -commonsIoVersion = 2.11.0 -commonsConfigurationVersion = 2.7 -commonsBeanutilsVersion = 1.9.4 -commonsLangVersion = 3.12.0 -commonsVfs2Version = 2.9.0 -freemarkerVersion = 2.3.31 -flexmarkVersion = 0.62.2 -groovyVersion = 3.0.9 +commonsIoVersion = 2.21.0 +commonsConfigurationVersion = 2.12.0 +commonsBeanutilsVersion = 1.11.0 +commonsLangVersion = 3.19.0 +commonsVfs2Version = 2.10.0 +freemarkerVersion = 2.3.34 +flexmarkVersion = 0.64.8 +groovyVersion = 3.0.25 jettyServerVersion = 9.4.44.v20210927 jsonSimpleVersion = 1.1.1 jade4jVersion = 1.3.2 -jsoupVersion = 1.14.3 +jsoupVersion = 1.21.2 jgitVersion = 6.0.0.202111291000-r -logbackVersion = 1.2.10 +logbackVersion = 1.5.21 orientDbVersion = 3.1.20 pebbleVersion = 3.1.5 -slf4jVersion = 1.7.32 -snakeYamlVersion = 1.30 -thymeleafVersion = 3.0.14.RELEASE -picocli = 4.6.2 +slf4jVersion = 2.0.17 +snakeYamlVersion = 2.5 +thymeleafVersion = 3.1.3.RELEASE +picocli = 4.7.7 # testing dependencies junit4Version = 4.13.2 -junit5Version = 5.8.2 -junit5SystemExtVersion = 1.2.0 -junitPioneer = 1.5.0 -assertjCoreVersion = 3.21.0 -mockitoVersion = 4.2.0 +junit5Version = 5.14.1 +junit5SystemExtVersion = 1.2.2 +junitPioneer = 2.3.0 +assertjCoreVersion = 3.27.6 +mockitoVersion = 5.20.0 # build dependencies jacocoVersion = 0.8.7 grgitVersion = 4.1.1 -nexusPublishPluginVersion = 1.1.0 -versionsPluginVersion = 0.40.0 +nexusPublishPluginVersion = 2.0.0 +versionsPluginVersion = 0.53.0 optionalBaseVersion = 7.0.0 jreleaserVersion = 0.10.0 -mavenPluginDevVersion = 0.3.1 +mavenPluginDevVersion = 0.4.3 # jbake-maven-plugin dependencies -mavenVersion = 3.8.4 -mavenAnnotationsVersion = 3.6.2 -sparkVersion = 2.9.3 +mavenVersion = 3.9.11 +mavenAnnotationsVersion = 3.15.2 +sparkVersion = 2.9.4 org.gradle.caching=true org.gradle.parallel=true diff --git a/jbake-core/src/main/java/org/jbake/model/DocumentModel.java b/jbake-core/src/main/java/org/jbake/model/DocumentModel.java index 99fd559cb..295f8c170 100644 --- a/jbake-core/src/main/java/org/jbake/model/DocumentModel.java +++ b/jbake-core/src/main/java/org/jbake/model/DocumentModel.java @@ -14,7 +14,7 @@ public static DocumentModel createDefaultDocumentModel() { } public String getBody() { - return (String) get(ModelAttributes.BODY); + return get(ModelAttributes.BODY).toString(); } public void setBody(String body) { diff --git a/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java b/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java index a5b106895..4ffc00234 100644 --- a/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java +++ b/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java @@ -1,23 +1,30 @@ package org.jbake.parser; + +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.locks.ReentrantReadWriteLock; + import org.asciidoctor.Asciidoctor; -import org.asciidoctor.AttributesBuilder; +import org.asciidoctor.Attributes; import org.asciidoctor.Options; -import org.asciidoctor.ast.DocumentHeader; +import org.asciidoctor.ast.Document; import org.asciidoctor.jruby.AsciidoctorJRuby; import org.jbake.app.configuration.JBakeConfiguration; import org.jbake.model.DocumentModel; +import org.jruby.RubyArray; +import org.jruby.RubyBasicObject; +import org.jruby.RubyString; +import org.jruby.RubySymbol; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import static org.asciidoctor.AttributesBuilder.attributes; -import static org.asciidoctor.OptionsBuilder.options; import static org.asciidoctor.SafeMode.UNSAFE; /** @@ -84,15 +91,16 @@ private Asciidoctor getEngine(Options options) { public void processHeader(final ParserContext context) { Options options = getAsciiDocOptionsAndAttributes(context); final Asciidoctor asciidoctor = getEngine(options); - DocumentHeader header = asciidoctor.readDocumentHeader(context.getFile()); + Document header = asciidoctor.loadFile(context.getFile(), options); DocumentModel documentModel = context.getDocumentModel(); - if (header.getDocumentTitle() != null) { - documentModel.setTitle(header.getDocumentTitle().getCombined()); + if (header.getDoctitle() != null) { + documentModel.setTitle(header.getDoctitle()); } Map attributes = header.getAttributes(); for (Map.Entry attribute : attributes.entrySet()) { String key = attribute.getKey(); - Object value = attribute.getValue(); + Object value = rubyAsJavaOrValue(attribute.getValue()); + if (hasJBakePrefix(key)) { String pKey = key.substring(6); @@ -120,7 +128,7 @@ public void processHeader(final ParserContext context) { LOGGER.error("Wrong value of 'jbake-tags'. Expected a String got '{}'", getValueClassName(value)); } } else { - documentModel.put(key, attributes.get(key)); + documentModel.put(key, value); } } } @@ -129,6 +137,18 @@ private boolean canCastToString(Object value) { return value instanceof String; } + private Object rubyAsJavaOrValue(Object value) { + if (value instanceof RubyString) { + return ((RubyString) value).asJavaString(); + } else if (value instanceof RubySymbol) { + return ((RubySymbol) value).asJavaString(); + } else if (value instanceof RubyArray) { + return ((RubyArray) value).toArray(); + } else { + return value; + } + } + private String getValueClassName(Object value) { return (value == null) ? "null" : value.getClass().getCanonicalName(); } @@ -144,8 +164,8 @@ private boolean hasJBakePrefix(String key) { // TODO: write tests with options and attributes @Override public void processBody(ParserContext context) { - StringBuilder body = new StringBuilder(context.getBody().length()); if (!context.hasHeader()) { + StringBuilder body = new StringBuilder(context.getBody().length()); for (String line : context.getFileLines()) { body.append(line).append("\n"); } @@ -163,20 +183,22 @@ private void processAsciiDoc(ParserContext context) { private Options getAsciiDocOptionsAndAttributes(ParserContext context) { JBakeConfiguration config = context.getConfig(); List asciidoctorAttributes = config.getAsciidoctorAttributes(); - final AttributesBuilder attributes = attributes(asciidoctorAttributes.toArray(new String[0])); + Attributes attributes = Attributes.builder().build(); + attributes.setAttributes(asciidoctorAttributes.toArray(new String[0])); if (config.getExportAsciidoctorAttributes()) { final String prefix = config.getAttributesExportPrefixForAsciidoctor(); for (final Iterator it = config.getKeys(); it.hasNext(); ) { final String key = it.next(); if (!key.startsWith("asciidoctor")) { - attributes.attribute(prefix + key.replace(".", "_"), config.get(key)); + attributes.setAttribute(prefix + key.replace(".", "_"), config.get(key)); } } } final List optionsSubset = config.getAsciidoctorOptionKeys(); - final Options options = options().attributes(attributes.get()).get(); + + final Options options = Options.builder().attributes(attributes).build(); for (final String optionKey : optionsSubset) { Object optionValue = config.getAsciidoctorOption(optionKey); diff --git a/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java index bbbff0bfb..f9187c905 100644 --- a/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java +++ b/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java @@ -11,7 +11,7 @@ import de.neuland.jade4j.template.JadeTemplate; import de.neuland.jade4j.template.TemplateLoader; import org.apache.commons.configuration2.CompositeConfiguration; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.jbake.app.ContentStore; import org.jbake.app.configuration.JBakeConfiguration; import org.jbake.template.model.TemplateModel; @@ -105,7 +105,7 @@ public String format(Date date, String pattern) { } public String escape(String s) { - return StringEscapeUtils.escapeHtml(s); + return StringEscapeUtils.escapeHtml4(s); } } } diff --git a/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java index c6cc99dc2..a90c63e54 100644 --- a/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java +++ b/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java @@ -1,7 +1,7 @@ package org.jbake.template; import org.apache.commons.configuration2.CompositeConfiguration; -import org.apache.commons.lang.LocaleUtils; +import org.apache.commons.lang3.LocaleUtils; import org.jbake.app.ContentStore; import org.jbake.app.configuration.DefaultJBakeConfiguration; import org.jbake.app.configuration.JBakeConfiguration; diff --git a/jbake-core/src/test/java/org/jbake/app/AssetTest.java b/jbake-core/src/test/java/org/jbake/app/AssetTest.java index 1f718d706..c6d28ba60 100644 --- a/jbake-core/src/test/java/org/jbake/app/AssetTest.java +++ b/jbake-core/src/test/java/org/jbake/app/AssetTest.java @@ -16,7 +16,9 @@ import java.io.FileFilter; import java.io.IOException; import java.net.URL; +import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.attribute.PosixFilePermissions; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.times; @@ -150,7 +152,7 @@ public void testWriteProtected() throws Exception { css.mkdir(); final File cssFile = new File(css, "bootstrap.min.css"); FileUtils.touch(cssFile); - cssFile.setReadOnly(); + css.setReadOnly(); config.setAssetFolder(assets); config.setDestinationFolder(folder.toFile()); From 88d4cb4329dac4ef2084af632c22820cd8b23d24 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Wed, 12 Nov 2025 23:18:41 +0100 Subject: [PATCH 249/256] update pebble, jetty, jgit and grgit --- gradle.properties | 8 ++++---- .../org/jbake/template/PebbleTemplateEngine.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 569f6cc09..c3b1dd3c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,14 +18,14 @@ commonsVfs2Version = 2.10.0 freemarkerVersion = 2.3.34 flexmarkVersion = 0.64.8 groovyVersion = 3.0.25 -jettyServerVersion = 9.4.44.v20210927 +jettyServerVersion = 11.0.26 jsonSimpleVersion = 1.1.1 jade4jVersion = 1.3.2 jsoupVersion = 1.21.2 -jgitVersion = 6.0.0.202111291000-r +jgitVersion = 7.4.0.202509020913-r logbackVersion = 1.5.21 orientDbVersion = 3.1.20 -pebbleVersion = 3.1.5 +pebbleVersion = 3.2.4 slf4jVersion = 2.0.17 snakeYamlVersion = 2.5 thymeleafVersion = 3.1.3.RELEASE @@ -42,7 +42,7 @@ mockitoVersion = 5.20.0 # build dependencies jacocoVersion = 0.8.7 -grgitVersion = 4.1.1 +grgitVersion = 5.3.3 nexusPublishPluginVersion = 2.0.0 versionsPluginVersion = 0.53.0 optionalBaseVersion = 7.0.0 diff --git a/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java index 7a850043c..427625f0e 100644 --- a/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java +++ b/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java @@ -1,18 +1,18 @@ package org.jbake.template; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.escaper.EscaperExtension; -import com.mitchellbosecke.pebble.loader.FileLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import org.jbake.app.ContentStore; import org.jbake.app.configuration.JBakeConfiguration; import org.jbake.template.model.TemplateModel; import java.io.IOException; import java.io.Writer; -import java.util.Map; + +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.escaper.EscaperExtension; +import io.pebbletemplates.pebble.loader.FileLoader; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.template.PebbleTemplate; /** * Renders pages using the Pebble template engine. @@ -28,7 +28,7 @@ public PebbleTemplateEngine(final JBakeConfiguration config, final ContentStore } private void initializeTemplateEngine() { - Loader loader = new FileLoader(); + Loader loader = new FileLoader(); loader.setPrefix(config.getTemplateFolder().getAbsolutePath()); /* From e285d68f600542228f850f2f6034e364da5eeea2 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Thu, 13 Nov 2025 20:05:15 +0100 Subject: [PATCH 250/256] upgrade gradle to 8.5 making project compilable with jdk 21 --- .travis.yml | 2 + .../org.jbake.convention.java-common.gradle | 1 - gradle.properties | 9 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- gradlew.bat | 178 ++++++------ jbake-core/build.gradle | 2 +- .../main/java/org/jbake/launcher/BakeOff.java | 10 + .../main/java/org/jbake/launcher/Main.java | 5 +- .../java/org/jbake/launcher/MainTest.java | 33 ++- jbake-maven-plugin/build.gradle | 2 +- 12 files changed, 278 insertions(+), 223 deletions(-) create mode 100644 jbake-core/src/main/java/org/jbake/launcher/BakeOff.java diff --git a/.travis.yml b/.travis.yml index b37531a29..0d8f20a36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ script: jobs: include: + - jdk: openjdk21 + - jdk: openjdk17 - jdk: openjdk11 diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index b882da242..c7ba586b4 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -25,7 +25,6 @@ dependencies { testImplementation "org.assertj:assertj-core:$assertjCoreVersion" testImplementation "org.mockito:mockito-core:$mockitoVersion" testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion" - testImplementation "org.itsallcode:junit5-system-extensions:$junit5SystemExtVersion" } tasks.withType(JavaCompile) { diff --git a/gradle.properties b/gradle.properties index c3b1dd3c8..eb10fbb1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,19 +35,18 @@ picocli = 4.7.7 # testing dependencies junit4Version = 4.13.2 junit5Version = 5.14.1 -junit5SystemExtVersion = 1.2.2 junitPioneer = 2.3.0 assertjCoreVersion = 3.27.6 mockitoVersion = 5.20.0 # build dependencies -jacocoVersion = 0.8.7 +jacocoVersion = 0.8.9 grgitVersion = 5.3.3 nexusPublishPluginVersion = 2.0.0 versionsPluginVersion = 0.53.0 -optionalBaseVersion = 7.0.0 -jreleaserVersion = 0.10.0 -mavenPluginDevVersion = 0.4.3 +optionalBaseVersion = 10.0.1 +jreleaserVersion = 1.21.0 +mavenPluginDevVersion = 1.0.3 # jbake-maven-plugin dependencies mavenVersion = 3.9.11 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..a59520664 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..1b6c78733 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..ac1b06f93 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 626a11a6b..46abb77b6 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -3,7 +3,7 @@ import java.time.format.DateTimeFormatter plugins { id "org.jbake.convention.java-common" id 'java-library' - id 'nebula.optional-base' version "$optionalBaseVersion" + id 'com.netflix.nebula.optional-base' version "9.0.0" } apply from: "$rootDir/gradle/maven-publishing.gradle" diff --git a/jbake-core/src/main/java/org/jbake/launcher/BakeOff.java b/jbake-core/src/main/java/org/jbake/launcher/BakeOff.java new file mode 100644 index 000000000..29bd60a29 --- /dev/null +++ b/jbake-core/src/main/java/org/jbake/launcher/BakeOff.java @@ -0,0 +1,10 @@ +package org.jbake.launcher; + +public final class BakeOff { + + private BakeOff() {} + + public static void exit(int status) { + System.exit(status); + } +} diff --git a/jbake-core/src/main/java/org/jbake/launcher/Main.java b/jbake-core/src/main/java/org/jbake/launcher/Main.java index c244848f7..30ee9beb9 100644 --- a/jbake-core/src/main/java/org/jbake/launcher/Main.java +++ b/jbake-core/src/main/java/org/jbake/launcher/Main.java @@ -1,6 +1,5 @@ package org.jbake.launcher; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.jbake.app.FileUtil; import org.jbake.app.JBakeException; import org.jbake.app.configuration.JBakeConfiguration; @@ -21,8 +20,6 @@ */ public class Main { - private static final String USAGE_PREFIX = "Usage: jbake"; - private static final String ALT_USAGE_PREFIX = " or jbake"; private final Baker baker; private final JettyServer jettyServer; private final BakeWatcher watcher; @@ -64,7 +61,7 @@ public static void main(final String[] args) { if (e.getCause() instanceof MissingParameterException) { Main.printUsage(); } - System.exit(e.getExit()); + BakeOff.exit(e.getExit()); } } diff --git a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java index 0d2083929..f505b4f23 100644 --- a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java +++ b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java @@ -1,8 +1,11 @@ package org.jbake.launcher; -import ch.qos.logback.classic.spi.LoggingEvent; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.PrintStream; +import java.nio.file.Path; + import org.apache.commons.configuration2.ex.ConfigurationException; -import org.itsallcode.junit.sysextensions.ExitGuard; import org.jbake.TestUtils; import org.jbake.app.JBakeException; import org.jbake.app.LoggingTest; @@ -13,19 +16,15 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.Mock; -import picocli.CommandLine; +import org.mockito.MockedStatic; +import org.mockito.Mockito; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.nio.file.Path; +import ch.qos.logback.classic.spi.LoggingEvent; +import picocli.CommandLine; import static org.assertj.core.api.Assertions.assertThat; -import static org.itsallcode.junit.sysextensions.AssertExit.assertExitWithStatus; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -35,7 +34,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@ExtendWith(ExitGuard.class) class MainTest extends LoggingTest { private final PrintStream standardOut = System.out; @@ -196,12 +194,13 @@ void shouldTellUserThatTemplateOptionRequiresInitOption() { String[] args = {"-t", "groovy-mte"}; - assertExitWithStatus(SystemExit.CONFIGURATION_ERROR.getStatus(), ()->Main.main(args)); - - verify(mockAppender, times(1)).doAppend(captorLoggingEvent.capture()); - - LoggingEvent loggingEvent = captorLoggingEvent.getValue(); - assertThat(loggingEvent.getMessage()).isEqualTo("Error: Missing required argument(s): --init"); + try (MockedStatic utilities = Mockito.mockStatic(BakeOff.class)) { + Main.main(args); + verify(mockAppender, times(1)).doAppend(captorLoggingEvent.capture()); + LoggingEvent loggingEvent = captorLoggingEvent.getValue(); + assertThat(loggingEvent.getMessage()).isEqualTo("Error: Missing required argument(s): --init"); + utilities.verify(() -> BakeOff.exit(SystemExit.CONFIGURATION_ERROR.getStatus())); + } } @Test diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index 6238eef09..54eedef36 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'de.benediktritter.maven-plugin-development' version "$mavenPluginDevVersion" + id 'org.gradlex.maven-plugin-development' version '1.0.3' id "org.jbake.convention.java-common" } From a59c5d19a6b7402b45b05794514aeaf29c6c8aa0 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Thu, 13 Nov 2025 20:57:14 +0100 Subject: [PATCH 251/256] upgrade gradle to 8.14.3 --- .../org.jbake.convention.java-common.gradle | 4 +- gradle/application.gradle | 12 ++--- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 41 ++++++++++++------ gradlew.bat | 15 ++++--- jbake-core/build.gradle | 3 +- jbake-dist/build.gradle | 6 +-- 8 files changed, 54 insertions(+), 31 deletions(-) diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index c7ba586b4..fae4be583 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -44,7 +44,7 @@ tasks.withType(Test) { if (JavaVersion.current().java9Compatible) { args << '-XX:MaxDirectMemorySize=2g' } - jvmArgs args + jvmArgs = args } task javadocJar(type: Jar) { @@ -67,7 +67,7 @@ test { testLogging { events "passed", "skipped", "failed" - exceptionFormat "full" + exceptionFormat = "full" } jacoco { diff --git a/gradle/application.gradle b/gradle/application.gradle index 165c9bb04..90c59c44e 100644 --- a/gradle/application.gradle +++ b/gradle/application.gradle @@ -1,5 +1,7 @@ -mainClassName = "org.jbake.launcher.Main" -applicationName = "jbake" +application { + mainClass = "org.jbake.launcher.Main" + applicationName = "jbake" +} def examplesBase = "$project.buildDir/examples" @@ -16,7 +18,7 @@ exampleRepositories.each { name, repository -> task "clone_${name}Repository"() { group = "distribution" - description "Clone jbake ${name} example project repository" + description = "Clone jbake ${name} example project repository" def repositoryName = "$examplesBase/$name" @@ -28,8 +30,8 @@ exampleRepositories.each { name, repository -> } task "${name}Zip"(type: Zip) { - group "distribution" - description "Zip $name repository" + group = "distribution" + description = "Zip $name repository" archiveBaseName = name archiveFileName = "${archiveBaseName.get()}.zip" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..d64cd4917707c1f8861d8cb53dd15194d4248596 100644 GIT binary patch literal 43462 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 bk)x42o%IjI4BRP0u<>w0AZH4H-*Em1`@F3o delta 35308 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 BrcM9= diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da47..bad7c2462 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a426..ef07e0162 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -203,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 6689b85be..5eed7ee84 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 0adbfdc3c..6f3aa28e6 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -3,7 +3,6 @@ import java.time.format.DateTimeFormatter plugins { id "org.jbake.convention.java-common" id 'java-library' - id 'com.netflix.nebula.optional-base' version "9.0.0" } apply from: "$rootDir/gradle/maven-publishing.gradle" @@ -33,28 +32,28 @@ dependencies { api "commons-io:commons-io:$commonsIoVersion" api "org.apache.commons:commons-configuration2:$commonsConfigurationVersion" implementation "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion" - implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version", optional + implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version" implementation "org.apache.commons:commons-lang3:$commonsLangVersion" implementation("com.googlecode.json-simple:json-simple:$jsonSimpleVersion") { exclude group: "junit", module: "junit" } implementation "com.orientechnologies:orientdb-core:$orientDbVersion" - api "org.asciidoctor:asciidoctorj:$asciidoctorjVersion", optional - api "org.codehaus.groovy:groovy:$groovyVersion", optional - api "org.codehaus.groovy:groovy-templates:$groovyVersion", optional - api "org.codehaus.groovy:groovy-dateutil:$groovyVersion", optional - api "org.freemarker:freemarker:$freemarkerVersion", optional - api "org.thymeleaf:thymeleaf:$thymeleafVersion", optional - api "de.neuland-bfi:jade4j:$jade4jVersion", optional - api "com.vladsch.flexmark:flexmark:$flexmarkVersion", optional - api "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion", optional - api "io.pebbletemplates:pebble:$pebbleVersion", optional + api "org.asciidoctor:asciidoctorj:$asciidoctorjVersion" + api "org.codehaus.groovy:groovy:$groovyVersion" + api "org.codehaus.groovy:groovy-templates:$groovyVersion" + api "org.codehaus.groovy:groovy-dateutil:$groovyVersion" + api "org.freemarker:freemarker:$freemarkerVersion" + api "org.thymeleaf:thymeleaf:$thymeleafVersion" + api "de.neuland-bfi:jade4j:$jade4jVersion" + api "com.vladsch.flexmark:flexmark:$flexmarkVersion" + api "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion" + api "io.pebbletemplates:pebble:$pebbleVersion" implementation "org.jsoup:jsoup:$jsoupVersion" - implementation "org.yaml:snakeyaml:$snakeYamlVersion", optional + implementation "org.yaml:snakeyaml:$snakeYamlVersion" // cli specific dependencies - implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion", optional - implementation "info.picocli:picocli:$picocli", optional + implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion" + implementation "info.picocli:picocli:$picocli" } processResources { diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index 54eedef36..5498f0920 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -36,17 +36,4 @@ dependencies { compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:$mavenAnnotationsVersion" 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" } diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java index fcb70cc91..a265b4442 100644 --- a/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java +++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java @@ -16,6 +16,8 @@ * limitations under the License. */ +import java.io.File; + import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -29,8 +31,6 @@ import org.jbake.app.configuration.JBakeConfiguration; import org.jbake.app.configuration.JBakeConfigurationFactory; -import java.io.File; - /** * Runs jbake on a folder */ diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java index 5f2a5259f..57ee0a011 100644 --- a/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java +++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java @@ -34,49 +34,49 @@ @Mojo(name = "inline", requiresDirectInvocation = true, requiresProject = false) public class InlineMojo extends WatchMojo { - /** - * Listen Port - */ - @Parameter(property = "jbake.listenAddress", defaultValue = "127.0.0.1") - private String listenAddress; + /** + * Listen Port + */ + @Parameter(property = "jbake.listenAddress", defaultValue = "127.0.0.1") + private String listenAddress; - /** - * Index File - */ - @Parameter(property = "jbake.indexFile", defaultValue = "index.html") - private String indexFile; + /** + * Index File + */ + @Parameter(property = "jbake.indexFile", defaultValue = "index.html") + private String indexFile; - /** - * Listen Port - */ - @Parameter(property = "jbake.port") - private Integer port; + /** + * Listen Port + */ + @Parameter(property = "jbake.port") + private Integer port; - private int getPort() { - if (this.port == null) { - try { - return createConfiguration().getServerPort(); - } catch (JBakeException e) { - // ignore since default will be returned - } - } else { - return this.port; + private int getPort() { + if (this.port == null) { + try { + return createConfiguration().getServerPort(); + } catch (JBakeException e) { + // ignore since default will be returned + } + } else { + return this.port; + } + return 8820; } - return 8820; - } - protected void stopServer() throws MojoExecutionException { - stop(); - } + protected void stopServer() throws MojoExecutionException { + stop(); + } - protected void initServer() throws MojoExecutionException { - externalStaticFileLocation(outputDirectory.getPath()); + protected void initServer() throws MojoExecutionException { + externalStaticFileLocation(outputDirectory.getPath()); - ipAddress(listenAddress); - port(getPort()); + ipAddress(listenAddress); + port(getPort()); - init(); + init(); - awaitInitialization(); - } + awaitInitialization(); + } } diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java index 231745705..fe8bdd46b 100644 --- a/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java +++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java @@ -16,12 +16,6 @@ * limitations under the License. */ -import org.apache.commons.io.IOUtils; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -31,6 +25,12 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.apache.commons.io.IOUtils; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import static java.lang.String.format; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.join; @@ -40,17 +40,17 @@ */ @Mojo(name = "seed", requiresProject = true, requiresDirectInvocation = true) public class SeedMojo extends AbstractMojo { - /** - * Location of the Seeding Zip - */ - @Parameter(property = "jbake.seedUrl", defaultValue = "https://github.com/jbake-org/jbake-template-bootstrap/zipball/master/", required = true) - protected String seedUrl; - - /** - * Location of the Output Directory. - */ - @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) - protected File outputDirectory; + /** + * Location of the Seeding Zip + */ + @Parameter(property = "jbake.seedUrl", defaultValue = "https://github.com/jbake-org/jbake-template-bootstrap/zipball/master/", required = true) + protected String seedUrl; + + /** + * Location of the Output Directory. + */ + @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true) + protected File outputDirectory; /** * Really force overwrite if output dir exists? defaults to false @@ -59,10 +59,11 @@ public class SeedMojo extends AbstractMojo { protected Boolean force; public void execute() throws MojoExecutionException { - if (outputDirectory.exists() && (! force)) + if (outputDirectory.exists() && (!force)) { throw new MojoExecutionException(format("The outputDirectory %s must *NOT* exist. Invoke with jbake.force as true to disregard", outputDirectory.getName())); + } - try { + try { URL url = new URL(seedUrl); File tmpZipFile = File.createTempFile("jbake", ".zip"); @@ -76,19 +77,19 @@ public void execute() throws MojoExecutionException { getLog().info(format("%d bytes downloaded. Unpacking into %s", length, outputDirectory)); unpackZip(tmpZipFile); - } catch (Exception e) { - getLog().info("Oops", e); - throw new MojoExecutionException("Failure when running: ", e); - } - } + } catch (Exception e) { + getLog().info("Oops", e); + throw new MojoExecutionException("Failure when running: ", e); + } + } private void unpackZip(File tmpZipFile) throws IOException { ZipInputStream zis = - new ZipInputStream(new FileInputStream(tmpZipFile)); + new ZipInputStream(new FileInputStream(tmpZipFile)); //get the zipped file list entry ZipEntry ze = zis.getNextEntry(); - while(ze!=null){ + while (ze != null) { if (ze.isDirectory()) { ze = zis.getNextEntry(); continue; diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java index e359dc099..2bb57f0ae 100644 --- a/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java +++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java @@ -16,15 +16,14 @@ * limitations under the License. */ -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.Mojo; -import org.jbake.maven.util.DirWatcher; - import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.jbake.maven.util.DirWatcher; + import static org.apache.commons.lang3.StringUtils.isBlank; /** @@ -33,80 +32,81 @@ @Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false) public class WatchMojo extends GenerateMojo { - public void executeInternal() throws MojoExecutionException { - reRender(); + public void executeInternal() throws MojoExecutionException { + reRender(); - Long lastProcessed = System.currentTimeMillis(); + Long lastProcessed = System.currentTimeMillis(); - getLog().info( - "Now listening for changes on path " + inputDirectory.getPath()); + getLog().info( + "Now listening for changes on path " + inputDirectory.getPath()); - initServer(); + initServer(); - DirWatcher dirWatcher = null; + DirWatcher dirWatcher = null; - try { - dirWatcher = new DirWatcher(inputDirectory); - final AtomicBoolean done = new AtomicBoolean(false); - final BufferedReader reader = new BufferedReader( - new InputStreamReader(System.in)); + try { + dirWatcher = new DirWatcher(inputDirectory); + final AtomicBoolean done = new AtomicBoolean(false); + final BufferedReader reader = new BufferedReader( + new InputStreamReader(System.in)); - (new Thread() { - @Override - public void run() { - try { - getLog() - .info("Running. Enter a blank line to finish. Anything else forces re-rendering."); + (new Thread() { + @Override + public void run() { + try { + getLog() + .info("Running. Enter a blank line to finish. Anything else forces re-rendering."); - while (true) { - String line = reader.readLine(); + while (true) { + String line = reader.readLine(); - if (isBlank(line)) { - break; - } + if (isBlank(line)) { + break; + } - reRender(); - } - } catch (Exception exc) { - getLog().info("Ooops", exc); - } finally { - done.set(true); - } - } - }).start(); + reRender(); + } + } catch (Exception exc) { + getLog().info("Ooops", exc); + } finally { + done.set(true); + } + } + }).start(); - dirWatcher.start(); + dirWatcher.start(); - do { - Long result = dirWatcher.processEvents(); + do { + Long result = dirWatcher.processEvents(); - if (null == result) { - // do nothing on purpose - } else if (result >= lastProcessed) { - getLog().info("Refreshing"); + if (null == result) { + // do nothing on purpose + } else if (result >= lastProcessed) { + getLog().info("Refreshing"); - super.reRender(); + super.reRender(); - lastProcessed = Long.valueOf(System.currentTimeMillis()); - } - } while (!done.get()); - } catch (Exception exc) { - getLog().info("Oops", exc); + lastProcessed = Long.valueOf(System.currentTimeMillis()); + } + } while (!done.get()); + } catch (Exception exc) { + getLog().info("Oops", exc); - throw new MojoExecutionException("Oops", exc); - } finally { - getLog().info("Finishing"); + throw new MojoExecutionException("Oops", exc); + } finally { + getLog().info("Finishing"); - if (null != dirWatcher) - dirWatcher.stop(); + if (null != dirWatcher) { + dirWatcher.stop(); + } - stopServer(); + stopServer(); + } } - } - protected void stopServer() throws MojoExecutionException { - } + protected void stopServer() throws MojoExecutionException { + } - protected void initServer() throws MojoExecutionException { - } + protected void initServer() throws MojoExecutionException { + } } diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java index 6f8a40d4b..240792e39 100644 --- a/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java +++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java @@ -1,70 +1,70 @@ package org.jbake.maven.util; -import org.apache.commons.io.monitor.FileAlterationListenerAdaptor; -import org.apache.commons.io.monitor.FileAlterationMonitor; -import org.apache.commons.io.monitor.FileAlterationObserver; - import java.io.File; import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; +import org.apache.commons.io.monitor.FileAlterationListenerAdaptor; +import org.apache.commons.io.monitor.FileAlterationMonitor; +import org.apache.commons.io.monitor.FileAlterationObserver; + /** * Example to watch a directory (or tree) for changes to files. */ public class DirWatcher { - private final FileAlterationObserver observer; + private final FileAlterationObserver observer; - private final FileAlterationMonitor monitor; + private final FileAlterationMonitor monitor; - private final BlockingQueue changeQueue = new ArrayBlockingQueue(1); + private final BlockingQueue changeQueue = new ArrayBlockingQueue(1); - /** - * Creates a WatchService and registers the given directory - */ - public DirWatcher(File dir) throws IOException { - this.observer = new FileAlterationObserver(dir); - this.monitor = new FileAlterationMonitor(1000, observer); + /** + * Creates a WatchService and registers the given directory + */ + public DirWatcher(File dir) throws IOException { + this.observer = new FileAlterationObserver(dir); + this.monitor = new FileAlterationMonitor(1000, observer); - observer.addListener(new FileAlterationListenerAdaptor() { - @Override - public void onFileCreate(File file) { - onUpdated(); - } + observer.addListener(new FileAlterationListenerAdaptor() { + @Override + public void onFileCreate(File file) { + onUpdated(); + } - @Override - public void onFileChange(File file) { - onUpdated(); - } - }); - } + @Override + public void onFileChange(File file) { + onUpdated(); + } + }); + } - public void start() throws Exception { - monitor.start(); - } + public void start() throws Exception { + monitor.start(); + } - public void stop() { - try { - monitor.stop(); - } catch (Exception exc) { + public void stop() { + try { + monitor.stop(); + } catch (Exception exc) { + } } - } - private void onUpdated() { - try { - changeQueue.put(Long.valueOf(System.currentTimeMillis())); - } catch (InterruptedException iex) { - Thread.currentThread().interrupt(); + private void onUpdated() { + try { + changeQueue.put(Long.valueOf(System.currentTimeMillis())); + } catch (InterruptedException iex) { + Thread.currentThread().interrupt(); + } } - } - /** - * Process all events for keys queued to the watcher - */ - public Long processEvents() throws InterruptedException { - return changeQueue.poll(1, TimeUnit.SECONDS); - } -} \ No newline at end of file + /** + * Process all events for keys queued to the watcher + */ + public Long processEvents() throws InterruptedException { + return changeQueue.poll(1, TimeUnit.SECONDS); + } +} From c01e3de13a79bf87bd0526aee82b47cc8ac2a176 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Fri, 21 Nov 2025 19:19:10 +0100 Subject: [PATCH 253/256] remove grgit and replace with simple Exec tasks for now. the plugin is not active maintained anymore. --- build.gradle | 7 --- .../org.jbake.convention.java-common.gradle | 45 +++++++++++++++++++ gradle.properties | 1 - gradle/application.gradle | 17 +++---- gradle/maven-publishing.gradle | 26 +++++------ jbake-core/build.gradle | 12 +++-- jbake-maven-plugin/build.gradle | 2 + 7 files changed, 70 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 9a3787aa2..248290743 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,11 @@ -import java.time.format.DateTimeFormatter - plugins { id "io.github.gradle-nexus.publish-plugin" version "$nexusPublishPluginVersion" id 'com.github.ben-manes.versions' version "$versionsPluginVersion" - id 'org.ajoberstar.grgit' version "$grgitVersion" id 'org.jreleaser' version "$jreleaserVersion" apply false id "eclipse" id "idea" } -def buildTimeAndDate = grgit.head().dateTime - // common variables ext { isTravis = (System.getenv("TRAVIS") == "true") @@ -23,8 +18,6 @@ ext { sonarDefaultProjectKey = "org.jbake:jbake-base:jbake-core" sonarURL = System.getenv("SONARHOST") ?: sonarDefaultURL sonarProjectKey = System.getenv("SONARPROJECTKEY") ?: sonarDefaultProjectKey - buildDate = buildTimeAndDate.format(DateTimeFormatter.ofPattern('yyyy-MM-dd')) - buildTime = buildTimeAndDate.format(DateTimeFormatter.ofPattern('HH:mm:ss.SSSZ')) isReleaseVersion = !version.endsWith("SNAPSHOT") } diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index d5c5ebeff..d7cbd3a4d 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -1,3 +1,6 @@ +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter + plugins { id 'java' id 'jacoco' @@ -63,6 +66,48 @@ tasks.withType(AbstractArchiveTask).configureEach { reproducibleFileOrder = true } +tasks.register("commitBuildAndDate", Exec) { + group = "build" + description = "determine build date and time from last commit" + + executable "git" + args "show", "-s", "--format=%cI", "HEAD" + + standardOutput = new ByteArrayOutputStream() + + ext.commitDate = { + def zonedDateTime = ZonedDateTime.parse(standardOutput.toString().trim()) + return zonedDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")) + } + + ext.date = { + def zonedDateTime = ZonedDateTime.parse(standardOutput.toString().trim()) + return zonedDateTime.format(DateTimeFormatter.ofPattern('yyyy-MM-dd')) + } + + ext.time = { + def zonedDateTime = ZonedDateTime.parse(standardOutput.toString().trim()) + return zonedDateTime.format(DateTimeFormatter.ofPattern('HH:mm:ss.SSSZ')) + } +} + +tasks.register("commitHash", Exec) { + group = "build" + description = "determine build commit hash for last commit" + + executable "git" + args "show", "-s", "--format=%h", "HEAD" + + standardOutput = new ByteArrayOutputStream() + + ext.abbreviated = { + return standardOutput.toString().trim() + } +} + +processResources.dependsOn(tasks.commitBuildAndDate) +processResources.dependsOn(tasks.commitHash) + test { useJUnitPlatform() diff --git a/gradle.properties b/gradle.properties index 2a67e5ec0..bee94706e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,6 @@ mockitoVersion = 5.20.0 # build dependencies jacocoVersion = 0.8.13 -grgitVersion = 5.3.3 nexusPublishPluginVersion = 2.0.0 versionsPluginVersion = 0.53.0 optionalBaseVersion = 10.0.1 diff --git a/gradle/application.gradle b/gradle/application.gradle index 4336d0983..714a77f92 100644 --- a/gradle/application.gradle +++ b/gradle/application.gradle @@ -3,8 +3,6 @@ application { applicationName = "jbake" } -def examplesBase = "$project.buildDir/examples" - def exampleRepositories = [ "example_project_freemarker": "https://github.com/jbake-org/jbake-example-project-freemarker.git", "example_project_groovy" : "https://github.com/jbake-org/jbake-example-project-groovy.git", @@ -16,25 +14,22 @@ def exampleRepositories = [ //create clone and Zip Task for each repository exampleRepositories.each { name, repository -> - tasks.register("clone_${name}Repository") { + tasks.register("clone_${name}Repository", Exec) { group = "distribution" description = "Clone jbake ${name} example project repository" + def repositoryName = "${project.layout.buildDirectory.asFile.get()}/examples/$name" - def repositoryName = "$examplesBase/$name" - - outputs.dir repositoryName + outputs.dir(repositoryName) - doLast { - grgit.clone(dir: repositoryName, uri: repository) - } + executable "git" + args "clone", "$repository", "$repositoryName" } tasks.register("${name}Zip", Zip) { group = "distribution" description = "Zip $name repository" - archiveBaseName = name - archiveFileName = "${archiveBaseName}.zip" + archiveFileName = "${name}.zip" from project.tasks.named("clone_${name}Repository").get().outputs exclude 'README.md' diff --git a/gradle/maven-publishing.gradle b/gradle/maven-publishing.gradle index f5fb4f554..e0bb12f09 100644 --- a/gradle/maven-publishing.gradle +++ b/gradle/maven-publishing.gradle @@ -69,19 +69,17 @@ publishing { jar { manifest { - attributes( - 'Built-By': System.properties['user.name'], - 'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(), - 'Build-Date': buildDate, - 'Build-Time': buildTime, - 'Specification-Title': project.name, - 'Specification-Version': project.version, - 'Specification-Vendor': project.name, - 'Implementation-Title': project.name, - 'Implementation-Version': project.version, - 'Implementation-Vendor': project.name - ) + attributes.putIfAbsent('Built-By', System.properties['user.name']) + attributes.putIfAbsent('Created-By', "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})") + attributes.putIfAbsent('Specification-Title', project.name) + attributes.putIfAbsent('Specification-Version', project.version) + attributes.putIfAbsent('Specification-Vendor', project.name) + attributes.putIfAbsent('Implementation-Title', project.name) + attributes.putIfAbsent('Implementation-Version', project.version) + attributes.putIfAbsent('Implementation-Vendor', project.name) + } + doFirst { + manifest.attributes.putIfAbsent('Build-Date',commitBuildAndDate.date()) + manifest.attributes.putIfAbsent('Build-Time',commitBuildAndDate.time()) } } - - diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 6f3aa28e6..789e84417 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -1,5 +1,3 @@ -import java.time.format.DateTimeFormatter - plugins { id "org.jbake.convention.java-common" id 'java-library' @@ -58,9 +56,9 @@ dependencies { processResources { inputs.property("jbake.version", project.version) - filesMatching("default.properties") { - expand jbakeVersion: inputs.properties.get("jbake.version"), - timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")), - gitHash: grgit.head().abbreviatedId - } + filesMatching("default.properties") { + expand jbakeVersion: inputs.properties.get("jbake.version"), + timestamp: () -> commitBuildAndDate.date(), + gitHash: () -> commitHash.abbreviated() + } } diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle index 5498f0920..906364a4b 100644 --- a/jbake-maven-plugin/build.gradle +++ b/jbake-maven-plugin/build.gradle @@ -29,6 +29,8 @@ publishing { } } +checkstyleMain.exclude("org/jbake/maven/HelpMojo.java") + dependencies { implementation project(":jbake-core") From 141609c72c60c2f946557e05284e81ffb1c3c870 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Fri, 21 Nov 2025 20:16:58 +0100 Subject: [PATCH 254/256] use jdk 21 for actions --- .github/workflows/build.yml | 2 +- .github/workflows/early-access.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b38bef2f6..a3b32ad0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - java-version: 11 + java-version: 21 distribution: 'temurin' - name: Setup Gradle diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index ddf6aaf6d..460dcd09c 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - java-version: 11 + java-version: 21 distribution: 'temurin' - name: Setup Gradle From 68b36bc25c1a851a1c1d30d98315a1f6f5a96b1e Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 23 Nov 2025 10:21:14 +0100 Subject: [PATCH 255/256] split write protect tests between windows and linux --- .../test/java/org/jbake/app/AssetTest.java | 95 +++++++++++-------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/jbake-core/src/test/java/org/jbake/app/AssetTest.java b/jbake-core/src/test/java/org/jbake/app/AssetTest.java index c6d28ba60..65bbe461d 100644 --- a/jbake-core/src/test/java/org/jbake/app/AssetTest.java +++ b/jbake-core/src/test/java/org/jbake/app/AssetTest.java @@ -1,6 +1,13 @@ package org.jbake.app; -import ch.qos.logback.classic.spi.LoggingEvent; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.PosixFilePermissions; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.jbake.TestUtils; @@ -10,22 +17,19 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.io.TempDir; -import java.io.File; -import java.io.FileFilter; -import java.io.IOException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.attribute.PosixFilePermissions; +import ch.qos.logback.classic.spi.LoggingEvent; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class AssetTest extends LoggingTest { +class AssetTest extends LoggingTest { public Path folder; private DefaultJBakeConfiguration config; @@ -33,7 +37,7 @@ public class AssetTest extends LoggingTest { @BeforeEach - public void setup(@TempDir Path folder) throws Exception { + void setup(@TempDir Path folder) throws Exception { fixtureDir = new File(this.getClass().getResource("/fixture").getFile()); this.folder = folder; config = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(fixtureDir); @@ -43,7 +47,7 @@ public void setup(@TempDir Path folder) throws Exception { @Test - public void testCopy() throws Exception { + void testCopy() throws Exception { Asset asset = new Asset(config); asset.copy(); File cssFile = new File(folder.toString() + File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css"); @@ -57,7 +61,7 @@ public void testCopy() throws Exception { } @Test - public void testCopySingleFile() throws Exception { + void testCopySingleFile() throws Exception { Asset asset = new Asset(config); String cssSubPath = File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css"; String contentImgPath = File.separatorChar + "blog" + File.separatorChar + "2013" + File.separatorChar @@ -79,7 +83,7 @@ public void testCopySingleFile() throws Exception { } @Test - public void shouldSkipCopyingSingleFileIfDirectory() throws IOException { + void shouldSkipCopyingSingleFileIfDirectory() throws IOException { Asset asset = new Asset(config); @@ -93,7 +97,7 @@ public void shouldSkipCopyingSingleFileIfDirectory() throws IOException { } @Test - public void shouldLogSkipCopyingSingleFileIfDirectory() throws IOException { + void shouldLogSkipCopyingSingleFileIfDirectory() throws IOException { Asset asset = new Asset(config); File emptyDir = new File(folder.toFile(),"emptyDir"); @@ -109,7 +113,7 @@ public void shouldLogSkipCopyingSingleFileIfDirectory() throws IOException { } @Test - public void testCopyCustomFolder() throws Exception { + void testCopyCustomFolder() throws Exception { config.setAssetFolder(new File(config.getSourceFolder(), "/media")); Asset asset = new Asset(config); asset.copy(); @@ -121,7 +125,7 @@ public void testCopyCustomFolder() throws Exception { } @Test - public void testCopyIgnore() throws Exception { + void testCopyIgnore() throws Exception { File assetFolder = new File(folder.toFile(), "ignoredAssets"); assetFolder.mkdirs(); FileUtils.copyDirectory(new File(this.getClass().getResource("/fixture/ignorables").getFile()), assetFolder); @@ -140,43 +144,57 @@ public void testCopyIgnore() throws Exception { } - /** - * Primary intention is to extend test cases to increase coverage. - * - * @throws Exception - */ @Test - public void testWriteProtected() throws Exception { - File assets = new File(config.getSourceFolder(), "assets"); - File css = new File(folder.toFile(),"css"); - css.mkdir(); - final File cssFile = new File(css, "bootstrap.min.css"); + @DisabledOnOs(OS.WINDOWS) + void testWriteProtectedNotWindows() throws Exception { + File assets = config.getSourceFolder().toPath().resolve("assets").toFile(); + Path css = folder.resolve("css"); + Files.createDirectory(css); + + File cssFile = css.resolve("bootstrap.min.css").toFile(); FileUtils.touch(cssFile); - css.setReadOnly(); + + Files.setPosixFilePermissions(css, PosixFilePermissions.fromString("r-xr-xr-x")); config.setAssetFolder(assets); config.setDestinationFolder(folder.toFile()); Asset asset = new Asset(config); + + asset.copy(); + + Assertions.assertFalse(asset.getErrors().isEmpty(), "At least one error during copy expected"); + } + + @Test + @EnabledOnOs(OS.WINDOWS) + void testWriteProtectedOnWindows() throws Exception { + File assets = config.getSourceFolder().toPath().resolve("assets").toFile(); + Path css = folder.resolve("css"); + Files.createDirectory(css); + + File cssFile = css.resolve("bootstrap.min.css").toFile(); + FileUtils.touch(cssFile); + + Files.setAttribute(css, "dos:readonly", true); + + config.setAssetFolder(assets); + config.setDestinationFolder(folder.toFile()); + Asset asset = new Asset(config); + asset.copy(); - cssFile.setWritable(true); Assertions.assertFalse(asset.getErrors().isEmpty(), "At least one error during copy expected"); } - /** - * Primary intention is to extend test cases to increase coverage. - * - * @throws Exception - */ @Test - public void testUnlistable() throws Exception { + void testUnlistable() throws Exception { config.setAssetFolder(new File(config.getSourceFolder(), "non-exsitent")); Asset asset = new Asset(config); asset.copy(); } @Test - public void testJBakeIgnoredFolder() { + void testJBakeIgnoredFolder() { URL assetsUrl = this.getClass().getResource("/fixture/assets"); File assets = new File(assetsUrl.getFile()); Asset asset = new Asset(config); @@ -197,7 +215,7 @@ public void testJBakeIgnoredFolder() { } @Test - public void testFooIgnoredFolder() { + void testFooIgnoredFolder() { config.setProperty(PropertyList.IGNORE_FILE.getKey(), ".fooignore"); URL assetsUrl = this.getClass().getResource("/fixture/assets"); @@ -220,7 +238,7 @@ public void testFooIgnoredFolder() { } @Test - public void testCopyAssetsFromContent() { + void testCopyAssetsFromContent() { URL contentUrl = this.getClass().getResource("/fixture/content"); File contents = new File(contentUrl.getFile()); Asset asset = new Asset(config); @@ -244,7 +262,7 @@ public void testCopyAssetsFromContent() { } @Test - public void testIsFileAsset() { + void testIsFileAsset() { File cssAsset = new File(config.getAssetFolder().getAbsolutePath() + File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css"); Assertions.assertTrue(cssAsset.exists()); File contentFile = new File(config.getContentFolder().getAbsolutePath() + File.separatorChar + "about.html"); @@ -261,7 +279,6 @@ private Integer countFiles(File path) { FileFilter filesOnly = FileFilterUtils.fileFileFilter(); FileFilter dirsOnly = FileFilterUtils.directoryFileFilter(); File[] files = path.listFiles(filesOnly); - System.out.println(files); total += files.length; for (File file : path.listFiles(dirsOnly)) { total += countFiles(file); From e5357e44b2dd92834bf87f6d821ed8d80534f6f1 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 23 Nov 2025 10:33:45 +0100 Subject: [PATCH 256/256] try to make file readable instead of folder on windows --- jbake-core/src/test/java/org/jbake/app/AssetTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbake-core/src/test/java/org/jbake/app/AssetTest.java b/jbake-core/src/test/java/org/jbake/app/AssetTest.java index 65bbe461d..69f00746a 100644 --- a/jbake-core/src/test/java/org/jbake/app/AssetTest.java +++ b/jbake-core/src/test/java/org/jbake/app/AssetTest.java @@ -175,7 +175,7 @@ void testWriteProtectedOnWindows() throws Exception { File cssFile = css.resolve("bootstrap.min.css").toFile(); FileUtils.touch(cssFile); - Files.setAttribute(css, "dos:readonly", true); + Files.setAttribute(cssFile.toPath(), "dos:readonly", true); config.setAssetFolder(assets); config.setDestinationFolder(folder.toFile());

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 literal 59536 zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^ zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~ ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u z=ASkePDZA-X8)rp%D;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5 z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5 zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59e zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!) zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl z(o?YlOI=jl(`L9^ z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d* zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP zWOeX5G;9(m@?GOG7g;e74i_|SmE?`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB z?2iK-u(DC_T1};KaUT@3nP~LEcENT^UgPvp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)na-5x1#OsVE#m*+k84Y^+UMeSAa zbrVZHU=mFwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7~-6hl;*-*}2Xz;J#a8Wn;_B5=m zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{ z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*#1!6}5K<*xDPJ{wv4& zM$17DFd~L*Te3A%yD;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0> z@x>;EzyBv>AI-~{D6l6{ST=em*U( z(r$nuXY-#CCi^8Z2#v#UXOt`dbYN1z5jzNF2 z411?w)whZrfA20;nl&C1Gi+gk<`JSm+{|*2o<< zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto& zR`c~ClHpE~4Z=uKa5S(-?M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F>k6k zz21?d+dw7b&i*>Kv5L(LH-?J%@WnqT7j#qZ9B>|Zl+=> z^U-pV@1y_ptHo4hl^cPRWewbLQ#g6XYQ@EkiP z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It z0CBpUcMA*QvsPy)#lr!lIdCi@1k4V2m!NH)%Px(vu-r(Q)HYc!p zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMiNP_o*lvx*q%_odv49Dsv$NV;6J z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB8zyvh*xhHKE``99>y#TdD z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4 z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@ zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp zOH4qlEOW4OMUc)_m)fMR_rl^pCfXc{$fQbI*E&mV77}kRF z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf! zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr# zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-PyuqGn3^M^Rz%WT{e?OI^svARX&SAdU77V(C~ zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<%z*+!*<e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4 z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!dchdkRiHbXW1FMrIIBwjsai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^# z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5ShD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@ zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&5#YbXkl`q?<*XtsqD z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-} z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;RN zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0 zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7z|=ALF5SNGkrtPG@Y~niUQV2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHpyznGG4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc? zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9ZybFY%jdnA)PeHvtBe- zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>( z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7 zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe zq!K%{e-rT5jX19`(bP23LUN4+_zh2KD~EAYzhpEO3MUG8@}uBHH@4J zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V%|; zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7 z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa z@w;^c|K3da#$TB0P3;MPlF7RuQeXT$ zS<<|C0OF(k)>fr&wOB=gP8!Qm>F41u;3esv7_0l%QHt(~+n; zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90jH@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`? zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb zpe^BChDK>sc-WLKl<6 zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re* zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK| zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#* zBP=a{)K#CwIY%p} zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!OY{eB24%xY7ml@|M7I(Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{ zv9@%7*#RI9;fv;Yii5CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0 zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^CfoY`?|#x9)-*yjv#lo&zP=uI`M?J zbzC<^3x7GfXA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_ zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W* z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L z@w67!DqVf7D%7XtXX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k= zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb zv(n3+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L65B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR z>U+KQekVGon)Yi<93(d!(yw1h3&X0N(PxN2{%vn}cnV?rYw z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpAi-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_ znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$ z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7sBDOA)$VThRCI0_+2=( zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;hg0Umh#c;hU3RhCUX=8aR>rmd` z7Orw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y( zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF& zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K| z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3 zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$I{Z^Hsj@D=E{MnnL+TbC@HEU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG zlP>XLMj2!VF^0k#ole7`-c~*~+_T5ls?x4)ah(j8vo_ zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@ z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j z1v&%a;OSKc8EIrodmIiw$lOES2hzGDcjjB`kEDfJe{r}yE6`eZL zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3 z03s0-sSlwbvgi&_R8s={6<~M^pGvBNjKOa>tWenzS8s zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+ zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2 zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_ z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE& z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{ zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3 z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_$r-2{$d~0g2oLETx9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f# zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)>gpS~1rNEh z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-pqZ1t|?cnaVOd;1(h9 z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al zvLo7Xte=C{aIt*otJD}BUq)|_pdR>{zBMT< z(^1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb- z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4` z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@ zM2NVLDxZ@GIv7*gzl1 zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U} zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl@O!Ak;(o*m!pZqe9 z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&q zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I> z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe= z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65 z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM z`Ub{+J3dMD!)mzC8b(2tZtokKW5pAwHa?NFiso~# z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3 z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4 z7ib0UOPqN40X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl})G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0 zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3 z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_ zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{ z0QQ(8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!IgDTVqt31wX#n+@!a_A0ZQkA zCJ2@M_4Gb5MfCrm5UPggeyh)8 zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgDs4swy5&8RAHZ~$)hrTF4W zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(35$ zWa07ON$`OMBOHgCmfO(9RFc<)?$x)N}Jd2A(<*Ll7+4jrRt9w zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8 z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+; zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+ zmcZ6?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50; zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?MM`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$ zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8 zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN zv98?fqqTUH8r8C7v(cx#BQ5P9W>- zmW93;eH6T`vuJ~rqtIBg%A6>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB zK_7G3!n7PL>d!kj){HQE zE8(%J%dWLh1_k%gVXTZt zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i( zZcTT@2`9(Mecptm@{3A_Y(X`w9K0EwtPq~O!16bq{7c0f7#(3wn-^)h zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7 zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH zqgcqW>Gm?6oV#AldDPKVRcEyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT zBbj@*SY;o2^_h*>R0e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot zmb)sZaly_P%BeX_9 zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}> z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e! z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-Nj$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR= z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@a? z%({Gn14b4-a|#uY^=@iiKH+k?~~wTj5K1A&hU z2^9-HTC)7zpoWK|$JXaBL6C z#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#yEFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={( zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|FAcx?r4$N z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd-(+9>G7*Nt%T zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6 zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8 ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5 z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%* zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9 zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ( zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;? zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?S|P z5|6b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0 zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S z7l(riiCwgghC=Lm5hWGf5NdGp#01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd z*6+-QXJ*&Kvk9ht0f0*rO_|FMBALen{j7T1l%=Q>gf#kma zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3 zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3< zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+Ln1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7 zcMcD$Hsjko3`-{bn)jPL6E9Ds{WskMrivsUu5apD z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90KT!JXUhYS`ZgX3jnu@Ja^seA*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S z6NE`3z!IS^$s7m}PCwQutVQ#~w+V z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_) zvE|L(L1jP@F%gOGtnlXtIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd>XI3-O?Wp z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm znsNt@Q&N{TLrmsoKFw0&_M9$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(- zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x z0$!q7iFu zZ`tryM70qBI6JWWTF9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye} zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*H9=l=D3r!GLM?UV zOxa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D zzDp3c9yEbGCY$U<8biJ_gB*`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu$$-C=*|X?R0~hu z8`J6TdgflslhrmDZq1f?GXF7*ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC z)ff9Yk?wZ}dZ-^)?cbb9Fw#EjqQ8jxF4G3=L?Ra zg_)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{ zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4 zeBs>KR)izRG1gRVL;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)CWNn9pCtBE}+`Jelk4{>S)M)`Ll=!~gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux} z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~ z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$ zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw% zGz)~?B4}u0CzOf@l^um}HZzbaIwPmb<)< zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$ zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_` zfnHQPANx z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@ zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+cU@DbR^_SXY`MC7HOsCN z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$NkI!0E;Y z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X? z6vV3*m~IBHTy*^E!<0nA(tCOJW2G4DsH7)BxLV8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-D zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}SjL=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-# zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN*zw9N+_=odt<$_H_8dbo;0=42wcAETPCVGUr~v(`Uai zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3 zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xfVqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6 zImRCr?(iyu_4W_6AWo3*vxTPUw@vPwy@E0`(>1Qi=%>5eSIrp^`` zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6 z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|ITJ}JDg@o8y>(rF9mXk5M z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j! zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(XuAYtTsYy-dz+w=$ir)VJpe!_$ z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~ z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3aPp z;o)|L6Rk569KGxFLUPx@!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1 z4=jk@7EEj`u(jy$HnzE33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5 zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|moUBAV_^f$hpaUuyQeY3da^ zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl z-OylnqOpLg}or7_VNwRg2za3VBK6FUfFX{|TD z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t zE%t!J0 zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9 z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$ zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_muEFI}U_4$phjvYgleK~`Fo`;GiC07&Hq1F<%p;9Q;tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%&p~D=K#KpfoJ@ zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXzjYaM{8$s&wEx@aVkQ6M{E2 zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7am^_F!Lz>;~{VrIO$;!#30XRhE1QqO_~#+Ux;B_D{Nk=grn z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw z*T#a=+WcTwL78exTgBn|iNE3#EsOorO z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8# z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4 z0DIL&vsJ1_s%<@y%U*-eX z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8# zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK} zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{JohU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~- zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$) z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$ z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)2r9W<> zT5L8BB^er3zxKt1v(y&OYk!^aoQisqU zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i z8lWr4g5nctBHtigX%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB>u&aUQl+7GiY2|dAEg@%Al3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3 zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI z_(gk!k+0%CG)%!WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7 z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_ z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrHFcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^% zmrkc4o6rvBI;Q8rj4*=AZacy*n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K& z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0 zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dWB7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG ztIHpY8F5xBP{mtQidqNRoz= z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$# zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G zFj6bV{`Y6)YoKgqnir2&+sl+i6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+= zYO=&t#5oSKB^pYhNdzPgH~aEGW2=ec1O#s-KG z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn< zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ| zJ5Wlj+4q~($hbtuY zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l~ zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5& znWoHlA-(z@3n0=l{E)R-p8sB9XkV zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g= zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8 zCRvMB^{GO@j=cHfmy}_pCGbP%xb{pNN>? z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0 zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jnTT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)Us)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP# zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|Uivj5u!xk0 z_^-N9r9o;(rFDt~q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL^d!r z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94 zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?w}{>8>$3236T-VMh@B zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG` zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h9sF@U20DHSB3~WMa zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR zE%B`Vi&m8f3T~&myTEK28BDWCVzfWir1I?03;pX))|kY5ClO^+bae z*7E?g=3g7EiisYOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU= zE*OY%QY58fW#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW>Z z`)>V2XC?NJT26mL^@ zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZupzM77m^=9 z&(a?-LxIq}*nvv)y?27lZ{j zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{`4 zU#kYOv{#A&gGPwT+$Ud}AXlK3K7hYzo$(fBSFjrP{QQ zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G! z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4 zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms| zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X zucyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~ z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^ zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF! z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJisifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8 z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~ zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h?Y8rS1S&-G+m$FNMP?(8N`MZP zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!by?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|) z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c zfs`aw?II0e(h=|7o&T+hq&m$; zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h) zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+K@61f}0e z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$Je1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`THd>2 zsWfU$9=p;yLyJyM^t zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2 zO?n3DEzpT+EoSV-%OdvZvNF+pDd-ZVZ&d8 zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op% z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc& zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{8r?;q3_kpZZ${?|( z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K> zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8 z6Mkf>2)WunY2eU@C-Uj-A zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK`` z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg z191aWoR^rDX#@iSq0n z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$ zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh z)lMbA69y7*5ufET>P*gXQrxsW+ zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBXQI2|g}FGJfJ+ zY-*2hB?o{TVL;Wt_ek;AP5PBqfDR4@Z->_182W z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24 z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU* zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)cEZ%vge965AS_am#DK#pjPRr-!^za8>`kksCAUj(Xr*1NW5~e zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%# zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0bD@_vGAr*NcFoMW;@r?@LUhRI zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V> zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g zJGpKk%%Sdc5xBa$Q^_I~(F97eqDO7AN3EN0u)PNBAb+n+ zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$N4yr^^o$ON8d{PQ=!O zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35va%4v>gc zEX-@h8esj=a4szW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1* znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP> zrp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{ zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx zK%p23>M&=KTCgR!Ee8c?DAO2_R?B zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw- z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8 z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*( ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEX zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_ zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm zZi-noqS!^Ftb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@ zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn` zEgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@ zK^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf z9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^&X%=?`6lCy~?`&WSWt z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRHZphp zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{eSyybt)m<=zXoA^RALYG-2t zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhRmh=)R0bg~ zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+ zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai< z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF# zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg% zbOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi zPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wB zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P;=!y-AjFrERh%8la!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2 zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJSBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-} z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU? zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R% zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=Es(9&S@K@)ZjA{lj3ea7_MBP zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5 zI7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw z`P+tft^E2B$domKT@|nNW`EHwyj>&}K;eDpe z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA zv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$ z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3 z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6< znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_ z%7SUeH6=TrXt3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9ATD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j( ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|HQ`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^ zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K! z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^vq@Q_SRl|V z#lU<~n67$mT)NvHh`%als+G-)x1`Y%4Bp*6Un5Ri9h=_Db zA-AdP!f>f0m@~>7X#uBM?diI@)Egjuz@jXKvm zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#> z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|rlC1EA<1#`iuyNO z(=;irt{_&K=i4)^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf zL#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84 z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d zbzar4Fz&RSR(-|s!Z6+za&Z zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<815<5sOHQdeax9_!PyM&;{P zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L% z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+WXyYu*y3?px*=8MAK@EA+jRX8{CG?GI-< z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*qVE*y0`7J>l2wCmW zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw z4)>7caf^Ki_KJ^Zx2JUb z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ zC(JupLfFp8y43%PMj2}T|VS@%LVp>hv4Y!RPMF?pp8U_$xCJ)S zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR& zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk zwDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){} zGr}Exom_qDO{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6 zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj zKYug($r*Q#W9`p%Bf{bi6;IY0v`pB^^qu)gbg9QHQ7 zWBj(a1YSu)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>kYJC z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8iVx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY zSmfi)F`m94zL8>#zu;8|{aBui@RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm){>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(Xekg*ix@r|ymDw*{*s0?dlVys2e)z62u1 z+k3esbJE=-P5S$&KdFp+2H7_2e=}OKDrf( z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9 z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>Kwe zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L0JV9f3g{-RK!A?vBUA}${YF(vO4)@`6f1 z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi! zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0& QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a59520664..d4081da47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle index 46abb77b6..0adbfdc3c 100644 --- a/jbake-core/build.gradle +++ b/jbake-core/build.gradle @@ -58,8 +58,9 @@ dependencies { } processResources { + inputs.property("jbake.version", project.version) filesMatching("default.properties") { - expand jbakeVersion: project.version, + expand jbakeVersion: inputs.properties.get("jbake.version"), timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")), gitHash: grgit.head().abbreviatedId } diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle index 110718421..4aeb8cc14 100644 --- a/jbake-dist/build.gradle +++ b/jbake-dist/build.gradle @@ -39,8 +39,8 @@ dependencies { } task smokeTest(type: Test, dependsOn: installDist) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' setTestClassesDirs sourceSets.smokeTest.output.classesDirs classpath = sourceSets.smokeTest.runtimeClasspath shouldRunAfter test @@ -49,7 +49,7 @@ task smokeTest(type: Test, dependsOn: installDist) { smokeTest { testLogging { events "passed", "skipped", "failed" - exceptionFormat "full" + exceptionFormat = "full" } } From 60a19c3a3f595dacf496a086bf25e5ee5af06362 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sat, 15 Nov 2025 10:10:35 +0100 Subject: [PATCH 252/256] upgrade gradle to 9.2.0 --- .../org.jbake.convention.java-common.gradle | 15 ++- gradle.properties | 5 +- gradle/application.gradle | 8 +- gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 14 +- gradlew.bat | 26 ++-- jbake-core/build.gradle | 29 ++--- jbake-maven-plugin/build.gradle | 13 -- .../java/org/jbake/maven/GenerateMojo.java | 4 +- .../main/java/org/jbake/maven/InlineMojo.java | 72 +++++------ .../main/java/org/jbake/maven/SeedMojo.java | 53 ++++---- .../main/java/org/jbake/maven/WatchMojo.java | 122 +++++++++--------- .../java/org/jbake/maven/util/DirWatcher.java | 90 ++++++------- 14 files changed, 221 insertions(+), 232 deletions(-) diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle index fae4be583..d5c5ebeff 100644 --- a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle +++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle @@ -27,13 +27,13 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion" } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } //set jvm for all Test tasks (like test and smokeTest) -tasks.withType(Test) { +tasks.withType(Test).configureEach { def args = ['-Xms512m', '-Xmx3g', '-Dorientdb.installCustomFormatter=false=false', '-Djna.nosys=true'] @@ -47,17 +47,18 @@ tasks.withType(Test) { jvmArgs = args } -task javadocJar(type: Jar) { +tasks.register("javadocJar", Jar) { archiveClassifier.set('javadoc') from javadoc } -task sourcesJar(type: Jar) { - archiveClassifier.set('sources') +tasks.register("sourcesJar", Jar) { + + it.archiveClassifier.set('sources') from sourceSets.main.allSource } -tasks.withType(AbstractArchiveTask) { +tasks.withType(AbstractArchiveTask).configureEach { preserveFileTimestamps = false reproducibleFileOrder = true } @@ -88,7 +89,7 @@ jacocoTestReport { jacocoTestReport.dependsOn test -tasks.withType(Checkstyle) { +tasks.withType(Checkstyle).configureEach { reports { xml.required.set false html.required.set true diff --git a/gradle.properties b/gradle.properties index eb10fbb1e..2a67e5ec0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,7 +40,7 @@ assertjCoreVersion = 3.27.6 mockitoVersion = 5.20.0 # build dependencies -jacocoVersion = 0.8.9 +jacocoVersion = 0.8.13 grgitVersion = 5.3.3 nexusPublishPluginVersion = 2.0.0 versionsPluginVersion = 0.53.0 @@ -54,7 +54,4 @@ mavenAnnotationsVersion = 3.15.2 sparkVersion = 2.9.4 org.gradle.caching=true -org.gradle.parallel=true -org.gradle.configureondemand = true org.gradle.vfs.watch = true - diff --git a/gradle/application.gradle b/gradle/application.gradle index 90c59c44e..4336d0983 100644 --- a/gradle/application.gradle +++ b/gradle/application.gradle @@ -16,7 +16,7 @@ def exampleRepositories = [ //create clone and Zip Task for each repository exampleRepositories.each { name, repository -> - task "clone_${name}Repository"() { + tasks.register("clone_${name}Repository") { group = "distribution" description = "Clone jbake ${name} example project repository" @@ -29,14 +29,14 @@ exampleRepositories.each { name, repository -> } } - task "${name}Zip"(type: Zip) { + tasks.register("${name}Zip", Zip) { group = "distribution" description = "Zip $name repository" archiveBaseName = name - archiveFileName = "${archiveBaseName.get()}.zip" + archiveFileName = "${archiveBaseName}.zip" - from project.tasks.getByName("clone_${name}Repository").outputs + from project.tasks.named("clone_${name}Repository").get().outputs exclude 'README.md' exclude 'LICENSE' exclude '.git' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917707c1f8861d8cb53dd15194d4248596..8bdaf60c75ab801e22807dde59e12a8735a34077 100644 GIT binary patch delta 37298 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