You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/12/22 11:45:24 UTC
[jspwiki-site] branch jbake updated (7b5fe11 -> 61ed5a3)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git.
from 7b5fe11 2.11.1 release
new 6ee4d46 Move site generation to official jbake maven plugin
new c1f3a4b fix log4j's cve link
new acb9e19 update jspwiki version displayed on footer
new 61ed5a3 fix remaining https://whimsy.apache.org/site/project/jspwiki checks
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 5 ++--
pom.xml | 28 +++++++++---------
src/main/jbake/content/index.md | 2 +-
src/main/jbake/jbake.properties | 2 +-
src/main/jbake/templates/page.ftl | 62 +++++++++++++++++++++++----------------
5 files changed, 54 insertions(+), 45 deletions(-)
[jspwiki-site] 01/04: Move site generation to official jbake maven plugin
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 6ee4d467f025bebd4b099b924272620410f50819
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Dec 22 12:23:59 2021 +0100
Move site generation to official jbake maven plugin
This allows us to leave JDK8 behind on the Jenkinsfile
---
Jenkinsfile | 5 ++---
pom.xml | 28 ++++++++++++++--------------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6ed683b..32671d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,6 @@ try {
def docsVersion
node( 'ubuntu' ) {
- def JAVA_JDK_8=tool name: 'jdk_1.8_latest', type: 'hudson.model.JDK'
def JAVA_JDK_11=tool name: 'jdk_11_latest', type: 'hudson.model.JDK'
def MAVEN_3_LATEST=tool name: 'maven_3_latest', type: 'hudson.tasks.Maven$MavenInstallation'
def version = params?.version ?: 'master'
@@ -66,9 +65,9 @@ try {
}
stage( 'build website' ) {
- echo "Will use Java $JAVA_JDK_8"
+ echo "Will use Java $JAVA_JDK_11"
echo "Will use Maven $MAVEN_3_LATEST"
- withEnv( [ "Path+JDK=$JAVA_JDK_8/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
+ withEnv( [ "Path+JDK=$JAVA_JDK_11/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
dir( jbake ) {
git branch: jbake, url: repo, credentialsId: creds, poll: true
sh "cp ../$build/ChangeLog.md ./src/main/config/changelog.md"
diff --git a/pom.xml b/pom.xml
index 40c7d65..43fbe82 100755
--- a/pom.xml
+++ b/pom.xml
@@ -42,15 +42,15 @@
<plugin.japicmp.version>0.15.4</plugin.japicmp.version>
<plugin.japicmp.jspwiki-new>2.11.2-SNAPSHOT</plugin.japicmp.jspwiki-new>
<plugin.japicmp.jspwiki-old>2.11.0</plugin.japicmp.jspwiki-old>
- <plugin.jbake>0.0.9</plugin.jbake>
+ <plugin.jbake>0.3.4</plugin.jbake>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <version.flexmark>0.62.2</version.flexmark>
<version.freemarker>2.3.31</version.freemarker>
<version.jbake-core>2.5.1</version.jbake-core>
<version.jdk>1.8</version.jdk>
<version.maven>3.5.0</version.maven>
- <version.pegdown>1.6.0</version.pegdown>
- </properties>
+ </properties>
<build>
<plugins>
@@ -65,7 +65,7 @@
</plugin>
<plugin>
- <groupId>br.com.ingenieux</groupId>
+ <groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
</plugin>
@@ -118,7 +118,7 @@
</plugin>
<plugin>
- <groupId>br.com.ingenieux</groupId>
+ <groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
<version>${plugin.jbake}</version>
<configuration>
@@ -133,19 +133,19 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${version.freemarker}</version>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark</artifactId>
+ <version>${version.flexmark}</version>
</dependency>
<dependency>
- <groupId>org.jbake</groupId>
- <artifactId>jbake-core</artifactId>
- <version>${version.jbake-core}</version>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-profile-pegdown</artifactId>
+ <version>${version.flexmark}</version>
</dependency>
<dependency>
- <groupId>org.pegdown</groupId>
- <artifactId>pegdown</artifactId>
- <version>${version.pegdown}</version>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${version.freemarker}</version>
</dependency>
</dependencies>
</plugin>
[jspwiki-site] 04/04: fix remaining https://whimsy.apache.org/site/project/jspwiki checks
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 61ed5a3f2c200ed7bdcb3eec8c3d4ec574d5db05
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Dec 22 12:44:18 2021 +0100
fix remaining https://whimsy.apache.org/site/project/jspwiki checks
align leftmenu footer with jspwiki-wiki.a.o
---
src/main/jbake/templates/page.ftl | 62 +++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/main/jbake/templates/page.ftl b/src/main/jbake/templates/page.ftl
index 29a809d..15f1262 100755
--- a/src/main/jbake/templates/page.ftl
+++ b/src/main/jbake/templates/page.ftl
@@ -242,31 +242,41 @@
<div class="leftmenufooter">
<div class="table-condensed-bordered">
- <div class="accordion">
- <div class="tab-ASF" id="section-LeftMenuFooter-ASF">
- <table class="imageplugin" style="float:right;" border="0">
- <tbody><tr><td><img src="./images/asf_logo.png" height="30px"></td></tr></tbody>
- </table>
- <table class="wikitable table-condensed table-bordered" border="1">
- <tbody>
- <tr class="odd">
- <td><a class="external" href="http://www.apache.org/">Website</a><img class="outlink" src="./images/out.png" alt=""></td>
- <td><a class="external" href="http://www.apache.org/foundation/">Foundation</a><img class="outlink" src="./images/out.png" alt=""></td>
- </tr>
- <tr>
- <td><a class="external" href="http://www.apache.org/foundation/contributing.html">Donations</a><img class="outlink" src="./images/out.png" alt=""></td>
- <td><a class="external" href="http://projects.apache.org/">Projects</a><img class="outlink" src="./images/out.png" alt=""></td>
- </tr>
- <tr class="odd">
- <td><a class="external" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a><img class="outlink" src="./images/out.png" alt=""></td>
- <td><a class="external" href="http://people.apache.org/">People</a><img class="outlink" src="./images/out.png" alt=""></td>
- </tr>
- <tr>
- <td><a class="external" href="http://www.apache.org/foundation/getinvolved.html">Get involved</a><img class="outlink" src="./images/out.png" alt=""></td>
- <td><a class="external" href="http://www.apache.org/foundation/thanks.html">Thanks</a><img class="outlink" src="./images/out.png" alt=""></td>
- </tr>
- </tbody>
- </table>
+ <div class="accordion panel-group">
+ <div class="panel panel-default">
+ <div id="kxhdiog7" class="panel-heading active">ASF
+ <table class="imageplugin" style="float:right;" border="0">
+ <tbody><tr><td><img src="./images/asf_logo.png" alt="Apache Logo" height="30px"></td></tr></tbody>
+ </table>
+ </div>
+ <div style="padding-top: 0px; border-top: medium none; padding-bottom: 0px; border-bottom: medium none; overflow: hidden; opacity: 1; height: auto;" class="active">
+ <div class="tab-ASF panel-body" data-pane="ASF <table class="imageplugin" style="float:right;" border="0"><tbody><tr><td><img src="/attach/CopyrightNotice/Apache_Logo.png" alt="Apache Logo" height="30px"></td></tr></tbody></table>" id="section-LeftMenuFooter-ASFTableBorder0ClassImagepluginStyleFloatRightTrTdImgSrcAttachCopyrightNoticeApache_Logo.pngHeight30pxAltApacheLogoTdTrTable">
+ <table class="wikitable table-condensed table-bordered" border="1">
+ <tbody>
+ <tr class="odd">
+ <td><a class="external" href="http://www.apache.org/">Apache</a><img class="outlink" src="./images/out.png" alt=""></td>
+ <td><a class="external" href="http://www.apache.org/foundation/">Foundation</a><img class="outlink" src="./images/out.png" alt=""></td>
+ </tr>
+ <tr>
+ <td><a class="external" href="http://www.apache.org/foundation/contributing.html">Donations</a><img class="outlink" src="./images/out.png" alt=""></td>
+ <td><a class="external" href="http://projects.apache.org/">Projects</a><img class="outlink" src="./images/out.png" alt=""></td>
+ </tr>
+ <tr class="odd">
+ <td><a class="external" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a><img class="outlink" src="./images/out.png" alt=""></td>
+ <td><a class="external" href="http://people.apache.org/">People</a><img class="outlink" src="./images/out.png" alt=""></td>
+ </tr>
+ <tr>
+ <td><a class="external" href="http://www.apache.org/foundation/getinvolved.html">Get involved</a><img class="outlink" src="./images/out.png" alt=""></td>
+ <td><a class="external" href="http://www.apache.org/foundation/thanks.html">Thanks</a><img class="outlink" src="./images/out.png" alt=""></td>
+ </tr>
+ <tr class="odd">
+ <td><a class="external" href="http://www.apache.org/events/current-event.html">Events</a><img class="outlink" src="./images/out.png" alt=""></td>
+ <td> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -288,7 +298,7 @@
}
</style>
<div class="feather">
- Copyright © 2020 The Apache Software Foundation, <br>
+ Copyright © 2021 The Apache Software Foundation, <br>
Licensed under the <a class="external" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><img class="outlink" src="./images/out.png" alt="">.<br>
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br> <br>
</div>
[jspwiki-site] 03/04: update jspwiki version displayed on footer
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit acb9e196aed7c1715771c8d4a6123ddd7e674667
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Dec 22 12:25:12 2021 +0100
update jspwiki version displayed on footer
---
src/main/jbake/jbake.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/jbake/jbake.properties b/src/main/jbake/jbake.properties
index d49cf5a..8544d9a 100755
--- a/src/main/jbake/jbake.properties
+++ b/src/main/jbake/jbake.properties
@@ -1,7 +1,7 @@
#site.host=http://localhost:8080
site.host=https://jspwiki.apache.org
wiki.site.host=https://jspwiki-wiki.apache.org
-jspwiki.version=2.11.0-M7
+jspwiki.version=2.11.1
render.index=false
render.archive=false
render.feed=false
[jspwiki-site] 02/04: fix log4j's cve link
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit c1f3a4b800e4ce34224b0d3acafdebf23cd5f462
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Dec 22 12:24:37 2021 +0100
fix log4j's cve link
---
src/main/jbake/content/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md
index 6a23557..2922e6f 100755
--- a/src/main/jbake/content/index.md
+++ b/src/main/jbake/content/index.md
@@ -62,4 +62,4 @@ JSPWiki is open-source software that is released under the Apache Public License
[Apache JSPWiki 2.11.0.M6 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-NewInJSPWiki2.11.0.M6ReleasedOn17122019
[CVE-2021-40369]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2021-40369
[CVE-2021-44140]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2021-44140
-[Apache Log4J's CVE-2021-44228][]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Log4J-CVE-2021-44228
+[Apache Log4J's CVE-2021-44228]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Log4J-CVE-2021-44228