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:46 UTC
[jspwiki] branch master updated (2ce696aeb -> 402375b9c)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from 2ce696aeb XSS vulnerability reported by Eugene Lim and Sng Jay Kai.
new f40709094 Update portable build jars
new b67f90af9 remove oudated info
new 50752e8c2 Add some colors to jenkins' console builds
new 9bc32a67c Ensure EhCache is clean on first test execution
new a5c0aacc8 Update dependencies
new 402375b9c 2.12.0-git-03
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:
ChangeLog.md | 19 +++++-
Jenkinsfile | 64 +++++++++++----------
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../apache/wiki/providers/CachingProviderTest.java | 7 +++
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34701 -> 35074 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49002 -> 49000 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3665488 -> 3674840 bytes
mvn_cheat-sheet.md | 3 +-
pom.xml | 24 ++++----
10 files changed, 72 insertions(+), 49 deletions(-)
[jspwiki] 04/06: Ensure EhCache is clean on first test execution
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 9bc32a67c81b8f9c2980e7fb92bb7d9fbe156019
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:59:58 2023 +0100
Ensure EhCache is clean on first test execution
---
.../test/java/org/apache/wiki/providers/CachingProviderTest.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
index 227539658..3ef6aabae 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
@@ -19,6 +19,7 @@
package org.apache.wiki.providers;
+import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.cache.CachingManager;
@@ -27,6 +28,7 @@ import org.apache.wiki.util.FileUtil;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -39,6 +41,11 @@ class CachingProviderTest {
TestEngine engine;
+ @BeforeAll
+ static void ensureEhCacheFreshStart() {
+ CacheManager.getInstance().shutdown();
+ }
+
@AfterEach
void tearDown() {
engine.stop();
[jspwiki] 01/06: Update portable build jars
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit f407090942aa7a68b51aa382ef81d42af03ac1b5
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:58:31 2023 +0100
Update portable build jars
---
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34701 -> 35074 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49002 -> 49000 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3665488 -> 3674840 bytes
4 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
index 0a9a284c0..14ddf6bff 100644
--- a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
+++ b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
-<string>2.11.0</string>
+<string>2.12.0</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSignature</key>
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index af85ac7f8..6b6d990ee 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index e39305ee0..5fc2236ca 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index 980d953dc..8eda83933 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
[jspwiki] 03/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 master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 50752e8c2e99808a312e00aa622e69b59543a6fb
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:59:06 2023 +0100
Add some colors to jenkins' console builds
---
Jenkinsfile | 64 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 33 insertions(+), 31 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b7c76a1e1..edf10f6f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,43 +24,45 @@ buildJdk19 = 'jdk_19_latest'
buildMvn = 'maven_3_latest'
errMsg = ''
-try {
+ansiColor( 'xterm' ) {
+ try {
- stage( "build source" ) {
- parallel jdk11Build: {
- buildAndSonarWith( buildJdk11 )
- },
- jdk17Build: {
- buildWith( buildJdk17 )
- },
- jdk19Build: {
- // don't fail build if jdk-19 build doesn't succeed
- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
- buildWith( buildJdk19 )
+ stage( 'build source' ) {
+ parallel jdk11Build: {
+ buildAndSonarWith( buildJdk11 )
+ },
+ jdk17Build: {
+ buildWith( buildJdk17 )
+ },
+ jdk19Build: {
+ // don't fail build if jdk-19 build doesn't succeed
+ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+ buildWith( buildJdk19 )
+ }
}
}
- }
- if( env.BRANCH_NAME == 'master' ) {
- build wait: false, job: 'JSPWiki/site', parameters: [ text( name: 'version', value: 'master' ) ]
- }
+ if( env.BRANCH_NAME == 'master' ) {
+ build wait: false, job: 'JSPWiki/site', parameters: [ text( name: 'version', value: 'master' ) ]
+ }
- 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'
- }
- if( env.BRANCH_NAME == 'master' ) {
- 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}"
+ } catch( Exception err ) {
+ currentBuild.result = 'FAILURE'
+ echo err.message
+ errMsg = '- ' + err.message
+ } finally {
+ node( 'ubuntu' ) {
+ if( currentBuild.result == null ) {
+ currentBuild.result = 'ABORTED'
+ }
+ if( env.BRANCH_NAME == 'master' ) {
+ 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}"
+ }
}
}
}
[jspwiki] 02/06: remove oudated info
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit b67f90af9d36d55dd62c7f853fd534bd5719485b
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 12:58:50 2023 +0100
remove oudated info
---
mvn_cheat-sheet.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mvn_cheat-sheet.md b/mvn_cheat-sheet.md
index 4b9928bcf..d4693a12a 100644
--- a/mvn_cheat-sheet.md
+++ b/mvn_cheat-sheet.md
@@ -52,6 +52,5 @@ under the License.
|---------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
| mvn apache-rat:check | creates an Apache RAT report. See: http://creadur.apache.org/rat/apache-rat-plugin/plugin-info.html |
| mvn cobertura:cobertura | generates a cobertura maven report. See: http://mojo.codehaus.org/cobertura-maven-plugin/usage.html |
-| mvn javadoc:javadoc | creates javadocs adding some UML class/package level diagrams (requires JDK<= 8) |
-| mvn javadoc:javadoc -Djdk.javadoc.doclet.version=2.0.18 | same as above, but with JDK >= 9 |
+| mvn javadoc:javadoc | creates javadocs adding some UML class/package level diagrams |
| mvn sonar:sonar | generates a Sonar report. Expects a Sonar server running at http://localhost:9000/ |
[jspwiki] 05/06: Update dependencies
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit a5c0aacc8dd77fde2612285f4373da00d1ae4352
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 13:03:32 2023 +0100
Update dependencies
* Apache parent to 29
* javadoc doclet to 2.1.0
* lucene to 9.4.2
* mockito to 4.11.0
* selenide to 6.11.0
* tika to 2.6.0
* tomcat to 9.0.70
* maven plugins: m-dependency-p to 3.4.0, m-install-p to 3.1.0, m-release-p to 3.0.0-M7
---
pom.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 57f82d8ca..33e49fcea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version>
+ <version>29</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
@@ -34,14 +34,14 @@
<description>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard JEE components (Java, servlets, JSP).</description>
<inceptionYear>2001</inceptionYear>
- <url>http://jspwiki.apache.org/</url>
+ <url>https://jspwiki.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2022-07-30T11:42:48Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases -->
<jdk.version>11</jdk.version>
- <jdk.javadoc.doclet.version>2.0.19</jdk.javadoc.doclet.version>
+ <jdk.javadoc.doclet.version>2.1.0</jdk.javadoc.doclet.version>
<maven.version>3.5</maven.version>
<akismet-java.version>1.02</akismet-java.version>
@@ -54,7 +54,7 @@
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.10.0</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
- <flexmark.version>0.64.0</flexmark.version> <!-- 0.64.0 and above require JDK >= 11 to execute -->
+ <flexmark.version>0.64.0</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
<gson.version>2.9.1</gson.version>
<hsqldb.version>2.7.0</hsqldb.version>
@@ -69,16 +69,16 @@
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.9.1</junit.version>
<log4j2.version>2.19.0</log4j2.version>
- <lucene.version>9.4.0</lucene.version>
- <mockito.version>4.8.1</mockito.version>
+ <lucene.version>9.4.2</lucene.version>
+ <mockito.version>4.11.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
- <selenide.version>6.9.0</selenide.version>
+ <selenide.version>6.11.0</selenide.version>
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
- <tika.version>2.5.0</tika.version>
- <tomcat.version>9.0.68</tomcat.version>
+ <tika.version>2.6.0</tika.version>
+ <tomcat.version>9.0.70</tomcat.version>
<wro4j.version>1.10.1</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
@@ -86,14 +86,14 @@
<plugin.assembly.version>3.4.2</plugin.assembly.version>
<plugin.clean.version>3.2.0</plugin.clean.version>
<plugin.compiler.version>3.10.1</plugin.compiler.version>
- <plugin.dependency.version>3.3.0</plugin.dependency.version>
+ <plugin.dependency.version>3.4.0</plugin.dependency.version>
<plugin.enforcer.version>3.1.0</plugin.enforcer.version>
- <plugin.install.version>3.0.1</plugin.install.version>
+ <plugin.install.version>3.1.0</plugin.install.version>
<plugin.jar.version>3.3.0</plugin.jar.version>
<plugin.javadoc.version>3.4.1</plugin.javadoc.version>
<plugin.jxr.version>3.3.0</plugin.jxr.version>
<plugin.project-info-reports.version>3.4.1</plugin.project-info-reports.version>
- <plugin.release.version>3.0.0-M6</plugin.release.version>
+ <plugin.release.version>3.0.0-M7</plugin.release.version>
<plugin.remote-resources.version>3.0.0</plugin.remote-resources.version>
<plugin.resources.version>3.3.0</plugin.resources.version>
<plugin.source.version>3.2.1</plugin.source.version>
[jspwiki] 06/06: 2.12.0-git-03
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 402375b9cc0a5bddac483a557e2d7253d0fc1b5d
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Jan 4 13:18:37 2023 +0100
2.12.0-git-03
---
ChangeLog.md | 19 +++++++++++++++++--
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 1030671f9..f9aa509d9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,14 +17,29 @@ specific language governing permissions and limitations
under the License.
-->
+**2023-01-04 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.0-git-03_
+
+* Fix flaky caching test, add some colouring to Jenkins console builds
+
+* Dependency updates
+ * Apache parent to 29
+ * Javadoc umldoclet to 2.1.0
+ * Lucene to 9.4.2
+ * Mockito to 4.11.0
+ * Selenide to 6.11.0
+ * Tika to 2.6.0
+ * Tomcat to 9.0.70
+ * Maven plugins: dependency to 3.4.0, install to 3.1.0, release to 3.0.0-M7
+
**2022-11-24 Dirk Frederickx (brushed AT apache DOT org)**
* _2.12.0-git-02_
-* Fixing a number of XSS vulnerabilities reported by Eugene Lim and Sng Jay Kai.
+* Fixing a number of XSS vulnerabilities reported by Eugene Lim and Sng Jay Kai, from Government Technology Agency of Singapore.
(sanitizing various plugin parameters)
-
**2022-10-19 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.0-git-01_
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 16fea414c..8ce311909 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "02";
+ public static final String BUILD = "03";
/**
* This is the generic version string you should use when printing out the version. It is of