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 2023/01/04 12:33:29 UTC
[jspwiki-site] branch jbake updated (8100724d32 -> 37b7defb8f)
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 8100724d32 Update plugins
new 8c5eca1af8 increase dependencies, require jdk-11 to build site
new a3ef65388b copyright 2023
new e47ab93d06 JSPWiki version set to 2.12.0
new bf467b2dec Add some colors to jenkins' console builds
new 3af8131e16 Note markdown support next to JSPWiki syntax markup
new 37b7defb8f update parent to 29
The 6 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 | 146 +++++++++++++++++++-------------------
pom.xml | 11 ++-
src/main/jbake/content/index.md | 2 +-
src/main/jbake/jbake.properties | 2 +-
src/main/jbake/templates/page.ftl | 2 +-
5 files changed, 82 insertions(+), 81 deletions(-)
[jspwiki-site] 01/06: increase dependencies, require jdk-11 to build site
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 8c5eca1af825f9ed6cafca46758e80abd97329db
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:55:06 2023 +0100
increase dependencies, require jdk-11 to build site
---
pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce96a69374..cc1aec3fa2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,15 @@
<jbake.dest>${project.build.directory}/content</jbake.dest>
<plugin.enforcer>3.1.0</plugin.enforcer>
<plugin.resources>3.3.0</plugin.resources>
- <plugin.japicmp.version>0.15.7</plugin.japicmp.version>
- <plugin.japicmp.jspwiki-new>2.11.4-SNAPSHOT</plugin.japicmp.jspwiki-new>
+ <plugin.japicmp.version>0.17.1</plugin.japicmp.version>
+ <plugin.japicmp.jspwiki-new>2.12.0-SNAPSHOT</plugin.japicmp.jspwiki-new>
<plugin.japicmp.jspwiki-old>2.11.0</plugin.japicmp.jspwiki-old>
<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.flexmark>0.64.0</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.jdk>11</version.jdk>
<version.maven>3.5.0</version.maven>
</properties>
[jspwiki-site] 06/06: update parent to 29
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 37b7defb8f6f2dd9632ddf5a30a15836261b6a19
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 13:32:57 2023 +0100
update parent to 29
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cc1aec3fa2..73e1998ffe 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>29</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
[jspwiki-site] 02/06: copyright 2023
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 a3ef65388bfb18e53bc592ad061822cdfdbdd665
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:55:25 2023 +0100
copyright 2023
---
src/main/jbake/templates/page.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/jbake/templates/page.ftl b/src/main/jbake/templates/page.ftl
index 51a7c8338a..b15278befe 100755
--- a/src/main/jbake/templates/page.ftl
+++ b/src/main/jbake/templates/page.ftl
@@ -298,7 +298,7 @@
}
</style>
<div class="feather">
- Copyright © 2022 The Apache Software Foundation, <br>
+ Copyright © 2023 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] 04/06: Add some colors to jenkins' console builds
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 bf467b2dec6ea4dab0597e25c834b793f89a8bdd
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:56:35 2023 +0100
Add some colors to jenkins' console builds
---
Jenkinsfile | 146 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 74 insertions(+), 72 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 669a4599ae..e9bce0711f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,95 +25,97 @@ build = 'build'
jbake = 'jbake'
errMsg = ''
-try {
+ansiColor( 'xterm' ) {
+ try {
- def pom
- def docsVersion
+ def pom
+ def docsVersion
- node( 'ubuntu' ) {
- 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'
+ node( 'ubuntu' ) {
+ 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'
- stage( 'clean workspace' ) {
- cleanWs()
- }
+ stage( 'clean workspace' ) {
+ cleanWs()
+ }
- stage( 'generate apidocs & translations' ) {
- echo "Will use Java $JAVA_JDK_11"
- echo "Will use Maven $MAVEN_3_LATEST"
- def gitVersion = version != 'master' ? "refs/tags/$version" : '*/master'
+ stage( 'generate apidocs & translations' ) {
+ echo "Will use Java $JAVA_JDK_11"
+ echo "Will use Maven $MAVEN_3_LATEST"
+ def gitVersion = version != 'master' ? "refs/tags/$version" : '*/master'
- dir( build ) {
- checkout( [
- scm: [
- $class: 'GitSCM',
- branches: [[ name: gitVersion ]],
- extensions: [[$class: 'CloneOption', shallow: false, depth: 0, reference: '' ]],
- userRemoteConfigs: [[url: buildRepo ]]
- ]
- ] )
- pom = readMavenPom file: 'pom.xml'
- docsVersion = version != 'master' ? version : pom.version
- writeFile file: 'target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
- writeFile file: 'jspwiki-it-tests/target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
- withEnv( [ "Path+JDK=$JAVA_JDK_11/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
- sh 'mvn package javadoc:aggregate-no-fork -DskipTests -pl !jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15 -T 1C'
- sh 'java -cp jspwiki-main/target/classes org.apache.wiki.TranslationsCheck site'
+ dir( build ) {
+ checkout( [
+ scm: [
+ $class: 'GitSCM',
+ branches: [[ name: gitVersion ]],
+ extensions: [[$class: 'CloneOption', shallow: false, depth: 0, reference: '' ]],
+ userRemoteConfigs: [[url: buildRepo ]]
+ ]
+ ] )
+ pom = readMavenPom file: 'pom.xml'
+ docsVersion = version != 'master' ? version : pom.version
+ writeFile file: 'target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
+ writeFile file: 'jspwiki-it-tests/target/classes/apidocs.txt', text: 'file created in order to allow aggregated javadoc generation, target/classes is needed for all modules'
+ withEnv( [ "Path+JDK=$JAVA_JDK_11/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
+ sh 'mvn package javadoc:aggregate-no-fork -DskipTests -pl !jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15 -T 1C'
+ sh 'java -cp jspwiki-main/target/classes org.apache.wiki.TranslationsCheck site'
+ }
}
}
- }
- stage( 'build website' ) {
- echo "Will use Java $JAVA_JDK_11"
- echo "Will use Maven $MAVEN_3_LATEST"
- 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"
- sh "cp ../$build/i18n-table.txt ./src/main/config/i18n-table.md"
- sh "cat ./src/main/config/changelog-header.txt ./src/main/config/changelog.md > ./src/main/jbake/content/development/changelog.md"
- sh "cat ./src/main/config/i18n-header.txt ./src/main/config/i18n-table.md > ./src/main/jbake/content/development/i18n.md"
- sh "mvn clean process-resources -Dplugin.japicmp.jspwiki-new=$docsVersion"
+ stage( 'build website' ) {
+ echo "Will use Java $JAVA_JDK_11"
+ echo "Will use Maven $MAVEN_3_LATEST"
+ 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"
+ sh "cp ../$build/i18n-table.txt ./src/main/config/i18n-table.md"
+ sh "cat ./src/main/config/changelog-header.txt ./src/main/config/changelog.md > ./src/main/jbake/content/development/changelog.md"
+ sh "cat ./src/main/config/i18n-header.txt ./src/main/config/i18n-table.md > ./src/main/jbake/content/development/i18n.md"
+ sh "mvn clean process-resources -Dplugin.japicmp.jspwiki-new=$docsVersion"
+ }
}
+ stash name: 'build'
}
- stash name: 'build'
}
- }
- node( 'git-websites' ) {
- stage( 'publish website' ) {
- cleanWs()
- unstash 'build'
- dir( asfsite ) {
- git branch: asfsite, url: repo, credentialsId: creds
- sh "cp -rf ../$jbake/target/content/* ./"
- sh "rm -rf ./japicmp/$docsVersion && mkdir -p ./japicmp/$docsVersion && cp -rf ../$jbake/target/japicmp/* ./japicmp/$docsVersion"
- sh "rm -rf ./apidocs/$docsVersion && mkdir -p ./apidocs/$docsVersion && cp -rf ../$build/target/site/apidocs/* ./apidocs/$docsVersion"
- timeout( 15 ) { // 15 minutes
- sh 'git add .'
- sh 'git commit -m "Automatic Site Publish by Buildbot"'
- echo "pushing to $repo"
- sh "git push origin asf-site"
+ node( 'git-websites' ) {
+ stage( 'publish website' ) {
+ cleanWs()
+ unstash 'build'
+ dir( asfsite ) {
+ git branch: asfsite, url: repo, credentialsId: creds
+ sh "cp -rf ../$jbake/target/content/* ./"
+ sh "rm -rf ./japicmp/$docsVersion && mkdir -p ./japicmp/$docsVersion && cp -rf ../$jbake/target/japicmp/* ./japicmp/$docsVersion"
+ sh "rm -rf ./apidocs/$docsVersion && mkdir -p ./apidocs/$docsVersion && cp -rf ../$build/target/site/apidocs/* ./apidocs/$docsVersion"
+ timeout( 15 ) { // 15 minutes
+ sh 'git add .'
+ sh 'git commit -m "Automatic Site Publish by Buildbot"'
+ echo "pushing to $repo"
+ sh "git push origin asf-site"
+ }
}
}
}
- }
- currentBuild.result = 'SUCCESS'
+ currentBuild.result = 'SUCCESS'
-} catch( Exception err ) {
- currentBuild.result = 'FAILURE'
- echo err.message
- errMsg = '- ' + err.message
-} finally {
- node( 'ubuntu' ) {
- if( currentBuild.result == null ) {
- currentBuild.result = 'ABORTED'
+ } catch( Exception err ) {
+ currentBuild.result = 'FAILURE'
+ echo err.message
+ errMsg = '- ' + err.message
+ } finally {
+ node( 'ubuntu' ) {
+ if( currentBuild.result == null ) {
+ currentBuild.result = 'ABORTED'
+ }
+ emailext body: "See ${env.BUILD_URL} $errMsg",
+ replyTo: 'dev@jspwiki.apache.org',
+ to: 'commits@jspwiki.apache.org',
+ subject: "[${env.JOB_NAME}] build ${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
}
- emailext body: "See ${env.BUILD_URL} $errMsg",
- replyTo: 'dev@jspwiki.apache.org',
- to: 'commits@jspwiki.apache.org',
- subject: "[${env.JOB_NAME}] build ${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
}
}
\ No newline at end of file
[jspwiki-site] 03/06: JSPWiki version set to 2.12.0
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 e47ab93d0688296460fd8d2471e15e85cb9ae516
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:55:48 2023 +0100
JSPWiki version set to 2.12.0
---
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 bb92d688a2..57be549c7a 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.3
+jspwiki.version=2.12.0
render.index=false
render.archive=false
render.feed=false
[jspwiki-site] 05/06: Note markdown support next to JSPWiki syntax markup
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 3af8131e168fb09bb3cfee7fadfde50dce4475fa
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:57:42 2023 +0100
Note markdown support next to JSPWiki syntax markup
---
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 a0b89f2fe6..2c0c800d6c 100755
--- a/src/main/jbake/content/index.md
+++ b/src/main/jbake/content/index.md
@@ -8,7 +8,7 @@ status=published
Some of its [features](https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiFeatures) include:
- * [WikiMarkup](https://jspwiki-wiki.apache.org/Wiki.jsp?page=TextFormattingRules) / Structured Text
+ * Two wiki syntaxes: [JSPWiki](https://jspwiki-wiki.apache.org/Wiki.jsp?page=TextFormattingRules) and [Markdown](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Markdown%20Support), with the capability to create and plug in new ones
* File attachments
* Templates support
* Data storage through your choice of two [WikiPage Providers][], with the capability to create and plug in new ones