This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
The following commit(s) were added to refs/heads/master by this push:
new 2e1fce7 Revert "Merge pull request #16 from
apache/feature/upgrade-to-jbake-261"
2e1fce7 is described below
commit 2e1fce78e1f88e62e2d0cf662f72e2ecacf7079d
Author: Konrad Windszus <[email protected]>
AuthorDate: Sun Aug 26 13:46:24 2018 +0200
Revert "Merge pull request #16 from apache/feature/upgrade-to-jbake-261"
This reverts commit 185b5a85a4fedc6d5380c4c6145951b3f27468de, reversing
changes made to 5556baf57253b9fbf1dd589a29694cb0913b6175.
---
README.md | 6 +++---
pom.xml | 43 +++++++++++++++++++++++------------------
src/main/jbake/jbake.properties | 2 +-
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index 99e897d..f127991 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,9 @@ It's sometimes useful to ~~steal ideas~~ get inspiration from
other projects usi
* Incubator - https://github.com/apache/incubator
## JBake and other technotes
-* Currently using 2.6.1 via the `jbake-maven-plugin`, see under `/bin`, docs
at http://jbake.org/docs/2.6.1
-* That version of JBake uses [Flexmark](https://github.com/vsch/flexmark-java)
as parser for Markdown and [Pegdown
extensions](https://github.com/sirthias/pegdown)
-* The templates use the [Groovy Markup Template
Engine](http://groovy-lang.org/templating.html#_the_markuptemplateengine),
other examples are provided at
https://github.com/jbake-org/jbake-example-project-groovy-mte
+* Currently using 2.5.1 via the `jbake-maven-plugin`, see under `/bin`, docs
at http://jbake.org/docs/2.5.1
+* That version of JBake uses https://github.com/sirthias/pegdown for Markdown,
syntax info at
https://github.com/sirthias/pegdown/blob/master/src/test/resources/MarkdownTest103/Markdown%20Documentation%20-%20Syntax.md
, extensions at
http://www.decodified.com/pegdown/api/org/pegdown/Extensions.html
+* Using Groovy MarkupTemplateEngine, examples at
https://github.com/jbake-org/jbake-example-project-groovy-mte , docs for that
engine at http://groovy-lang.org/templating.html#_the_markuptemplateengine
## Useful scripts and commands
diff --git a/pom.xml b/pom.xml
index 678af93..eb28f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
<repos.list.url>https://raw.githubusercontent.com/apache/sling-aggregator/master/default.xml</repos.list.url>
<downloads.dir>${project.build.directory}/downloads</downloads.dir>
<repos.list.fullpath>${downloads.dir}/github-repositories.xml</repos.list.fullpath>
- <flexmark.version>0.32.20</flexmark.version>
</properties>
<build>
@@ -41,33 +40,39 @@
<plugin>
<groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
- <version>0.3.1</version>
+ <version>0.2.0</version>
<!-- dependencies -->
<dependencies>
- <!-- the following are only optional dependencies of jbake-core and
- therefore need to be listed explicitly here to be loaded.
- The versions should be the same as listed in jbake-core.
- Compare with
https://github.com/jbake-org/jbake-maven-plugin/issues/14.
- -->
- <!-- for parsing MD -->
+
+ <!-- optional : a jbake version -->
+ <dependency>
+ <groupId>org.jbake</groupId>
+ <artifactId>jbake-core</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <!-- for freemarker templates (.ftl) -->
<dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark</artifactId>
- <version>${flexmark.version}</version>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.25-incubating</version>
</dependency>
- <!-- for supporting MD pegdown extensions -->
+ <!-- for markdown parsing (.md) -->
<dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-profile-pegdown</artifactId>
- <version>${flexmark.version}</version>
+ <groupId>org.pegdown</groupId>
+ <artifactId>pegdown</artifactId>
+ <version>1.6.0</version>
</dependency>
- <!-- for supporting groovy templates with extension tpl -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>2.4.15</version>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>1.5.5</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.4.12</version>
+ </dependency>
</dependencies>
<executions>
diff --git a/src/main/jbake/jbake.properties b/src/main/jbake/jbake.properties
index b00d3bc..2733d0e 100644
--- a/src/main/jbake/jbake.properties
+++ b/src/main/jbake/jbake.properties
@@ -10,6 +10,7 @@ template.masterindex.file=index.tpl
template.archive.file=archive.tpl
template.tag.file=tags.tpl
template.sitemap.file=sitemap.tpl
+template.post.file=post.tpl
template.page.file=page.tpl
template.feed.file=feed.tpl
template.project.file=project.tpl
@@ -25,4 +26,3 @@
sling.lastCommitBaseUrl=https://github.com/apache/sling-site/commit/
template.encoding=UTF-8
repolist.path=./target/downloads/github-repositories.xml
sling.github.baseURL=https://github.com/apache/
-default.type=page
\ No newline at end of file
