(jspwiki-asf-docs) branch master updated: DRAFT for 2024-07 board report
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new f1c906c DRAFT for 2024-07 board report f1c906c is described below commit f1c906cb1b5e9bd16e71d51962a1b24f5e3ab339 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jul 10 11:52:41 2024 +0200 DRAFT for 2024-07 board report --- board-reports/2024-07.txt | 60 +++ 1 file changed, 60 insertions(+) diff --git a/board-reports/2024-07.txt b/board-reports/2024-07.txt new file mode 100644 index 000..cbed940 --- /dev/null +++ b/board-reports/2024-07.txt @@ -0,0 +1,60 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Project Status: +Current project status: Ongoing, with low activity. +Issues for the board: There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (11 years ago) +There are currently 15 committers and 9 PMC members in this project. +The Committer-to-PMC ratio is 5:3. + +Community changes, past quarter: +- Arturo Bernal was added to the PMC on 2023-06-21 +- Arturo Bernal was added as committer on 2023-06-21 + +## Project Activity: +2.12.2 was finally released on 2024/06/17 and the pending CVE fixed by this +version was also published. We got an additional vulnerability report which is +now under discussion at private@j.a.o. + +Activity this quarter has been focused on preparing the code for the release, +fixing some small issues and requests for the release. Also, we merged a +contributor's PR right after that. + +The refactor, referenced on previouse reports, to benefit from virtual threads +under JDK-21, is not complete yet and was parked to focus on the release. + +There've been some discussion to switch to JDK-17 / Jakarta 10, so next release +most probably will be 3.0.0 to reflect this change. + +## Community Health: +Work on latest master shows commits from 2 commiters, which contains among +other things the aforementioned PR from a contributor. + +No questions unanswered on MLs, although they continue to have little traffic. + +Board comment on previous report: + +``` +cdutz: +Left a comment on the private list as the project was approving jira accounts +from obvious spammers such as pharmacyusa10 Also did I read the report +correctly: There was an attack using all attack vectors known to the project +already. From the fact that they were successful I would guess that they are +known and no new ones were added, but they were not fixed, right? +``` + +Sorry I missed the e-mail with the comment, so didn't see it. Regarding the +jira accounts, as noted on list, we're truly sorry about that and we'll look +more closely next time. In fact, we've denied the last request, redirecting +to the ML, as it appeared to be another spammer. + +As for the attack vector's question, they were known and fixed vectors, so +nothing really happened, excepting having to restore pages to remove the +dirt. The attacks consisted on trying to edit pages, users, groups, etc. in +order to try XSS, SQL Injection and privilege escalation; none of them were +successful.
(jspwiki) 02/04: update portable binaries
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 a96e93453d54bb94913a5d61c253c174e4d43d90 Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Jul 7 22:35:15 2024 +0200 update portable binaries --- ChangeLog.md | 13 + .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35451 -> 35451 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49607 -> 49608 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3824921 -> 3821398 bytes 4 files changed, 13 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index b9c1ffc1d..4eff657bf 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,6 +17,19 @@ specific language governing permissions and limitations under the License. --> +**2024-07-07 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.12.3-git-01_ + +* Fix problematic `CalendarTag` <-> `WeblogPlugin` interaction +* Provided in [PR #350](https://github.com/apache/jspwiki/pull/350) by Ulf Dittmer, thanks! + +* Fix issue in CI build not findind a test-jar + +* Last minute dependencies and plugin updates +* Tomcat to 9.0.90 +* Maven plugins: clean to 3.4.0, dependency to 3.7.1, jar to 3.4.2, release to 3.1.0 (closes [PR #347](https://github.com/apache/jspwiki/pull/347), thanks to Dependabot), project-info-reports to 3.6.1 (closes [PR #352](https://github.com/apache/jspwiki/pull/352), thanks to Dependabot). surefire to 3.3.0 (closes [PR #348](https://github.com/apache/jspwiki/pull/348), thanks to Dependabot) + **2024-06-11 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.12.2-git-16_ 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 74c576ede..62b1d2441 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 c164fb17e..c289baa9e 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 2d8ccaf0c..f2be6c7b1 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
(jspwiki) 04/04: 2.12.3-git-01
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 31f539a1fdadc0401af70bb39732c110e128eaea
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun Jul 7 22:37:01 2024 +0200
2.12.3-git-01
---
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 169242050..e98d39a60 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
@@ -50,7 +50,7 @@ public final class Release {
*
* If the POSTFIX is empty, it is not added to the version string.
*/
-private static final StringPOSTFIX = "";
+private static final StringPOSTFIX = "-git-";
/** The JSPWiki major version. */
public static final intVERSION = 2;
@@ -59,7 +59,7 @@ public final class Release {
public static final intREVISION = 12;
/** The minor revision. */
-public static final intMINORREVISION = 2;
+public static final intMINORREVISION = 3;
/** The build number/identifier. This is a String as opposed to an
integer, just so that people can add other identifiers to it.
* The build number is incremented every time a committer checks in code,
and reset when a release is made.
@@ -69,7 +69,7 @@ public final class Release {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "";
+public static final String BUILD = "01";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) branch master updated (6c558f378 -> 31f539a1f)
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 6c558f378 Update CalendarTag.java new 5283a2ec4 Update Tomcat to 9.0.90 and several maven plugins new a96e93453 update portable binaries new 6235b10a6 Fix issue with CI build not findind a test-jar new 31f539a1f 2.12.3-git-01 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: ChangeLog.md | 13 + LICENSE| 2 +- jspwiki-210-test-adaptees/pom.xml | 1 + .../src/main/java/org/apache/wiki/api/Release.java | 6 +++--- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35451 -> 35451 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49607 -> 49608 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3824921 -> 3821398 bytes pom.xml| 14 +++--- 8 files changed, 25 insertions(+), 11 deletions(-)
(jspwiki) 01/04: Update Tomcat to 9.0.90 and several maven plugins
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 5283a2ec4f2f65f3c2aa7babf6f65e66d1ecdcb7 Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Jul 7 22:34:40 2024 +0200 Update Tomcat to 9.0.90 and several maven plugins closes #347 closes #348 closes #352 --- LICENSE | 2 +- pom.xml | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 528f58143..6895a5bf5 100644 --- a/LICENSE +++ b/LICENSE @@ -306,7 +306,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI RESOURCES LICENSE FILE = -Apache Tomcat 9.0.89LICENSE +Apache Tomcat 9.0.90LICENSE Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet diff --git a/pom.xml b/pom.xml index b2e74101d..28792fad4 100644 --- a/pom.xml +++ b/pom.xml @@ -78,26 +78,26 @@ 1.7.36 1.7.0-async-beta 2.9.2 -9.0.89 +9.0.90 1.8.0 2.0.1 3.1.0 3.7.1 -3.3.2 +3.4.0 3.13.0 -3.7.0 +3.7.1 3.5.0 3.1.2 -3.4.1 +3.4.2 3.7.0 3.4.0 - 3.5.0 -3.0.1 + 3.6.1 +3.1.0 3.2.0 3.3.1 3.3.1 -3.2.5 +3.3.0 1.2.1 3.4.0 1.4.3
(jspwiki) 03/04: Fix issue with CI build not findind a test-jar
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 6235b10a66dcd4f7879f6b342909a861da8a1c5a Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Jul 7 22:36:37 2024 +0200 Fix issue with CI build not findind a test-jar --- ChangeLog.md | 2 +- jspwiki-210-test-adaptees/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 4eff657bf..ac891eaf6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -24,7 +24,7 @@ under the License. * Fix problematic `CalendarTag` <-> `WeblogPlugin` interaction * Provided in [PR #350](https://github.com/apache/jspwiki/pull/350) by Ulf Dittmer, thanks! -* Fix issue in CI build not findind a test-jar +* Fix issue with CI build not findind a test-jar * Last minute dependencies and plugin updates * Tomcat to 9.0.90 diff --git a/jspwiki-210-test-adaptees/pom.xml b/jspwiki-210-test-adaptees/pom.xml index da6d97925..fdc8f90ab 100644 --- a/jspwiki-210-test-adaptees/pom.xml +++ b/jspwiki-210-test-adaptees/pom.xml @@ -91,6 +91,7 @@ package + false **/test*/** **/*Test.class
(jspwiki) branch master updated (867e9b4e0 -> 6c558f378)
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 867e9b4e0 [maven-release-plugin] prepare for next development iteration new 196767ef5 Update CalendarTag.java new 9c6e10268 Update jspwiki.tld new b677253a4 Update Sidebar.jsp new 6c558f378 Update CalendarTag.java 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: .../java/org/apache/wiki/tags/CalendarTag.java | 36 +++--- .../src/main/resources/META-INF/jspwiki.tld| 4 +++ .../src/main/webapp/templates/default/Sidebar.jsp | 4 +-- 3 files changed, 38 insertions(+), 6 deletions(-)
(jspwiki) 01/04: Update CalendarTag.java
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 196767ef5c865fce2e7e63e682a620fc44203ed4
Author: udittmer <34645700+uditt...@users.noreply.github.com>
AuthorDate: Mon Jun 24 10:04:00 2024 +0200
Update CalendarTag.java
---
.../java/org/apache/wiki/tags/CalendarTag.java | 33 --
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
index 51cda55db..49b5011ae 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
@@ -57,10 +57,12 @@ public class CalendarTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
private static final Logger LOG = LogManager.getLogger( CalendarTag.class
);
+private static final int NUM_PAGES_TO_CHECK = 5;
private SimpleDateFormat m_pageFormat;
private SimpleDateFormat m_urlFormat;
private SimpleDateFormat m_monthUrlFormat;
+private boolean m_addIndex;
private SimpleDateFormat m_dateFormat = new SimpleDateFormat( "ddMMyy" );
/**
@@ -127,6 +129,19 @@ public class CalendarTag extends WikiTagBase {
m_monthUrlFormat = new SimpleDateFormat( format );
}
+/**
+ * Sets whether or not the pageFormat contains a page index at the end.
+* This is the case for the WeblogPlugin.
+ *
+ * @param addindex Whether a page index should be appended to the
pageFormat
+ *
+ * @see org.apache.wiki.plugin.WeblogPlugin
+ */
+public void setAddindex( final boolean addIndex )
+{
+m_addIndex = addIndex;
+}
+
private String format( final String txt ) {
final Page p = m_wikiContext.getPage();
if( p != null ) {
@@ -145,8 +160,22 @@ public class CalendarTag extends WikiTagBase {
if( m_pageFormat != null ) {
final String pagename = m_pageFormat.format( day.getTime() );
-
-if( engine.getManager( PageManager.class ).wikiPageExists(
pagename ) ) {
+
+ var somePageExistsOnThisDay = false;
+ if (m_addIndex) {
+ // Look at up to 5 pages for whether the page
exists. This avoids an issue
+ // with the WeblogPlugin when the first blog
post(s) of a day gets deleted.
+ for (int pageIdx = 1; pageIdx <=
NUM_PAGES_TO_CHECK; pageIdx++) {
+ if( engine.getManager(
PageManager.class ).wikiPageExists( pagename+pageIdx ) ) {
+ somePageExistsOnThisDay = true;
+ break;
+ }
+ }
+ } else {
+ somePageExistsOnThisDay = engine.getManager(
PageManager.class ).wikiPageExists( pagename );
+ }
+
+if( somePageExistsOnThisDay ) {
if( m_urlFormat != null ) {
final String url = m_urlFormat.format( day.getTime() );
result = ""+day.get( Calendar.DATE )+"";
(jspwiki) 04/04: Update CalendarTag.java
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 6c558f378cb2789627f2e6c93053d9f311187eb8
Author: udittmer <34645700+uditt...@users.noreply.github.com>
AuthorDate: Mon Jun 24 10:15:42 2024 +0200
Update CalendarTag.java
---
.../java/org/apache/wiki/tags/CalendarTag.java | 31 +++---
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
index 49b5011ae..da96b48f4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
@@ -40,8 +40,7 @@ import java.util.Date;
* Provides a nice calendar. Responds to the following HTTP parameters:
*
* calendar.date - If this parameter exists, then the calendar
- * date is taken from the month and year. The date must be in ddMMyy
- * format.
+ * date is taken from the month and year. The date must be in ddMMyy format.
* weblog.startDate - If calendar.date parameter does not exist,
* we then check this date.
*
@@ -57,7 +56,7 @@ public class CalendarTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
private static final Logger LOG = LogManager.getLogger( CalendarTag.class
);
-private static final int NUM_PAGES_TO_CHECK = 5;
+private static final int NUM_PAGES_TO_CHECK = 3;
private SimpleDateFormat m_pageFormat;
private SimpleDateFormat m_urlFormat;
@@ -161,19 +160,19 @@ public class CalendarTag extends WikiTagBase {
if( m_pageFormat != null ) {
final String pagename = m_pageFormat.format( day.getTime() );
- var somePageExistsOnThisDay = false;
- if (m_addIndex) {
- // Look at up to 5 pages for whether the page
exists. This avoids an issue
- // with the WeblogPlugin when the first blog
post(s) of a day gets deleted.
- for (int pageIdx = 1; pageIdx <=
NUM_PAGES_TO_CHECK; pageIdx++) {
- if( engine.getManager(
PageManager.class ).wikiPageExists( pagename+pageIdx ) ) {
- somePageExistsOnThisDay = true;
- break;
- }
- }
- } else {
- somePageExistsOnThisDay = engine.getManager(
PageManager.class ).wikiPageExists( pagename );
- }
+var somePageExistsOnThisDay = false;
+if (m_addIndex) {
+// Look at up to 3 pages for whether the page exists. This
avoids an issue
+// with the WeblogPlugin when the first blog post(s) of a day
gets deleted.
+ for (int pageIdx = 1; pageIdx <= NUM_PAGES_TO_CHECK;
pageIdx++) {
+if( engine.getManager( PageManager.class
).wikiPageExists( pagename+pageIdx ) ) {
+somePageExistsOnThisDay = true;
+break;
+}
+}
+} else {
+somePageExistsOnThisDay = engine.getManager( PageManager.class
).wikiPageExists( pagename );
+}
if( somePageExistsOnThisDay ) {
if( m_urlFormat != null ) {
(jspwiki) 02/04: Update jspwiki.tld
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 9c6e10268bfeaf8a081441be237cb51e51917043 Author: udittmer <34645700+uditt...@users.noreply.github.com> AuthorDate: Mon Jun 24 10:04:46 2024 +0200 Update jspwiki.tld --- jspwiki-main/src/main/resources/META-INF/jspwiki.tld | 4 1 file changed, 4 insertions(+) diff --git a/jspwiki-main/src/main/resources/META-INF/jspwiki.tld b/jspwiki-main/src/main/resources/META-INF/jspwiki.tld index 90ae4dbfe..15e8c8480 100644 --- a/jspwiki-main/src/main/resources/META-INF/jspwiki.tld +++ b/jspwiki-main/src/main/resources/META-INF/jspwiki.tld @@ -97,6 +97,10 @@ monthurlformat true + + addindex + true +
(jspwiki) 03/04: Update Sidebar.jsp
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 b677253a460d12aa28707cac8588b5e782192b61 Author: udittmer <34645700+uditt...@users.noreply.github.com> AuthorDate: Mon Jun 24 10:05:32 2024 +0200 Update Sidebar.jsp --- jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp b/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp index b465eec36..fd79e854b 100644 --- a/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/Sidebar.jsp @@ -29,7 +29,7 @@ <%= ( String )Context.findContext( pageContext ).getPage().getAttribute( /*ATTR_ISWEBLOG*/ "weblogplugin.isweblog" ) %> - @@ -63,4 +63,4 @@ <%=Release.APPNAME%> v --%> - \ No newline at end of file +
svn commit: r69929 - /release/jspwiki/2.12.2/binaries/webapp/
Author: juanpablo Date: Sun Jun 23 19:46:41 2024 New Revision: 69929 Log: added convenience binaries left from dev/2.12.2-RC1 Added: release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-adapters-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-adapters-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-adapters-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-test-adaptees-2.12.2-tests.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-test-adaptees-2.12.2-tests.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-test-adaptees-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-210-test-adaptees-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-api-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-api-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-api-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-bootstrap-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-bootstrap-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-bootstrap-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-cache-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-cache-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-cache-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-event-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-event-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-event-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-http-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-http-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-http-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-kendra-searchprovider-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-kendra-searchprovider-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-kendra-searchprovider-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-main-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-main-2.12.2-tests.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-main-2.12.2-tests.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-main-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-main-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-markdown-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-markdown-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-markdown-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-portable-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-portable-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-selenide-tests-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-selenide-tests-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-selenide-tests-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-tika-searchprovider-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-tika-searchprovider-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-tika-searchprovider-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-util-2.12.2-javadoc.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-util-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-util-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-de-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-de-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-en-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-en-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-es-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-es-2.12.2.jar.sha512 (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-fi-2.12.2.jar (with props) release/jspwiki/2.12.2/binaries/webapp/jspwiki-wikipages-fi
(jspwiki-site) 01/02: Update depedencies, plugins and baseline for japicmp comparison
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 6958a6a6d86e46beb845212c57306736766c52a3
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun Jun 23 21:39:28 2024 +0200
Update depedencies, plugins and baseline for japicmp comparison
---
pom.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad45bbcfef..0eab389e88 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,16 +37,16 @@
${project.build.directory}/content
-3.2.1
+3.5.0
3.3.1
-0.17.1
-2.12.0-SNAPSHOT
-2.11.0
+0.21.2
+2.12.3-SNAPSHOT
+2.12.0
0.3.4
UTF-8
UTF-8
0.64.0
-2.3.32
+2.3.33
11
3.5.0
(jspwiki-site) branch jbake updated (11d8668cf2 -> a31ad47608)
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 11d8668cf2 2.12.2 release new 6958a6a6d8 Update depedencies, plugins and baseline for japicmp comparison new a31ad47608 Info for CVE-2024-27136 The 2 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: pom.xml| 10 +- src/main/jbake/content/general/news.md | 3 +++ src/main/jbake/content/index.md| 13 +++-- 3 files changed, 11 insertions(+), 15 deletions(-)
(jspwiki-site) 02/02: Info for CVE-2024-27136
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 a31ad47608d4a476ed28d247cac826ea94c02f00 Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Jun 23 21:40:16 2024 +0200 Info for CVE-2024-27136 --- src/main/jbake/content/general/news.md | 3 +++ src/main/jbake/content/index.md| 13 +++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/jbake/content/general/news.md b/src/main/jbake/content/general/news.md index a22c36425c..ee0c35bd0c 100755 --- a/src/main/jbake/content/general/news.md +++ b/src/main/jbake/content/general/news.md @@ -6,6 +6,8 @@ type=page ## Project News + * **23-Jun-2024**: Apache JSPWiki [CVE-2024-27136][] vulnerability disclosure + * **17-Jun-2024:** Official [Apache JSPWiki 2.12.2 release][] is out! * **11-Aug-2023:** Official [Apache JSPWiki 2.12.1 release][] is out! @@ -134,4 +136,5 @@ type=page [CVE-2022-24947]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-24947 [CVE-2022-24948]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-24948 [CVE-2022-46907]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-46907 +[CVE-2024-27136]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2024-27136 [Apache Log4J's CVE-2021-44228][]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Log4J-CVE-2021-44228 \ No newline at end of file diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md index 0cc1cbde82..b82fa5ad4a 100755 --- a/src/main/jbake/content/index.md +++ b/src/main/jbake/content/index.md @@ -28,6 +28,8 @@ JSPWiki is open-source software that is released under the Apache Public License ## Project status + * **23-Jun-2024**: Apache JSPWiki [CVE-2024-27136][] vulnerability disclosure + * **17-Jun-2024:** Official [Apache JSPWiki 2.12.2 release][] is out! * **11-Aug-2023:** Official [Apache JSPWiki 2.12.1 release][] is out! @@ -40,12 +42,6 @@ JSPWiki is open-source software that is released under the Apache Public License * **02-Aug-2022:** Official [Apache JSPWiki 2.11.3 release][] is out! - * **24-Feb-2022:** Apache JSPWiki [CVE-2022-24947][] and [CVE-2022-24948][] vulnerability disclosures - - * **24-Feb-2022:** Official [Apache JSPWiki 2.11.2 release][] is out! - - * **18-Dec-2021:** Official [Apache JSPWiki 2.11.1 release][] is out! - [Apache JSPWiki]: https://jspwiki.apache.org [WikiWiki]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiWiki [JEE]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JEE @@ -63,13 +59,10 @@ JSPWiki is open-source software that is released under the Apache Public License [Apache JSPWiki 2.12.1 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.12#section-NewIn2.12-NewInJSPWiki2.12.1ReleasedOn11082023 [Apache JSPWiki 2.12.0 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.12#section-NewIn2.12-NewInJSPWiki2.12.0ReleasedOn23052023 [Apache JSPWiki 2.11.3 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-NewInJSPWiki2.11.3ReleasedOn02082022 -[Apache JSPWiki 2.11.2 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-NewInJSPWiki2.11.2ReleasedOn24102022 -[Apache JSPWiki 2.11.1 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-NewInJSPWiki2.11.1ReleasedOn18122021 -[CVE-2022-24948]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-24948 -[CVE-2022-24947]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-24947 [CVE-2022-27166]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-27166 [CVE-2022-28730]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-28730 [CVE-2022-28731]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-28731 [CVE-2022-28732]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-28732 [CVE-2022-34158]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-34158 [CVE-2022-46907]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-46907 +[CVE-2024-27136]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2024-27136
(jspwiki) 02/02: 2.12.2-git-16
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 e78bd8fe689025a040cf6162f93b2461e528a93a
Author: Juan Pablo Santos Rodríguez
AuthorDate: Tue Jun 11 22:16:05 2024 +0200
2.12.2-git-16
---
ChangeLog.md | 9 +
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index a5d4f90b2..b9c1ffc1d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,15 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-06-11 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-16_
+
+* Last minute dependencies and plugin updates
+* HSQLDB to 2.7.3 (closes [PR
#344](https://github.com/apache/jspwiki/pull/344), thanks to Dependabot)
+* Lucene to 9.11.0
+* Maven plugins: dependency to 3.7.0, enforcer to 3.5.0 (closes [PR
#345](https://github.com/apache/jspwiki/pull/345), thanks to Dependabot),
javadoc to 3.7.0, jxr to 3.4.0, sonar to 4.0.0.4121 (closes [PR
#346](https://github.com/apache/jspwiki/pull/346), thanks to Dependabot)
+
**2024-05-24 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-15_
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 88b5e7cdb..ccab03163 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "15";
+public static final String BUILD = "16";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) branch master updated (e67a9b1f0 -> e78bd8fe6)
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 e67a9b1f0 Build with jdk21 instead of 19 new 640a7891a Dependencies and plugins update - closes #344, closes #345, closes #346 new e78bd8fe6 2.12.2-git-16 The 2 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 | 9 + LICENSE | 20 ++-- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- pom.xml | 12 ++-- 4 files changed, 26 insertions(+), 17 deletions(-)
(jspwiki) 01/02: Dependencies and plugins update - closes #344, closes #345, closes #346
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 640a7891afe6552a9ca9b920603c69c185a8415a
Author: Juan Pablo Santos Rodríguez
AuthorDate: Tue Jun 11 22:15:30 2024 +0200
Dependencies and plugins update - closes #344, closes #345, closes #346
---
LICENSE | 20 ++--
pom.xml | 12 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/LICENSE b/LICENSE
index e1943a6a5..528f58143 100644
--- a/LICENSE
+++ b/LICENSE
@@ -258,14 +258,14 @@ log4j-1.2-api-2.23.1.jarLICENSE
log4j-api-2.23.1.jarLICENSE
log4j-core-2.23.1.jar LICENSE
log4j-slf4j-impl-2.23.1 LICENSE
-lucene-analyzers-common-9.10.0.jar LICENSE
-lucene-backward-codecs-9.10.0.jar LICENSE
-lucene-core-9.10.0.jar LICENSE
-lucene-highlighter-9.10.0.jar LICENSE
-lucene-memory-9.10.0.jarLICENSE
-lucene-queries-9.10.0.jar LICENSE
-lucene-queryparser-9.10.0.jar LICENSE
-lucene-sandbox-9.10.0.jar LICENSE
+lucene-analyzers-common-9.11.0.jar LICENSE
+lucene-backward-codecs-9.11.0.jar LICENSE
+lucene-core-9.11.0.jar LICENSE
+lucene-highlighter-9.11.0.jar LICENSE
+lucene-memory-9.11.0.jarLICENSE
+lucene-queries-9.11.0.jar LICENSE
+lucene-queryparser-9.11.0.jar LICENSE
+lucene-sandbox-9.11.0.jar LICENSE
javax.mail-1.6.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
nekohtml-2.0.2.jar (codelibs fork) LICENSE
org.suigeneris.jrcs.diff-0.4.2 LICENSE
@@ -284,8 +284,8 @@ TEST LIBRARYLICENSE FILE
awaitility-4.2.1.jarLICENSE
commons-el-1.0.jar LICENSE
custom_rhino-0.4.3.jar
./jspwiki-war/src/main/config/doc/LICENSE.mpl
-hsqldb-2.7.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
-sqltool-2.7.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
+hsqldb-2.7.3.jar
./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
+sqltool-2.7.3.jar
./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
jamm-0.4.0.jar LICENSE
jetty-all-9.4.53.v20231009.jar LICENSE
junit-5.10.2
./jspwiki-war/src/main/config/doc/LICENSE.cpl
diff --git a/pom.xml b/pom.xml
index 631bae1b2..c77e70b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
0.4.2
5.10.2
2.23.1
-9.10.0
+9.11.0
5.12.0
2.1.2
2.0.8
@@ -86,12 +86,12 @@
3.7.1
3.3.2
3.13.0
-3.6.1
-3.4.1
+3.7.0
+3.5.0
3.1.2
3.4.1
-3.6.3
-3.3.2
+3.7.0
+3.4.0
3.5.0
3.0.1
3.2.0
@@ -108,7 +108,7 @@
2.8
2.7
2.8.0
-3.10.0.2594
+4.0.0.4121
0.1
1.0.0
${jdk.version}
(jspwiki) branch master updated: Build with jdk21 instead of 19
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
The following commit(s) were added to refs/heads/master by this push:
new e67a9b1f0 Build with jdk21 instead of 19
e67a9b1f0 is described below
commit e67a9b1f01d150add4e008375f1a79a4f8d56fa6
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun May 26 00:10:00 2024 +0200
Build with jdk21 instead of 19
---
Jenkinsfile | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0249ac7d9..ad9d0095c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@
buildRepo = 'https://github.com/apache/jspwiki'
buildJdk11 = 'jdk_11_latest'
buildJdk17 = 'jdk_17_latest'
-buildJdk19 = 'jdk_19_latest'
+buildJdk21 = 'jdk_21_latest'
buildMvn = 'maven_3_latest'
errMsg = ''
@@ -33,10 +33,10 @@ try {
jdk17Build: {
buildWith( buildJdk17 )
},
-jdk19Build: {
-// don't fail build if jdk-19 build doesn't succeed
-catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-buildWith( buildJdk19 )
+jdk21Build: {
+// don't fail build if jdk-21 build doesn't succeed
+catchError( buildResult: 'SUCCESS', stageResult: 'FAILURE' ) {
+buildWith( buildJdk21 )
}
}
}
(jspwiki) branch master updated (b9d58b7af -> 55d6a3bfc)
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 b9d58b7af fix Dockerfile build - no version bump add 55d6a3bfc Always generate test-jar No new revisions were added by this update. Summary of changes: jspwiki-main/pom.xml | 1 + 1 file changed, 1 insertion(+)
(jspwiki) branch master updated: fix Dockerfile build - no version bump
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 The following commit(s) were added to refs/heads/master by this push: new b9d58b7af fix Dockerfile build - no version bump b9d58b7af is described below commit b9d58b7af155577bde297e845fb2b01a2155d90e Author: Juan Pablo Santos Rodríguez AuthorDate: Sat May 25 15:08:10 2024 +0200 fix Dockerfile build - no version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 24db70d47..4d1b3937e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM maven:3.9-jdk-11 as package +FROM maven:3.9-eclipse-temurin-11 as package WORKDIR /tmp
(jspwiki) branch master updated: fix Dockerfile build - no version bump
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 The following commit(s) were added to refs/heads/master by this push: new 4bf69d9b2 fix Dockerfile build - no version bump 4bf69d9b2 is described below commit 4bf69d9b21b77c60b91e4d53321461be1cb323b6 Author: Juan Pablo Santos Rodríguez AuthorDate: Sat May 25 14:58:39 2024 +0200 fix Dockerfile build - no version bump --- ChangeLog.md | 2 ++ Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index b9de9e965..a5d4f90b2 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -23,6 +23,8 @@ under the License. * [JSPWIKI-1186](https://issues.apache.org/jira/browse/JSPWIKI-1186) - Windows, `Install.jsp` double escapes the `jspwiki.workDir` and nothing else +* Fix Dockerfile build, broken on 2.12.2-git-14 + * Dependency updates * Gson to 2.11.0 (closes [PR #343](https://github.com/apache/jspwiki/pull/343), thanks to Dependabot) * Mockito to 5.12.0 (closes [PR #341](https://github.com/apache/jspwiki/pull/341), thanks to Dependabot) diff --git a/Dockerfile b/Dockerfile index 361c682f3..24db70d47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM maven:3.8-jdk-11 as package +FROM maven:3.9-jdk-11 as package WORKDIR /tmp @@ -30,7 +30,7 @@ RUN set -x \ FROM tomcat:9.0 COPY --from=package /tmp/jspwiki-war/target/JSPWiki.war /tmp -COPY --from=package /tmp/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*.zip /tmp +COPY --from=package /tmp/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*-jspwiki.zip /tmp COPY docker-files/log4j2.properties /tmp COPY docker-files/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.xml @@ -71,7 +71,7 @@ RUN set -x \ && rm /tmp/JSPWiki.war \ # deploy wiki pages && cd /tmp/ \ - && unzip -q jspwiki-wikipages-en-*.zip \ + && unzip -q jspwiki-wikipages-en-*-jspwiki.zip \ && mv jspwiki-wikipages-en-*/* /var/jspwiki/pages/ \ && rm -rf jspwiki-wikipages-en-* \ # move the userdatabase.xml and groupdatabase.xml to /var/jspwiki/etc
(jspwiki) branch master updated (da7dc7dcf -> 9256c8101)
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 da7dc7dcf generate markdown wikipages even when setting -DskipTests - use -Dskip-markdown-pages-generation to skip this step new 480e900b8 JSPWIKI-1186: Windows, install.jsp double escapes the jspwiki.workDir and nothing else new f29e0baf4 Update tomcat binaries and dependencies new 9256c8101 2.12.2-git-15 The 3 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 | 11 ++ LICENSE| 6 +-- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../main/java/org/apache/wiki/ui/Installer.java| 42 +++-- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35452 -> 35451 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49607 -> 49607 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3808309 -> 3824921 bytes jspwiki-war/src/main/webapp/Install.jsp| 1 + pom.xml| 6 +-- 9 files changed, 49 insertions(+), 19 deletions(-)
(jspwiki) 03/03: 2.12.2-git-15
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 9256c810160ac9155d273f6b98c3bae079e7d70b
Author: Juan Pablo Santos Rodríguez
AuthorDate: Fri May 24 23:20:51 2024 +0200
2.12.2-git-15
---
ChangeLog.md | 11 +++
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 2d98e05d8..b9de9e965 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,17 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-05-24 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-15_
+
+* [JSPWIKI-1186](https://issues.apache.org/jira/browse/JSPWIKI-1186) -
Windows, `Install.jsp` double escapes the `jspwiki.workDir` and nothing else
+
+* Dependency updates
+* Gson to 2.11.0 (closes [PR
#343](https://github.com/apache/jspwiki/pull/343), thanks to Dependabot)
+* Mockito to 5.12.0 (closes [PR
#341](https://github.com/apache/jspwiki/pull/341), thanks to Dependabot)
+* Tomcat to 9.0.89
+
**2024-05-01 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-14_
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 794c207ad..88b5e7cdb 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "14";
+public static final String BUILD = "15";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) 01/03: JSPWIKI-1186: Windows, install.jsp double escapes the jspwiki.workDir and nothing else
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 480e900b86e3b153420016988e3667cff23622b8
Author: Juan Pablo Santos Rodríguez
AuthorDate: Fri May 24 23:18:26 2024 +0200
JSPWIKI-1186: Windows, install.jsp double escapes the jspwiki.workDir and
nothing else
---
.../main/java/org/apache/wiki/ui/Installer.java| 42 +++---
jspwiki-war/src/main/webapp/Install.jsp| 1 +
2 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
index 570d9722e..ac9b439de 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
@@ -156,10 +156,8 @@ public class Installer {
* @return the string
*/
public String getPropertiesList() {
-final String result;
final Set< String > keys = m_props.stringPropertyNames();
-result = keys.stream().map(key -> key + " = " +
m_props.getProperty(key) + "\n").collect(Collectors.joining());
-return result;
+return keys.stream().map( key -> key + " = " + m_props.getProperty(
key ) + "\n" ).collect( Collectors.joining() );
}
public String getPropertiesPath() {
@@ -183,16 +181,14 @@ public class Installer {
String nullValue = m_props.getProperty( APP_NAME, rb.getString(
"install.installer.default.appname" ) );
parseProperty( APP_NAME, nullValue );
-// Get/sanitize page directory
-nullValue = m_props.getProperty( PAGE_DIR, rb.getString(
"install.installer.default.pagedir" ) );
-parseProperty( PAGE_DIR, nullValue );
-sanitizePath( PAGE_DIR );
-
-// Get/sanitize work directory
+// Get work directory
nullValue = m_props.getProperty( WORK_DIR, TMP_DIR );
parseProperty( WORK_DIR, nullValue );
-sanitizePath( WORK_DIR );
-
+
+// Get page directory
+nullValue = m_props.getProperty( PAGE_DIR, m_props.getProperty(
WORK_DIR, TMP_DIR ) + File.separatorChar + "data" );
+parseProperty( PAGE_DIR, nullValue );
+
// Set a few more default properties, for easy setup
m_props.setProperty( STORAGE_DIR, m_props.getProperty( PAGE_DIR ) );
m_props.setProperty( PageManager.PROP_PAGEPROVIDER,
"VersioningFileProvider" );
@@ -216,11 +212,15 @@ public class Installer {
final ResourceBundle rb = ResourceBundle.getBundle(
InternationalizationManager.CORE_BUNDLE, m_session.getLocale() );
m_session.clearMessages( INSTALL_ERROR );
parseProperties();
+// sanitize pages, attachments and work directories
+sanitizePath( PAGE_DIR );
+sanitizePath( STORAGE_DIR );
+sanitizePath( WORK_DIR );
validateNotNull( PAGE_DIR, rb.getString(
"install.installer.validate.pagedir" ) );
validateNotNull( APP_NAME, rb.getString(
"install.installer.validate.appname" ) );
validateNotNull( WORK_DIR, rb.getString(
"install.installer.validate.workdir" ) );
-if ( m_session.getMessages( INSTALL_ERROR ).length == 0 ) {
+if( m_session.getMessages( INSTALL_ERROR ).length == 0 ) {
m_validated = true;
}
return m_validated;
@@ -251,6 +251,24 @@ public class Installer {
s = s.trim();
m_props.put( key, s );
}
+
+public void restoreUserValues() {
+desanitizePath( PAGE_DIR );
+desanitizePath( STORAGE_DIR );
+desanitizePath( WORK_DIR );
+}
+
+/**
+ * Simply removes sanitizations so values can be shown back to the user as
they were entered
+ *
+ * @param key the key of the property to sanitize
+ */
+private void desanitizePath( final String key ) {
+String s = m_props.getProperty( key );
+s = TextUtil.replaceString(s, "", "\\" );
+s = s.trim();
+m_props.put( key, s );
+}
private void validateNotNull( final String key, final String message ) {
final String value = m_props.getProperty( key );
diff --git a/jspwiki-war/src/main/webapp/Install.jsp
b/jspwiki-war/src/main/webapp/Install.jsp
index ee34fbeb0..0160d63a7 100644
--- a/jspwiki-war/src/main/webapp/Install.jsp
+++ b/jspwiki-war/src/main/webapp/Install.jsp
@@ -59,6 +59,7 @@ if( request.getParameter("submit") != null )
{
installer.saveProperties();
password = installer.createAdministrator();
+installer.restoreUserValues();
if ( password != null )
{
Object[] args = { Installer.ADMIN_ID, password,
Installer.ADMIN_GROUP };
(jspwiki) 02/03: Update tomcat binaries and dependencies
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 f29e0baf429ab42eec38e7dab185467e845f3a72 Author: Juan Pablo Santos Rodríguez AuthorDate: Fri May 24 23:19:08 2024 +0200 Update tomcat binaries and dependencies * Gson to 2.11.0 * Mockito to 5.12.0 * Tomcat to 9.0.89 closes #341 closes #343 --- LICENSE| 6 +++--- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35452 -> 35451 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49607 -> 49607 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3808309 -> 3824921 bytes pom.xml| 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 41eef0ced..e1943a6a5 100644 --- a/LICENSE +++ b/LICENSE @@ -240,7 +240,7 @@ flexmark-util-options-0.64.8.jar ./jspwiki-war/src/main/config/doc/LI flexmark-util-sequence-0.64.8.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark flexmark-util-visitor-0.64.8.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark freshcookies-security-0.60.jar LICENSE -gson-2.10.1 LICENSE +gson-2.11.0 LICENSE httpclient-4.5.13 LICENSE httpcore-4.4.13 LICENSE ion-java-1.0.2 LICENSE @@ -289,7 +289,7 @@ sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LI jamm-0.4.0.jar LICENSE jetty-all-9.4.53.v20231009.jar LICENSE junit-5.10.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl -mockito-core-5.11.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit +mockito-core-5.12.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit stripes-1.7.0-async.jar LICENSE yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui @@ -306,7 +306,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI RESOURCES LICENSE FILE = -Apache Tomcat 9.0.88LICENSE +Apache Tomcat 9.0.89LICENSE Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet 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 c9fdc8fe4..74c576ede 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 2823255c8..c164fb17e 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 dbca5ab98..2d8ccaf0c 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ diff --git a/pom.xml b/pom.xml index 67b79668e..631bae1b2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.10.9.2 0.64.8 0.60 -2.10.1 +2.11.0 2.7.2 0.4.0 2.0.0 @@ -70,7 +70,7 @@ 5.10.2 2.23.1 9.10.0 -5.11.0 +5.12.0 2.1.2 2.0.8 0.5 @@ -78,7 +78,7 @@ 1.7.36 1.7.0-async-beta 2.9.2 -9.0.88 +9.0.89 1.8.0 2.0.1
(jspwiki) branch master updated: generate markdown wikipages even when setting -DskipTests - use -Dskip-markdown-pages-generation to skip this step
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
The following commit(s) were added to refs/heads/master by this push:
new da7dc7dcf generate markdown wikipages even when setting -DskipTests -
use -Dskip-markdown-pages-generation to skip this step
da7dc7dcf is described below
commit da7dc7dcf13434feabd013f071c6a24eb61888d0
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed May 1 17:01:40 2024 +0200
generate markdown wikipages even when setting -DskipTests - use
-Dskip-markdown-pages-generation to skip this step
---
jspwiki-markdown/pom.xml | 5 +
1 file changed, 5 insertions(+)
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 2b19c5495..50edc57fe 100644
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -134,6 +134,10 @@
+
+false
+
+
@@ -162,6 +166,7 @@
generate-markdown-pages
test
+ ${skip-markdown-pages-generation}
WikiSyntaxConverter
(jspwiki) branch master updated: fix typo
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
The following commit(s) were added to refs/heads/master by this push:
new d29db6532 fix typo
d29db6532 is described below
commit d29db653278738e029fc833135f41cf7cc323895
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed May 1 16:20:23 2024 +0200
fix typo
---
.../src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
b/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
index 4b03548ea..88cb03d8b 100644
---
a/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
+++
b/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
@@ -56,7 +56,7 @@ public interface AttachmentProvider extends WikiProvider {
* Get attachment data.
*
* @param att The attachment
- * @return An InputStream which you contains the raw data of the object.
It's your responsibility to close it.
+ * @return An InputStream which contains the raw data of the object. It's
your responsibility to close it.
* @throws ProviderException If the attachment cannot be found
* @throws IOException If the attachment cannot be opened
*/
(jspwiki) 04/04: 2.12.2-git-14
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 93648606537ca298ba163c38e66087ea1adf34c2
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed May 1 16:05:32 2024 +0200
2.12.2-git-14
---
ChangeLog.md | 13 +
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 7e6cbad5b..2d98e05d8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,19 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-05-01 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-14_
+
+* [JSPWIKI-1190](https://issues.apache.org/jira/browse/JSPWIKI-1190) -
Changing `jspwiki.syntax=markdown` breaks all the predefined/default wiki
content
+* Markdown wikipages are now generated from default wikipages as part of
the build
+* This generation allowed to uncover and fix a small bug in
`XHtmlElementToWikiTranslator`, where an `ArrayIndexOutOfBOundsException` could
occur when translating `style` tags
+
+* Dependency updates
+* Awaitility to 4.2.1 (closes [PR
#337](https://github.com/apache/jspwiki/pull/337), thanks to Dependabot)
+* Log4J to 2.23.1 (closes [PR
#338](https://github.com/apache/jspwiki/pull/338), thanks to Dependabot)
+* Maven plugins: install to 3.1.2, cargo to 1.10.13 (closes [PR
#339](https://github.com/apache/jspwiki/pull/339), thanks to Dependabot)
+
**2024-04-27 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-13_
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 e09d1299a..794c207ad 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "13";
+public static final String BUILD = "14";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) 03/04: Update dependencies * Awaitility to 4.2.1 * Log4J to 2.23.1 * Maven plugins: install to 3.1.2, cargo to 1.10.13
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 3cefebd7a14421387c87752f803ee11ac5a59a03 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed May 1 16:03:42 2024 +0200 Update dependencies * Awaitility to 4.2.1 * Log4J to 2.23.1 * Maven plugins: install to 3.1.2, cargo to 1.10.13 closes #337 closes #338 closes #339 --- LICENSE | 10 +- pom.xml | 21 +++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index b0deb7545..41eef0ced 100644 --- a/LICENSE +++ b/LICENSE @@ -254,10 +254,10 @@ jmespath-java-1.12.565 LICENSE joda-time-2.8.1 LICENSE jstl-1.2.jarLICENSE logging-mailhandler-1.6.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl -log4j-1.2-api-2.23.0.jarLICENSE -log4j-api-2.23.0.jarLICENSE -log4j-core-2.23.0.jar LICENSE -log4j-slf4j-impl-2.23.0 LICENSE +log4j-1.2-api-2.23.1.jarLICENSE +log4j-api-2.23.1.jarLICENSE +log4j-core-2.23.1.jar LICENSE +log4j-slf4j-impl-2.23.1 LICENSE lucene-analyzers-common-9.10.0.jar LICENSE lucene-backward-codecs-9.10.0.jar LICENSE lucene-core-9.10.0.jar LICENSE @@ -281,7 +281,7 @@ xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LI TEST LIBRARYLICENSE FILE = -awaitility-4.2.0.jarLICENSE +awaitility-4.2.1.jarLICENSE commons-el-1.0.jar LICENSE custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl hsqldb-2.7.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb diff --git a/pom.xml b/pom.xml index aad5f7b0b..67b79668e 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 3.5 1.02 -4.2.0 +4.2.1 1.12.565 4.4 1.5 @@ -68,7 +68,7 @@ 9.4.54.v20240208 0.4.2 5.10.2 -2.23.0 +2.23.1 9.10.0 5.11.0 2.1.2 @@ -88,7 +88,7 @@ 3.13.0 3.6.1 3.4.1 -3.1.1 +3.1.2 3.4.1 3.6.3 3.3.2 @@ -104,7 +104,7 @@ 3.2.2 1.11 1.0.1 -1.10.11 +1.10.13 2.8 2.7 2.8.0 @@ -952,7 +952,7 @@ - build-wikipages-zip + build-wikipages-zips ../assembly/zip.xml @@ -968,12 +968,21 @@ package single - false ../assembly/zip.xml + +create-markdown-wikipages-zip +package +single + + +../assembly/zip-markdown.xml + + +
(jspwiki) branch master updated (75024462e -> 936486065)
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 75024462e fix typo
new 59ad1a530 Fix possible ArrayIndexOutOfBOundsException
new f79d41cb5 JSPWIKI-1190: generate markdown flavour of wikipages as part
of the build
new 3cefebd7a Update dependencies * Awaitility to 4.2.1 * Log4J to
2.23.1 * Maven plugins: install to 3.1.2, cargo to 1.10.13
new 936486065 2.12.2-git-14
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:
ChangeLog.md | 13 +
LICENSE| 10 +++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
jspwiki-markdown/pom.xml | 13 +
.../markdown/migration/WikiSyntaxConverter.java| 34 ++
jspwiki-wikipages/.gitignore | 1 +
.../assembly/{zip.xml => zip-markdown.xml} | 4 +--
jspwiki-wikipages/assembly/zip.xml | 6 +++-
jspwiki-wikipages/pom.xml | 15 ++
.../htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
pom.xml| 21 +
11 files changed, 99 insertions(+), 22 deletions(-)
create mode 100644 jspwiki-wikipages/.gitignore
copy jspwiki-wikipages/assembly/{zip.xml => zip-markdown.xml} (93%)
(jspwiki) 02/04: JSPWIKI-1190: generate markdown flavour of wikipages as part of the build
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 f79d41cb5b60942a365000a2a435e1c8f40ae178
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed May 1 16:03:19 2024 +0200
JSPWIKI-1190: generate markdown flavour of wikipages as part of the build
---
jspwiki-markdown/pom.xml | 13 +
.../markdown/migration/WikiSyntaxConverter.java| 34 ++
jspwiki-wikipages/.gitignore | 1 +
.../assembly/{zip.xml => zip-markdown.xml} | 4 +--
jspwiki-wikipages/assembly/zip.xml | 6 +++-
jspwiki-wikipages/pom.xml | 15 ++
6 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 359328456..2b19c5495 100644
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -154,6 +154,19 @@
+
+
+maven-surefire-plugin
+
+
+generate-markdown-pages
+test
+
+ WikiSyntaxConverter
+
+
+
+
\ No newline at end of file
diff --git
a/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
b/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
index 7e26ea68a..e42cf7b36 100644
---
a/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
+++
b/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
@@ -18,12 +18,14 @@
*/
package org.apache.wiki.markdown.migration;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.wiki.TestEngine;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.spi.Wiki;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator;
@@ -31,21 +33,41 @@ import
org.apache.wiki.markdown.migration.parser.JSPWikiToMarkdownMarkupParser;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.plugin.PluginManager;
import org.apache.wiki.render.RenderingManager;
-import org.junit.jupiter.api.Test;
+import org.jdom2.JDOMException;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import static org.apache.wiki.TestEngine.with;
-public class WikiSyntaxConverter {
+/**
+ * Class used to autogenerate the initial set of markdown files, derived
from the ones with jspwiki syntax, as part
+ * of the build,
+ * Can be used as a starting point to develop more complex converters from
jspwiki to markdown syntax f.ex, to also
+ * convert page history, retain original authors, etc.
+ */
+class WikiSyntaxConverter {
+
+@ParameterizedTest
+@ValueSource( strings = { "de", "en", "es", "fi", "fr", "it", "nl",
"pt_BR", "ru", "zh_CN" } )
+void jspwikiToMarkdownConverter( final String lang ) throws Exception {
+final File target = new File( "../jspwiki-wikipages/" + lang +
"/src/main/resources/markdown" );
+target.delete();
+translateJSPWikiToMarkdown( lang );
+Arrays.stream( ArrayUtils.nullToEmpty( target.listFiles( ( dir, name )
-> name.endsWith( ".properties" ) ), File[].class ) )
+ .forEach( file -> file.delete() );
+}
-@Test
-void jspwikiToMarkdownConverter() throws Exception {
-final Engine jspw = buildEngine( "jspwiki",
"../jspwiki-wikipages/en/src/main/resources" );
-final Engine md = buildEngine( "markdown", "./target/pages-markdown" );
+void translateJSPWikiToMarkdown( String lang ) throws JDOMException,
IOException, ReflectiveOperationException, WikiException {
+final Engine jspw = buildEngine( "jspwiki", "../jspwiki-wikipages/" +
lang + "/src/main/resources" );
+final Engine md = buildEngine( "markdown", "../jspwiki-wikipages/" +
lang + "/src/main/resources/markdown" );
jspw.getManager( PluginManager.class ).enablePlugins( false );
final Collection< Page > pages = jspw.getManager( PageManager.class
).getAllPages();
diff --git a/jspwiki-wikipages/.gitignore b/jspwiki-wikipages/.gi
(jspwiki) 01/04: Fix possible ArrayIndexOutOfBOundsException
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 59ad1a5304589770cda9b7fea5945143e068cff8
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed May 1 16:02:04 2024 +0200
Fix possible ArrayIndexOutOfBOundsException
---
.../java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
index e8feb4e5e..b096cd5d1 100644
---
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
+++
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
@@ -225,7 +225,7 @@ public class XHtmlElementToWikiTranslator {
final Map< Object, Object > m = new LinkedHashMap<>();
Arrays.stream( style.toLowerCase().split( ";" ) )
- .filter( StringUtils::isNotEmpty )
+ .filter( StringUtils::isNotBlank )
.forEach( prop -> m.put( prop.split( ":" )[ 0 ].trim(),
prop.split( ":" )[ 1 ].trim() ) );
return m;
}
(jspwiki) branch master updated: fix typo
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 The following commit(s) were added to refs/heads/master by this push: new 75024462e fix typo 75024462e is described below commit 75024462ef53fd0c3de814e665284bd59996885e Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Apr 27 17:27:32 2024 +0200 fix typo --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 90eacef23..7e6cbad5b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -26,7 +26,7 @@ under the License. * `MailUtil` now uses every `mail.smtp` / `mail.smtps` property provided through your `jspwiki[-custom].properties` file * This allows to set f.ex., `mail.smtp.ssl.protocols=TLSv1.2` or `mail.smtp.ssl.trust=your.domain.org` -* Keep in mind that, to you use `mail.smtps`, you should override to blank default `mail.smtp` properties at `jspwiki.properties` +* Keep in mind that, in order to use `mail.smtps`, you should override to blank the default `mail.smtp` properties at `jspwiki.properties` * Dependency updates * Apache parent to 32
(jspwiki) branch master updated (8c0d55e34 -> 52f050153)
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 8c0d55e34 Seems that sonarcloud.io now requires running JDK-17 for the local analysis, hopefully this completes fixing the CI build add 52f050153 Thanks to the sonarqube scanner, we now have 3 mvn builds, so let's skip running tests on deploy, as we've already passed them. No new revisions were added by this update. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(jspwiki) branch master updated: Seems that sonarcloud.io now requires running JDK-17 for the local analysis, hopefully this completes fixing the CI build
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
The following commit(s) were added to refs/heads/master by this push:
new 8c0d55e34 Seems that sonarcloud.io now requires running JDK-17 for the
local analysis, hopefully this completes fixing the CI build
8c0d55e34 is described below
commit 8c0d55e344d3f48ca7747e05fa2306a32b72800c
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Apr 27 16:36:20 2024 +0200
Seems that sonarcloud.io now requires running JDK-17 for the local
analysis, hopefully this completes fixing the CI build
---
Jenkinsfile | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 84d7ff272..889b8e3bf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -71,14 +71,19 @@ def buildSonarAndDeployIfSnapshotWith( jdk ) {
cleanWs()
git url: buildRepo, poll: true
withMaven( jdk: jdk, maven: buildMvn, publisherStrategy:
'EXPLICIT', options: [ jacocoPublisher(), junitPublisher() ] ) {
+sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent
package org.jacoco:jacoco-maven-plugin:report -T 1C"
+}
+withMaven( jdk: buildJdk17, maven: buildMvn ) {
withCredentials( [ string( credentialsId:
'sonarcloud-jspwiki', variable: 'SONAR_TOKEN' ) ] ) {
def sonarOptions = "-Dsonar.projectKey=jspwiki-builder
-Dsonar.organization=apache -Dsonar.branch.name=${env.BRANCH_NAME}
-Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN"
echo 'Will use SonarQube instance at https://sonarcloud.io'
-sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent
package org.jacoco:jacoco-maven-plugin:report sonar:sonar $sonarOptions -T 1C"
-def pom = readMavenPom( file: 'pom.xml' )
-if( pom.version.endsWith( '-SNAPSHOT' ) ) {
-sh 'mvn deploy'
-}
+sh "mvn sonar:sonar $sonarOptions"
+}
+}
+def pom = readMavenPom( file: 'pom.xml' )
+if( pom.version.endsWith( '-SNAPSHOT' ) ) {
+withMaven( jdk: jdk, maven: buildMvn ) {
+sh 'mvn deploy'
}
}
}
(jspwiki) branch master updated (b5201a55c -> cc60beeee)
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 b5201a55c try TLSv1.2 for sendMail test add cc60b Show test stdout, stderr and stacktraces on test failure/error No new revisions were added by this update. Summary of changes: pom.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
(jspwiki) branch master updated: try TLSv1.2 for sendMail test
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
The following commit(s) were added to refs/heads/master by this push:
new b5201a55c try TLSv1.2 for sendMail test
b5201a55c is described below
commit b5201a55cc51bf7309111605e32e1609997b1f1e
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Apr 27 16:06:25 2024 +0200
try TLSv1.2 for sendMail test
---
jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java | 4 ++--
jspwiki-util/src/test/resources/jspwiki-custom.properties | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
b/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
index 9a6c10806..a97c68786 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/MailUtilTest.java
@@ -92,10 +92,10 @@ class MailUtilTest {
return;
}
e.printStackTrace();
-Assertions.fail( "Unknown problem, cause=" + e.getCause() + "
(check the console for error report)" );
+Assertions.fail( "Unknown problem, cause=" + e.getCause() + "
(check the console for error report)", e );
} catch (final Exception e) {
e.printStackTrace();
-Assertions.fail( "Could not send mail: " + e.getMessage() );
+Assertions.fail( "Could not send mail: " + e.getMessage(), e );
}
}
diff --git a/jspwiki-util/src/test/resources/jspwiki-custom.properties
b/jspwiki-util/src/test/resources/jspwiki-custom.properties
index f02e61fff..14b143e2f 100644
--- a/jspwiki-util/src/test/resources/jspwiki-custom.properties
+++ b/jspwiki-util/src/test/resources/jspwiki-custom.properties
@@ -70,6 +70,7 @@ jspwiki.approver.workflow.bar=Admin
#mail.from = JSPWiki
#mail.smtp.account =
#mail.smtp.password =
+mail.smtp.ssl.protocols=TLSv1.2
# for JDBC tests
server.port=9321
(jspwiki) 03/05: Update dependencies * Apache parent to 32 * Commons Text to 1.12.0 * JavaMail to 1.6.2 * Jetty to 9.4.54.v20240208 * Tomcat to 9.0.88 * Maven plugins: jar to 3
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 4c88d8fa156fdb997b8fbf666aa81563b41f3fbf Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Apr 27 15:53:38 2024 +0200 Update dependencies * Apache parent to 32 * Commons Text to 1.12.0 * JavaMail to 1.6.2 * Jetty to 9.4.54.v20240208 * Tomcat to 9.0.88 * Maven plugins: jar to 3.4.1, cargo to 1.10.12, sonar to 3.11.0.3922 (closes #331) (closes #333) (closes #334) --- pom.xml | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ebc66d625..be99b884b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache apache -31 +32 org.apache.jspwiki @@ -52,7 +52,7 @@ 3.1 2.16.1 3.14.0 -1.11.0 +1.12.0 2.10.9.2 0.64.8 0.60 @@ -78,7 +78,7 @@ 1.7.36 1.7.0-async-beta 2.9.2 -9.0.87 +9.0.88 1.8.0 2.0.1 @@ -89,7 +89,7 @@ 3.6.1 3.4.1 3.1.1 -3.3.0 +3.4.1 3.6.3 3.3.2 3.5.0 @@ -787,6 +787,7 @@ **/src/main/webapp/templates/default/images/SilkIconSet-readme.txt **/PkgInfo jspwiki-kendra-searchprovider/src/main/resources/org/apache/wiki/search/kendra/content_types.json + **/.eslintrc **src/main/styles/haddock/bootstrap/** **src/main/styles/haddock/default/*.crunch **/src/main/webapp/templates/default/fonts/*.svg
(jspwiki) 02/05: Add missing license
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 2cc751fbdfc43cd0339b7b54cff92d2a5a78cb7d Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Apr 27 15:53:22 2024 +0200 Add missing license --- .../java/org/apache/wiki/url/UrlConstructorTest.java | 20 1 file changed, 20 insertions(+) diff --git a/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java index 1af5a9490..4d0f77a5a 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java @@ -1,3 +1,23 @@ +/* +JSPWiki - a JSP-based WikiWiki clone. + +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); fyou 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. +*/ package org.apache.wiki.url; import org.junit.jupiter.api.Assertions;
(jspwiki) 01/05: MailUtil now uses every mail.smtp / mail.smtps property provided through your jspwiki(-custom).properties file
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 8cdd18796d2a74da7e100597348b99d6055b6c99
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Apr 27 15:52:41 2024 +0200
MailUtil now uses every mail.smtp / mail.smtps property provided through
your jspwiki(-custom).properties file
---
jspwiki-main/pom.xml | 5 --
jspwiki-util/pom.xml | 13 ++-
.../main/java/org/apache/wiki/util/MailUtil.java | 98 --
.../java/org/apache/wiki/util/MailUtilTest.java| 55
pom.xml| 22 +++--
5 files changed, 95 insertions(+), 98 deletions(-)
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 669661619..1ec40cadb 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -91,11 +91,6 @@
jstl
-
- javax.mail
- mail
-
-
jaxen
jaxen
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index 19ac84435..81258ff96 100644
--- a/jspwiki-util/pom.xml
+++ b/jspwiki-util/pom.xml
@@ -31,13 +31,18 @@
- commons-io
- commons-io
+ com.sun.mail
+ logging-mailhandler
- javax.mail
- mail
+ com.sun.mail
+ javax.mail
+
+
+
+ commons-io
+ commons-io
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index 8e8ea9ac7..3c7fbb597 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -21,7 +21,12 @@ package org.apache.wiki.util;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import javax.mail.*;
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
@@ -30,7 +35,9 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.nio.charset.StandardCharsets;
import java.util.Date;
+import java.util.Objects;
import java.util.Properties;
+import java.util.Set;
/**
@@ -196,6 +203,7 @@ public final class MailUtil {
private static boolean c_useJndi = true;
private static final String PROP_MAIL_AUTH = "mail.smtp.auth";
+private static final String PROP_MAILS_AUTH = "mail.smtps.auth";
static final Logger LOG = LogManager.getLogger(MailUtil.class);
@@ -213,23 +221,32 @@ public final class MailUtil {
static final String PROP_MAIL_JNDI_NAME = "jspwiki.mail.jndiname";
+static final String MAIL_PROPS = "mail.smtp";
+
static final String PROP_MAIL_HOST = "mail.smtp.host";
+static final String PROP_MAILS_HOST = "mail.smtps.host";
static final String PROP_MAIL_PORT = "mail.smtp.port";
+static final String PROP_MAILS_PORT = "mail.smtps.port";
static final String PROP_MAIL_ACCOUNT= "mail.smtp.account";
+static final String PROP_MAILS_ACCOUNT = "mail.smtps.account";
static final String PROP_MAIL_PASSWORD = "mail.smtp.password";
+static final String PROP_MAILS_PASSWORD = "mail.smtps.password";
static final String PROP_MAIL_TIMEOUT= "mail.smtp.timeout";
+static final String PROP_MAILS_TIMEOUT = "mail.smtps.timeout";
static final String PROP_MAIL_CONNECTION_TIMEOUT =
"mail.smtp.connectiontimeout";
+static final String PROP_MAILS_CONNECTION_TIMEOUT=
"mail.smtps.connectiontimeout";
static final String PROP_MAIL_TRANSPORT = "smtp";
static final String PROP_MAIL_SENDER = "mail.from";
static final String PROP_MAIL_STARTTLS =
"mail.smtp.starttls.enable";
+static final String PROP_MAILS_STARTTLS =
"mail.smtps.starttls.enable";
private static String c_fromAddress;
@@ -267,7 +284,7 @@ public final class MailUtil {
throws AddressException, MessagingException
{
final Session session = getMailSession( props );
-getSenderEmailAddress(session, props);
+setSenderEmailAddress(session, props);
try {
// Create and address the message
@@ -294,11 +311,9 @@ public final class MailUtil {
* from the jspwiki.properties or lastly the
(jspwiki) 05/05: 2.12.2-git-13
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 d718b8225954f0b52fa08b581c0c325e713152d9
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Apr 27 15:58:05 2024 +0200
2.12.2-git-13
---
ChangeLog.md | 19 +++
LICENSE | 7 ---
.../src/main/java/org/apache/wiki/api/Release.java| 2 +-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 81bd61fe3..90eacef23 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,25 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-04-27 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-13_
+
+* [JSPWIKI-1188](https://issues.apache.org/jira/browse/JSPWIKI-1188) - Support
system property / env replacement for JSPWiki configuration properties
+* [PR #330](https://github.com/apache/jspwiki/pull/330) provided by Alex
O'Ree, thanks!
+
+* `MailUtil` now uses every `mail.smtp` / `mail.smtps` property provided
through your `jspwiki[-custom].properties` file
+* This allows to set f.ex., `mail.smtp.ssl.protocols=TLSv1.2` or
`mail.smtp.ssl.trust=your.domain.org`
+* Keep in mind that, to you use `mail.smtps`, you should override to blank
default `mail.smtp` properties at `jspwiki.properties`
+
+* Dependency updates
+* Apache parent to 32
+* Commons Text to 1.12.0
+* JavaMail to 1.6.2
+* Jetty to 9.4.54.v20240208 (closes [PR
#334](https://github.com/apache/jspwiki/pull/334), thanks to Dependabot)
+* Tomcat to 9.0.88
+* Maven plugins: jar to 3.4.1, cargo to 1.10.12 (closes [PR
#331](https://github.com/apache/jspwiki/pull/331), thanks to Dependabot), sonar
to 3.11.0.3922 (closes [PR #333](https://github.com/apache/jspwiki/pull/333),
thanks to Dependabot)
+
**2024-04-09 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-12_
diff --git a/LICENSE b/LICENSE
index aa2de99ee..b0deb7545 100644
--- a/LICENSE
+++ b/LICENSE
@@ -219,7 +219,7 @@ commons-httpclient-3.1.jar LICENSE
commons-io-2.16.1.jar LICENSE
commons-lang-3.14.0.jar LICENSE
commons-logging-1.0.4.jar LICENSE
-commons-text-1.11.0.jar LICENSE
+commons-text-1.12.0.jar LICENSE
ehcache-2.10.9.2.jarLICENSE
flexmark-0.64.8.jar
./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-attributes-0.64.8.jar
./jspwiki-war/src/main/config/doc/LICENSE.flexmark
@@ -253,6 +253,7 @@ jdom2-2.0.6.jar
./jspwiki-war/src/main/config/doc/LI
jmespath-java-1.12.565 LICENSE
joda-time-2.8.1 LICENSE
jstl-1.2.jarLICENSE
+logging-mailhandler-1.6.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
log4j-1.2-api-2.23.0.jarLICENSE
log4j-api-2.23.0.jarLICENSE
log4j-core-2.23.0.jar LICENSE
@@ -265,7 +266,7 @@ lucene-memory-9.10.0.jarLICENSE
lucene-queries-9.10.0.jar LICENSE
lucene-queryparser-9.10.0.jar LICENSE
lucene-sandbox-9.10.0.jar LICENSE
-mail-1.4.7.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
+javax.mail-1.6.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
nekohtml-2.0.2.jar (codelibs fork) LICENSE
org.suigeneris.jrcs.diff-0.4.2 LICENSE
oro-2.0.8.jar LICENSE
@@ -305,7 +306,7 @@ SlimBox
./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=
-Apache Tomcat 9.0.87LICENSE
+Apache Tomcat 9.0.88LICENSE
Font Awesome (CSS & LESS files)
./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts)
./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet
./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
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 1c6bef6af..e09d1299a 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String
(jspwiki) branch master updated (183b7a83d -> d718b8225)
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 183b7a83d Extract system property expansion to its own method new 8cdd18796 MailUtil now uses every mail.smtp / mail.smtps property provided through your jspwiki(-custom).properties file new 2cc751fbd Add missing license new 4c88d8fa1 Update dependencies * Apache parent to 32 * Commons Text to 1.12.0 * JavaMail to 1.6.2 * Jetty to 9.4.54.v20240208 * Tomcat to 9.0.88 * Maven plugins: jar to 3.4.1, cargo to 1.10.12, sonar to 3.11.0.3922 new 412091421 Update portable build binaries new d718b8225 2.12.2-git-13 The 5 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 LICENSE| 7 +- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- jspwiki-main/pom.xml | 5 -- .../org/apache/wiki/url/UrlConstructorTest.java| 20 + .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35452 -> 35452 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49609 -> 49607 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 380 -> 3808309 bytes jspwiki-util/pom.xml | 13 ++- .../main/java/org/apache/wiki/util/MailUtil.java | 98 - .../java/org/apache/wiki/util/MailUtilTest.java| 55 pom.xml| 31 --- 12 files changed, 144 insertions(+), 106 deletions(-)
(jspwiki) 04/05: Update portable build binaries
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 412091421850170998677466c5553b2550a69593 Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Apr 27 15:57:20 2024 +0200 Update portable build binaries --- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35452 -> 35452 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49609 -> 49607 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 380 -> 3808309 bytes 3 files changed, 0 insertions(+), 0 deletions(-) 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 cf04ee1ee..c9fdc8fe4 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 10ee7d850..2823255c8 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 ba3704578..dbca5ab98 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
(jspwiki) branch master updated (b5b328374 -> 183b7a83d)
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 b5b328374 2.12.2-git-12 new b553be9b9 JSPWIKI-1188 system property expansion new b10f148f1 JSPWIKI-1188 additional test coverage new 2b06d7a78 JSPWIKI-1188 rearranges the config loading to support the property replacement new 183b7a83d Extract system property expansion to its own method 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: .../java/org/apache/wiki/util/PropertyReader.java | 103 ++--- .../org/apache/wiki/util/PropertyReaderTest.java | 39 ++-- 2 files changed, 103 insertions(+), 39 deletions(-)
(jspwiki) 04/04: Extract system property expansion to its own method
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 183b7a83db39000731f63e6f95d6bbfe004a2b82
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Apr 27 15:45:37 2024 +0200
Extract system property expansion to its own method
* this ensures property load order remains as before, so we don't
unexpectedly change resolved properties for anyone
* more importantly, we also check for system env variables if the system
property isn't defined. This allows us to check for things like i.e.
* added javadocs here and there and some formatting changes along the way,
and a new assertion on the test
---
.../java/org/apache/wiki/util/PropertyReader.java | 140 -
.../org/apache/wiki/util/PropertyReaderTest.java | 56 +
2 files changed, 110 insertions(+), 86 deletions(-)
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index 03bf7cfe5..0c6ae65ca 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -41,12 +41,12 @@ import java.nio.file.Files;
* @since 2.5.x
*/
public final class PropertyReader {
-
- private static final Logger LOG = LogManager.getLogger(
PropertyReader.class );
-
+
+private static final Logger LOG = LogManager.getLogger(
PropertyReader.class );
+
/**
- * Path to the base property file, usually overridden by values provided in
- * a jspwiki-custom.properties file {@value #DEFAULT_JSPWIKI_CONFIG}
+ * Path to the base property file, {@value}, usually overridden by values
provided in
+ * a jspwiki-custom.properties file.
*/
public static final String DEFAULT_JSPWIKI_CONFIG =
"/ini/jspwiki.properties";
@@ -58,8 +58,8 @@ public final class PropertyReader {
public static final String PARAM_CUSTOMCONFIG = "jspwiki.custom.config";
/**
- * The prefix when you are cascading properties.
- *
+ * The prefix when you are cascading properties.
+ *
* @see #loadWebAppProps(ServletContext)
*/
public static final String PARAM_CUSTOMCONFIG_CASCADEPREFIX =
"jspwiki.custom.cascade.";
@@ -114,7 +114,7 @@ public final class PropertyReader {
* and so on. You have to number your cascade in a descending way starting
* with "1". This means you cannot leave out numbers in your cascade. This
* method is based on an idea by Olaf Kaus, see [JSPWiki:MultipleWikis].
- *
+ *
* @param context A Servlet Context which is used to find the properties
* @return A filled Properties object with all the cascaded properties in
place
*/
@@ -136,6 +136,15 @@ public final class PropertyReader {
// this will add additional properties to the default ones:
LOG.debug( "Loading cascading properties..." );
+// now load the cascade (new in 2.5)
+loadWebAppPropsCascade( context, props );
+
+// property expansion so we can resolve things like ${TOMCAT_HOME}
+propertyExpansion( props );
+
+// sets the JSPWiki working directory (jspwiki.workDir)
+setWorkDir( context, props );
+
// add system properties beginning with jspwiki...
final Map< String, String > sysprops = collectPropertiesFrom(
System.getProperties().entrySet().stream()
.collect( Collectors.toMap( Object::toString, Object::toString ) ) );
@@ -143,15 +152,6 @@ public final class PropertyReader {
// finally, expand the variables (new in 2.5)
expandVars( props );
-
-
-// now load the cascade (new in 2.5)
-loadWebAppPropsCascade( context, props );
-
-// sets the JSPWiki working directory (jspwiki.workDir)
-setWorkDir( context, props );
-
-
return props;
} catch( final Exception e ) {
@@ -170,24 +170,24 @@ public final class PropertyReader {
/**
* Figure out where our properties lie.
- *
+ *
* @param context servlet context
* @param propertyFile property file
- * @return inputstream holding the properties file
+ * @return InputStream holding the properties file
* @throws FileNotFoundException properties file not found
*/
- static InputStream loadCustomPropertiesFile( final ServletContext
context, final String propertyFile ) throws IOException {
+static InputStream loadCustomPropertiesFile( final ServletContext context,
final String propertyFile ) throws IOException {
final InputStream
(jspwiki) 03/04: JSPWIKI-1188 rearranges the config loading to support the property replacement
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 2b06d7a780f5a0baedd93eda495fdf214d336be1
Author: Alex O'Ree
AuthorDate: Sun Mar 31 12:58:21 2024 -0400
JSPWIKI-1188 rearranges the config loading to support the property
replacement
---
.../main/java/org/apache/wiki/util/PropertyReader.java| 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index 9bb591a61..03bf7cfe5 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -136,12 +136,6 @@ public final class PropertyReader {
// this will add additional properties to the default ones:
LOG.debug( "Loading cascading properties..." );
-// now load the cascade (new in 2.5)
-loadWebAppPropsCascade( context, props );
-
-// sets the JSPWiki working directory (jspwiki.workDir)
-setWorkDir( context, props );
-
// add system properties beginning with jspwiki...
final Map< String, String > sysprops = collectPropertiesFrom(
System.getProperties().entrySet().stream()
.collect( Collectors.toMap( Object::toString, Object::toString ) ) );
@@ -149,6 +143,15 @@ public final class PropertyReader {
// finally, expand the variables (new in 2.5)
expandVars( props );
+
+
+// now load the cascade (new in 2.5)
+loadWebAppPropsCascade( context, props );
+
+// sets the JSPWiki working directory (jspwiki.workDir)
+setWorkDir( context, props );
+
+
return props;
} catch( final Exception e ) {
(jspwiki) 01/04: JSPWIKI-1188 system property expansion
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 b553be9b9882a529133c414cc9386b32f62743a2
Author: Alex O'Ree
AuthorDate: Sat Mar 30 10:45:49 2024 -0400
JSPWIKI-1188 system property expansion
---
.../java/org/apache/wiki/util/PropertyReader.java | 22 +-
.../org/apache/wiki/util/PropertyReaderTest.java | 8
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index ac1fa9139..70daf8325 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -292,13 +292,33 @@ public final class PropertyReader {
Enumeration< ? > propertyList = properties.propertyNames();
while( propertyList.hasMoreElements() ) {
final String propertyName = ( String )propertyList.nextElement();
-final String propertyValue = properties.getProperty( propertyName
);
+String propertyValue = properties.getProperty( propertyName );
if ( propertyName.startsWith( PARAM_VAR_DECLARATION ) ) {
final String varName = propertyName.substring( 4 ).trim();
final String varValue = propertyValue.trim();
vars.put( varName, varValue );
}
+boolean subsitution=false;
+while ( propertyValue.contains( "${" ) && propertyValue.contains(
"}" ) ) {
+int start = propertyValue.indexOf( "${" );
+int end = propertyValue.indexOf( "}" );
+if ( start == -1 || end == -1 ) break;
+if ( end > start ) {
+String substring = propertyValue.substring( start, end
).replace( "${", "" ).replace( "}", "" );
+if (System.getProperty( substring ) != null ) {
+propertyValue = propertyValue.replace( "${" +
substring + "}", System.getProperty( substring ) );
+subsitution = true;
+} else break;
+} else {
+//this would be a strange issue of a value like
+// foo}${bar
+break;
+}
+}
+if ( subsitution ) {
+properties.setProperty( propertyName, propertyValue );
+}
}
//now, substitute $ values in property values with vars...
diff --git
a/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
b/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
index f4e21b744..f126b10f6 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
@@ -68,6 +68,14 @@ public class PropertyReaderTest {
Assertions.assertTrue( p.getProperty( "jspwiki.xyz" ).endsWith( "test
basedir" ) ); //don't touch this
Assertions.assertFalse( p.getProperty( "jspwiki.workDir" ).endsWith(
"$basedir/wrk/" ) );
}
+ @Test
+public void testSystemPropertyInjection() {
+System.setProperty("FOO", "BAR");
+final Properties p = new Properties();
+p.put( "jspwiki.fileSystemProvider.pageDir", "${FOO}/www/" );
+PropertyReader.expandVars( p );
+Assertions.assertTrue( p.getProperty(
"jspwiki.fileSystemProvider.pageDir" ).equals( "BAR/www/" ) );
+}
@Test
public void testVariableExpansion2() {
(jspwiki) 02/04: JSPWIKI-1188 additional test coverage
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 b10f148f1718ae19dd2ee7111d7a0020ad1b9795
Author: Alex O'Ree
AuthorDate: Sat Mar 30 12:24:27 2024 -0400
JSPWIKI-1188 additional test coverage
---
.../src/main/java/org/apache/wiki/util/PropertyReader.java| 2 +-
.../test/java/org/apache/wiki/util/PropertyReaderTest.java| 11 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index 70daf8325..9bb591a61 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -302,7 +302,7 @@ public final class PropertyReader {
boolean subsitution=false;
while ( propertyValue.contains( "${" ) && propertyValue.contains(
"}" ) ) {
int start = propertyValue.indexOf( "${" );
-int end = propertyValue.indexOf( "}" );
+int end = propertyValue.indexOf( "}", start );
if ( start == -1 || end == -1 ) break;
if ( end > start ) {
String substring = propertyValue.substring( start, end
).replace( "${", "" ).replace( "}", "" );
diff --git
a/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
b/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
index f126b10f6..c20e1feae 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/PropertyReaderTest.java
@@ -71,10 +71,19 @@ public class PropertyReaderTest {
@Test
public void testSystemPropertyInjection() {
System.setProperty("FOO", "BAR");
+System.setProperty("TEST", "VAL");
final Properties p = new Properties();
p.put( "jspwiki.fileSystemProvider.pageDir", "${FOO}/www/" );
+p.put( "jspwiki.fileSystemProvider.workDir", "${FOO}/www/${TEST}" );
+p.put( "jspwiki.fileSystemProvider.badVal1", "${FOO/www/${TEST}" );
+p.put( "jspwiki.fileSystemProvider.badVal2", "}${FOO/www/${TEST}" );
+p.put( "jspwiki.fileSystemProvider.badVal3", "${NONEXISTANTPROP}" );
PropertyReader.expandVars( p );
-Assertions.assertTrue( p.getProperty(
"jspwiki.fileSystemProvider.pageDir" ).equals( "BAR/www/" ) );
+Assertions.assertEquals( "BAR/www/", p.getProperty(
"jspwiki.fileSystemProvider.pageDir" ) );
+Assertions.assertEquals( "BAR/www/VAL", p.getProperty(
"jspwiki.fileSystemProvider.workDir" ) );
+Assertions.assertEquals( "${FOO/www/${TEST}", p.getProperty(
"jspwiki.fileSystemProvider.badVal1" ) );
+Assertions.assertEquals( "}${FOO/www/${TEST}", p.getProperty(
"jspwiki.fileSystemProvider.badVal2" ) );
+Assertions.assertEquals( "${NONEXISTANTPROP}", p.getProperty(
"jspwiki.fileSystemProvider.badVal3" ) );
}
@Test
(jspwiki-asf-docs) branch master updated: fix typo
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new 02b0275 fix typo 02b0275 is described below commit 02b0275eb88bba3c4a1e3bc85847a120ce58ec4f Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Apr 10 21:38:16 2024 +0200 fix typo --- board-reports/2024-04.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/board-reports/2024-04.txt b/board-reports/2024-04.txt index 62ffe7e..e1857e4 100755 --- a/board-reports/2024-04.txt +++ b/board-reports/2024-04.txt @@ -22,8 +22,7 @@ activity: * There's being some work on the refactor, referenced on last report, to benefit from virtual threads under JDK-21, but it is not complete yet. -* A small bug detected detected while our public wiki being attacked was -fixed. +* A small bug detected while our public wiki being attacked was fixed. * We've began to publish SBOMs alongside our main artifacts. * Some dependencies and plugins have been upgraded. @@ -50,4 +49,4 @@ One new user appeared on our user ML, has opened several JIRA issues and has provided a PR for one of them, which should be reviewed and hopefully merged sooner than later. -No questions unanswered on MLs, although they've had very little traffic. \ No newline at end of file +No questions unanswered on MLs, although they've had very little traffic.
(jspwiki-asf-docs) branch master updated: [DRAFT] 2024/04 Board report
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new a5e7a6a [DRAFT] 2024/04 Board report a5e7a6a is described below commit a5e7a6a745375d03e3062ccdcd6eb66bfdaa3e11 Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Apr 9 19:26:26 2024 +0200 [DRAFT] 2024/04 Board report --- board-reports/2024-04.txt | 53 +++ 1 file changed, 53 insertions(+) diff --git a/board-reports/2024-04.txt b/board-reports/2024-04.txt new file mode 100755 index 000..62ffe7e --- /dev/null +++ b/board-reports/2024-04.txt @@ -0,0 +1,53 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Project Status: +Current project status: Ongoing, with low activity. +Issues for the board: There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (10 years ago) +There are currently 15 committers and 9 PMC members in this project. +The Committer-to-PMC ratio is 5:3. + +Community changes, past quarter: +- Arturo Bernal was added to the PMC on 2023-06-21 +- Arturo Bernal was added as committer on 2023-06-21 + +## Project Activity: +Except from the last weeks, it has been a quiet quarter, with almost no +activity: + +* There's being some work on the refactor, referenced on last report, to +benefit from virtual threads under JDK-21, but it is not complete yet. +* A small bug detected detected while our public wiki being attacked was +fixed. +* We've began to publish SBOMs alongside our main artifacts. +* Some dependencies and plugins have been upgraded. + +We still have to release 2.12.2, and then publish a CVE already fixed on +master, which should be done this quarter. + +## Community Health: +Work on latest master shows commits from 1 commiter, done on the same git push. + +As noted above, on Eastern Week we were target of an automated attack, which +tried to explote vulnerabilities inside JSPWiki, through every single form +available. Thankfully, all the attack vectors were covered on previous +vulnerability reports, so nothing serious did happen, other than wiki +defacement which was manually fixed. + +As a result of this, we've documented on our SVN private area the setup of +the VM that hosts our public wiki, so any PMC can know how to operate it; +we're also temporarily not allowing new accounts on our public wiki, until +we put manual approval of accounts, and we've asked for volunteers to help +mantaining our public wiki content, having received one request off-list to +it. + +One new user appeared on our user ML, has opened several JIRA issues and has +provided a PR for one of them, which should be reviewed and hopefully merged +sooner than later. + +No questions unanswered on MLs, although they've had very little traffic. \ No newline at end of file
(jspwiki) 04/05: BasicAttachmentProvider doesn't throw an Exception if attachment metadata files are not correctly formed
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 c1375efd7c9f279deda144b5664561eaea51427e
Author: Juan Pablo Santos Rodríguez
AuthorDate: Tue Apr 9 15:45:34 2024 +0200
BasicAttachmentProvider doesn't throw an Exception if attachment metadata
files are not correctly formed
---
.../main/java/org/apache/wiki/providers/BasicAttachmentProvider.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
index 3dba732a7..86c3cf320 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
@@ -255,6 +255,8 @@ public class BasicAttachmentProvider implements
AttachmentProvider {
if( propertyFile.exists() ) {
try( final InputStream in = Files.newInputStream(
propertyFile.toPath() ) ) {
props.load( in );
+} catch( final IOException ioe ) {
+LOG.error( ioe.getMessage() );
}
}
(jspwiki) 03/05: Update tomcat binaries
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 fc1409682b7e123e20b74312e05e175cc0a8fe99 Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Apr 9 15:44:39 2024 +0200 Update tomcat binaries --- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35467 -> 35452 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49610 -> 49609 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3800076 -> 380 bytes 3 files changed, 0 insertions(+), 0 deletions(-) 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 22efd7e56..cf04ee1ee 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 0d835b140..10ee7d850 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 f38d34f82..ba3704578 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
(jspwiki) branch master updated (f46c00b63 -> b5b328374)
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 f46c00b63 2.12.2-git-11 new d09539131 Dependency updates new 203ab122d publish SBOMs new fc1409682 Update tomcat binaries new c1375efd7 BasicAttachmentProvider doesn't throw an Exception if attachment metadata files are not correctly formed new b5b328374 2.12.2-git-12 The 5 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 | 18 +++ LICENSE| 38 +++--- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../wiki/providers/BasicAttachmentProvider.java| 2 + .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35467 -> 35452 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49610 -> 49609 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3800076 -> 380 bytes pom.xml| 58 - 8 files changed, 84 insertions(+), 34 deletions(-)
(jspwiki) 01/05: Dependency updates
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 d09539131830b1a357faae4dd1d73ff353ae36da Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Apr 9 15:40:54 2024 +0200 Dependency updates * Commons IO to 2.16.1 * JUnit to 5.10.2 * Log4J2 to 2.23.0 * Lucene to 9.10.0 * Mockito to 5.11.0 * Tika to 2.9.2 * Tomcat to 9.0.87 * Maven plugins: assembly to 3.7.1, compiler to 3.13.0, jxr to 3.3.2, remote-resources to 3.2.0, source to 3.3.1, surefire to 3.2.5, jdk-doclet to 2.1.2 closes #329 closes #328 closes #327 closes #326 --- pom.xml | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 485a5debf..b5909c18b 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 2023-08-07T19:55:12Z 11 -2.1.1 +2.1.2 3.5 1.02 @@ -50,7 +50,7 @@ 4.4 1.5 3.1 -2.15.0 +2.16.1 3.14.0 1.11.0 2.10.9.2 @@ -67,37 +67,37 @@ 2.0.6 9.4.53.v20231009 0.4.2 -5.10.1 -2.20.0 -9.9.0 -5.8.0 +5.10.2 +2.23.0 +9.10.0 +5.11.0 2.1.2 2.0.8 0.5 6.19.0 1.7.36 1.7.0-async-beta -2.9.1 -9.0.83 +2.9.2 +9.0.87 1.8.0 2.0.1 3.1.0 -3.6.0 +3.7.1 3.3.2 -3.11.0 +3.13.0 3.6.1 3.4.1 3.1.1 3.3.0 3.6.3 -3.3.1 +3.3.2 3.5.0 3.0.1 -3.1.0 +3.2.0 3.3.1 -3.3.0 -3.2.2 +3.3.1 +3.2.5 1.2.1 3.4.0 1.4.3
(jspwiki) 02/05: publish SBOMs
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 203ab122d240a65499b669ed51339a3e526defcb
Author: Juan Pablo Santos Rodríguez
AuthorDate: Tue Apr 9 15:44:08 2024 +0200
publish SBOMs
---
pom.xml | 30 ++
1 file changed, 30 insertions(+)
diff --git a/pom.xml b/pom.xml
index b5909c18b..6899f2ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
1.10.11
2.8
2.7
+2.8.0
3.10.0.2594
0.1
1.0.0
@@ -478,6 +479,29 @@
net.nicoulaj.maven.plugins
checksum-maven-plugin
+
+
+org.cyclonedx
+cyclonedx-maven-plugin
+
+
+generate-sbom
+
+ makeAggregateBom
+
+package
+
+
+
+ vulnerability-assertion
+ https://jspwiki.apache.org/cyclonedx/vdr.xml
+
+
+ xml
+
+
+
+
@@ -825,6 +849,12 @@
+
+ org.cyclonedx
+ cyclonedx-maven-plugin
+ ${plugin.cyclonedx.version}
+
+
org.sonarsource.scanner.maven
sonar-maven-plugin
(jspwiki) 05/05: 2.12.2-git-12
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 b5b32837416ad6f9655b342f6ba13e1709825bf1 Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Apr 9 15:46:28 2024 +0200 2.12.2-git-12 --- ChangeLog.md | 18 ++ LICENSE| 38 +++--- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index eed4cd10e..81bd61fe3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,6 +17,24 @@ specific language governing permissions and limitations under the License. --> +**2024-04-09 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.12.2-git-12_ + +* `BasicAttachmentProvider` doesn't throw an Exception if attachment metadata files are not correctly formed, aligning behaviour with metadata files not being present. This ensures plugin relying on this functionality, like f.ex RecentChanges, keep working if this condition is met. + +* Publish SBOMs artifacts as part of the build. + +* Dependency updates +* Commons IO to 2.16.1 +* JUnit to 5.10.2 +* Log4J2 to 2.23.0 +* Lucene to 9.10.0 +* Mockito to 5.11.0 +* Tika to 2.9.2 +* Tomcat to 9.0.87 +* Maven plugins: assembly to 3.7.1, compiler to 3.13.0, jxr to 3.3.2, remote-resources to 3.2.0, source to 3.3.1, surefire to 3.2.5, jdk-doclet to 2.1.2 + **2023-12-04 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.12.2-git-11_ diff --git a/LICENSE b/LICENSE index 02453c3c5..aa2de99ee 100644 --- a/LICENSE +++ b/LICENSE @@ -216,7 +216,7 @@ commons-codec-1.3.jar LICENSE commons-collections-4.4.jar LICENSE commons-fileupload-1.5.jar LICENSE commons-httpclient-3.1.jar LICENSE -commons-io-2.15.0.jar LICENSE +commons-io-2.16.1.jar LICENSE commons-lang-3.14.0.jar LICENSE commons-logging-1.0.4.jar LICENSE commons-text-1.11.0.jar LICENSE @@ -253,18 +253,18 @@ jdom2-2.0.6.jar ./jspwiki-war/src/main/config/doc/LI jmespath-java-1.12.565 LICENSE joda-time-2.8.1 LICENSE jstl-1.2.jarLICENSE -log4j-1.2-api-2.20.0.jarLICENSE -log4j-api-2.20.0.jarLICENSE -log4j-core-2.20.0.jar LICENSE -log4j-slf4j-impl-2.20.0 LICENSE -lucene-analyzers-common-9.9.0.jar LICENSE -lucene-backward-codecs-9.9.0.jarLICENSE -lucene-core-9.9.0.jar LICENSE -lucene-highlighter-9.9.0.jarLICENSE -lucene-memory-9.9.0.jar LICENSE -lucene-queries-9.9.0.jarLICENSE -lucene-queryparser-9.9.0.jarLICENSE -lucene-sandbox-9.9.0.jarLICENSE +log4j-1.2-api-2.23.0.jarLICENSE +log4j-api-2.23.0.jarLICENSE +log4j-core-2.23.0.jar LICENSE +log4j-slf4j-impl-2.23.0 LICENSE +lucene-analyzers-common-9.10.0.jar LICENSE +lucene-backward-codecs-9.10.0.jar LICENSE +lucene-core-9.10.0.jar LICENSE +lucene-highlighter-9.10.0.jar LICENSE +lucene-memory-9.10.0.jarLICENSE +lucene-queries-9.10.0.jar LICENSE +lucene-queryparser-9.10.0.jar LICENSE +lucene-sandbox-9.10.0.jar LICENSE mail-1.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl nekohtml-2.0.2.jar (codelibs fork) LICENSE org.suigeneris.jrcs.diff-0.4.2 LICENSE @@ -272,8 +272,8 @@ oro-2.0.8.jar LICENSE sandler-0.5.jar ./jspwiki-war/src/main/config/doc/LICENSE.sandler slf4-api-1.7.36.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit xercesImpl-2.10.0.jar LICENSE -tika-core-2.9.1.jar LICENSE -tika-parsers-2.9.1.jar LICENSE +tika-core-2.9.2.jar LICENSE +tika-parsers-2.9.2.jar LICENSE xml-apis-1.4.01 LICENSE xmlrpc-2.0.1.jarLICENSE xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LICENSE.cc-cod @@ -287,8 +287,8 @@ hsqldb-2.7.2.jar ./jspwiki-war/src/main/config/doc/LI sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb jamm-0.4.0.jar LICENSE jetty-all-9.4.53.v20231009.
(jspwiki-asf-docs) branch master updated: DRAFT Board 2024/01 report
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new 6b87737 DRAFT Board 2024/01 report 6b87737 is described below commit 6b87737a9a70486d442781b198779845b903abd2 Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Jan 7 17:06:25 2024 +0100 DRAFT Board 2024/01 report --- board-reports/2024-01.txt | 38 ++ 1 file changed, 38 insertions(+) diff --git a/board-reports/2024-01.txt b/board-reports/2024-01.txt new file mode 100755 index 000..02f637a --- /dev/null +++ b/board-reports/2024-01.txt @@ -0,0 +1,38 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Project Status: +Current project status: Ongoing, with low activity. +Issues for the board: There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (10 years ago) +There are currently 15 committers and 9 PMC members in this project. +The Committer-to-PMC ratio is 5:3. + +Community changes, past quarter: +- Arturo Bernal was added to the PMC on 2023-06-21 +- Arturo Bernal was added as committer on 2023-06-21 + +## Project Activity: +We received two vulnerability reports this quarter, of which one of them +resulted in an actual vulnerability, already fixed in master. + +As a result from a thread on the user ML, we also have introduced support +of custom wiki event listeners on our public API, and squashed a bug +regarding the content of some wiki events. + +We still have to release 2.12.2, but we'd like to introduce in it a big +internal refactor so that JSPWiki can benefit from virtual threads support +when running under JDK-21. This work is tracked at [#1]. + +## Community Health: +Work on latest master shows commits from 2 different commiters. + +Other than that, we got the usual amount of emails (that is, not too much). No +unanswered questions, and there is enough people appearing on the ML and +providing project oversight. + +[#1]: https://github.com/apache/jspwiki/pull/307 \ No newline at end of file
(jspwiki) 03/03: 2.12.2-git-11
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 f46c00b63906daf4fb0c74e05b47aee0aba4804e
Author: Juan Pablo Santos Rodríguez
AuthorDate: Mon Dec 4 22:42:35 2023 +0100
2.12.2-git-11
---
ChangeLog.md | 13 -
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index ae44940ea..eed4cd10e 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,7 +17,18 @@ specific language governing permissions and limitations
under the License.
-->
-**2023-11-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
+**2023-12-04 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-11_
+
+* Call `ServletRequest#setCharacterEncoding` prior to calling
`URLConstructor#parsePageFromURL` (related to error noted at
[#322](https://github.com/apache/jspwiki/pull/322)), in order to ensure the
proper encoding is set.
+
+* Dependency updates
+* Lucene to 9.9.0
+* Mockito to 5.8.0 (closes
[#325](https://github.com/apache/jspwiki/pull/325), thanks to dependabot)
+* Maven plugins: javadoc to 3.6.3
+
+**2023-12-02 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-10_
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 ff567b049..b3699e53a 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "10";
+public static final String BUILD = "11";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) 01/03: Call ServletRequest#setCharacterEncoding prior to calling URLConstructor#parsePageFrom URL
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 abd3d8b603182c357bbe2401d5033944cce0f15c
Author: Juan Pablo Santos Rodríguez
AuthorDate: Mon Dec 4 22:41:01 2023 +0100
Call ServletRequest#setCharacterEncoding prior to calling
URLConstructor#parsePageFrom URL
in order to ensure the proper encoding is set.
(related to error noted at #322)
---
jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index 6535faa85..67893f04b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -92,6 +92,7 @@ public class WikiJSPFilter extends WikiServletFilter {
ThreadContext.push( m_engine.getApplicationName() + ":" + ( (
HttpServletRequest )request ).getRequestURI() );
w.enterState("Filtering for URL
"+((HttpServletRequest)request).getRequestURI(), 90 );
final HttpServletResponseWrapper responseWrapper = new
JSPWikiServletResponseWrapper( ( HttpServletResponse )response,
m_wiki_encoding, useEncoding );
+request.setCharacterEncoding(
m_engine.getContentEncoding().displayName() );
// fire PAGE_REQUESTED event
final String pagename = URLConstructor.parsePageFromURL( (
HttpServletRequest )request, m_engine.getContentEncoding() );
(jspwiki) branch master updated (1ce7f38c5 -> f46c00b63)
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 1ce7f38c5 2.12.2-git-10 new abd3d8b60 Call ServletRequest#setCharacterEncoding prior to calling URLConstructor#parsePageFrom URL new 557469452 Dependency updates new f46c00b63 2.12.2-git-11 The 3 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 | 13 - LICENSE| 18 +- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../main/java/org/apache/wiki/ui/WikiJSPFilter.java| 1 + pom.xml| 6 +++--- 5 files changed, 26 insertions(+), 14 deletions(-)
(jspwiki) 02/03: Dependency updates
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 557469452209e0926607b12367a168f4c25545ff Author: Juan Pablo Santos Rodríguez AuthorDate: Mon Dec 4 22:42:03 2023 +0100 Dependency updates * Lucene 9.9.0 * Mockito 5.8.0 (closes #325, thanks to dependabot) * maven-javadoc-plugin to 3.6.3 --- LICENSE | 18 +- pom.xml | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index 8a2a0a3dc..02453c3c5 100644 --- a/LICENSE +++ b/LICENSE @@ -257,14 +257,14 @@ log4j-1.2-api-2.20.0.jarLICENSE log4j-api-2.20.0.jarLICENSE log4j-core-2.20.0.jar LICENSE log4j-slf4j-impl-2.20.0 LICENSE -lucene-analyzers-common-9.8.0.jar LICENSE -lucene-backward-codecs-9.8.0.jarLICENSE -lucene-core-9.8.0.jar LICENSE -lucene-highlighter-9.8.0.jarLICENSE -lucene-memory-9.8.0.jar LICENSE -lucene-queries-9.8.0.jarLICENSE -lucene-queryparser-9.8.0.jarLICENSE -lucene-sandbox-9.8.0.jarLICENSE +lucene-analyzers-common-9.9.0.jar LICENSE +lucene-backward-codecs-9.9.0.jarLICENSE +lucene-core-9.9.0.jar LICENSE +lucene-highlighter-9.9.0.jarLICENSE +lucene-memory-9.9.0.jar LICENSE +lucene-queries-9.9.0.jarLICENSE +lucene-queryparser-9.9.0.jarLICENSE +lucene-sandbox-9.9.0.jarLICENSE mail-1.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl nekohtml-2.0.2.jar (codelibs fork) LICENSE org.suigeneris.jrcs.diff-0.4.2 LICENSE @@ -288,7 +288,7 @@ sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LI jamm-0.4.0.jar LICENSE jetty-all-9.4.53.v20231009.jar LICENSE junit-5.10.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl -mockito-core-5.7.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit +mockito-core-5.8.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit stripes-1.7.0-async.jar LICENSE yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui diff --git a/pom.xml b/pom.xml index a965cd751..485a5debf 100644 --- a/pom.xml +++ b/pom.xml @@ -69,8 +69,8 @@ 0.4.2 5.10.1 2.20.0 -9.8.0 -5.7.0 +9.9.0 +5.8.0 2.1.2 2.0.8 0.5 @@ -90,7 +90,7 @@ 3.4.1 3.1.1 3.3.0 -3.6.2 +3.6.3 3.3.1 3.5.0 3.0.1
(jspwiki) 05/07: update commons-lang to 3.14.0
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 815861430024857aee7cad8ef4c43f7e40eefb87 Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Dec 2 20:59:37 2023 +0100 update commons-lang to 3.14.0 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 912ad116f..8a2a0a3dc 100644 --- a/LICENSE +++ b/LICENSE @@ -217,7 +217,7 @@ commons-collections-4.4.jar LICENSE commons-fileupload-1.5.jar LICENSE commons-httpclient-3.1.jar LICENSE commons-io-2.15.0.jar LICENSE -commons-lang-3.13.0.jar LICENSE +commons-lang-3.14.0.jar LICENSE commons-logging-1.0.4.jar LICENSE commons-text-1.11.0.jar LICENSE ehcache-2.10.9.2.jarLICENSE
(jspwiki) 02/07: url decode name, it's needed to get the appropiate page name
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 082fae5084f102b765189aa223c0d91fbec05d95
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Dec 2 20:52:42 2023 +0100
url decode name, it's needed to get the appropiate page name
---
jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
index 1e64b5432..5e5552970 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
@@ -19,6 +19,7 @@
package org.apache.wiki.url;
import org.apache.wiki.api.engine.Initializable;
+import org.apache.wiki.util.TextUtil;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
@@ -83,9 +84,7 @@ public interface URLConstructor extends Initializable {
}
// This is required, because by default all URLs are handled as
Latin1, even if they are really UTF-8.
-// name = TextUtil.urlDecode( name, encoding );
-
-return name;
+return TextUtil.urlDecode( name, encoding.name() );
}
}
(jspwiki) 04/07: Introduce CustomWikiEventListeners, as an easy way to register 3rd party listeners
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 d18dc3ac6a2392752795e5ccb634d7d34b18
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Dec 2 20:54:55 2023 +0100
Introduce CustomWikiEventListeners, as an easy way to register 3rd party
listeners
cfr. with
https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteACustomWikiEventListener
---
.../main/java/org/apache/wiki/api/core/Engine.java | 14 +++--
.../wiki/api/events/CustomWikiEventListener.java | 46 +
.../java/org/apache/wiki/api/events/package.html | 34
.../api/events/CustomWikiEventListenerTest.java| 60 ++
.../events/CustomWikiEventListenerTestImpl.java| 50 ++
apache.wiki.api.events.CustomWikiEventListener | 1 +
6 files changed, 202 insertions(+), 3 deletions(-)
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
index 95349be7e..49a0ef716 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/core/Engine.java
@@ -20,9 +20,11 @@ package org.apache.wiki.api.core;
import org.apache.logging.log4j.LogManager;
import org.apache.wiki.api.engine.EngineLifecycleExtension;
+import org.apache.wiki.api.events.CustomWikiEventListener;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.event.WikiEventListener;
+import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.util.TextUtil;
import javax.servlet.ServletContext;
@@ -425,14 +427,20 @@ public interface Engine {
* @throws WikiException if something happens while setting up the {@code
Engine}.
*/
default void start( final Properties properties ) throws WikiException {
-final ServiceLoader< EngineLifecycleExtension > loader =
ServiceLoader.load( EngineLifecycleExtension.class );
-for( final EngineLifecycleExtension extension : loader ) {
+final var loader = ServiceLoader.load( EngineLifecycleExtension.class
);
+for( final var extension : loader ) {
extension.onInit( properties );
}
initialize( properties );
-for( final EngineLifecycleExtension extension : loader ) {
+for( final var extension : loader ) {
extension.onStart( this, properties );
}
+final var events = ServiceLoader.load( CustomWikiEventListener.class );
+for( final var event : events ) {
+CustomWikiEventListener.LISTENERS.add( event );
+event.initialize( this, getWikiProperties() );
+WikiEventManager.addWikiEventListener( event.client(), event );
+}
}
/**
diff --git
a/jspwiki-api/src/main/java/org/apache/wiki/api/events/CustomWikiEventListener.java
b/jspwiki-api/src/main/java/org/apache/wiki/api/events/CustomWikiEventListener.java
new file mode 100644
index 0..3109c1513
--- /dev/null
+++
b/jspwiki-api/src/main/java/org/apache/wiki/api/events/CustomWikiEventListener.java
@@ -0,0 +1,46 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+ */
+package org.apache.wiki.api.events;
+
+import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.engine.Initializable;
+import org.apache.wiki.event.WikiEventListener;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ *
+ * @param the type of the events' source.
+ */
+public interface CustomWikiEventListener< T > extends WikiEventListener,
Initializable {
+
+/** {@link WikiEventListener}s are stored on a {@code List< WeaKReference
>} so we use this List to strong reference custom event listeners. */
+List< CustomWikiEventListener< ? > > LISTENERS = new ArrayList<>();
+
+/**
+ * Returns the object of the events' source. Typically, it will be
obtained on the
+ * {@link Initializable#initialize(Engine, Properti
(jspwiki) 03/07: update commons-lang to 3.14.0
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 e5d70645f2212451bd41d0998fb83f9a37013ce3 Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Dec 2 20:53:28 2023 +0100 update commons-lang to 3.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5a2821e7..c9fc8d1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 1.5 3.1 2.15.0 -3.13.0 +3.14.0 1.11.0 2.10.9.2 0.64.8
(jspwiki) 01/07: use engine.getEncoding instead of response.getEncoding
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 1ee6fd6c346b45d7bd5472cf4e5b7bde738a32ca
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Dec 2 20:51:53 2023 +0100
use engine.getEncoding instead of response.getEncoding
the latter commits the response, causing errors later on the filter chain,
f.ex. when trying to create a session b/c of the response has being previously
committed - fixes error related to #322
---
jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index fa8590d92..6535faa85 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -45,7 +45,6 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
/**
@@ -95,8 +94,8 @@ public class WikiJSPFilter extends WikiServletFilter {
final HttpServletResponseWrapper responseWrapper = new
JSPWikiServletResponseWrapper( ( HttpServletResponse )response,
m_wiki_encoding, useEncoding );
// fire PAGE_REQUESTED event
-final String pagename = URLConstructor.parsePageFromURL( (
HttpServletRequest )request, Charset.forName( response.getCharacterEncoding() )
);
-fireEvent( WikiPageEvent.PAGE_REQUESTED, pagename );
+final String pagename = URLConstructor.parsePageFromURL( (
HttpServletRequest )request, m_engine.getContentEncoding() );
+fireEvent( WikiPageEvent.PAGE_REQUESTED, pagename != null ?
pagename : m_engine.getFrontPage() );
super.doFilter( request, responseWrapper, chain );
// The response is now complete. Let's replace the markers now.
(jspwiki) branch master updated (03fba43cc -> 1ce7f38c5)
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 03fba43cc udpate project-info-reports-plugin to 3.5.0 - no version bump
new 1ee6fd6c3 use engine.getEncoding instead of response.getEncoding
new 082fae508 url decode name, it's needed to get the appropiate page name
new e5d70645f update commons-lang to 3.14.0
new d18dc3ac6 Introduce CustomWikiEventListeners, as an easy way to
register 3rd party listeners
new 815861430 update commons-lang to 3.14.0
new c14fb662d Update cargo to 1.10.11 - closes #324, thanks to dependabot
new 1ce7f38c5 2.12.2-git-10
The 7 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 | 12
LICENSE| 2 +-
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 14 --
.../CustomWikiEventListener.java} | 26 ++
.../java/org/apache/wiki/api/events}/package.html | 4 +--
.../CustomWikiEventListenerTest.java} | 32 --
.../CustomWikiEventListenerTestImpl.java} | 29
apache.wiki.api.events.CustomWikiEventListener | 1 +
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 5 ++--
.../java/org/apache/wiki/url/URLConstructor.java | 5 ++--
pom.xml| 4 +--
12 files changed, 84 insertions(+), 52 deletions(-)
copy jspwiki-api/src/main/java/org/apache/wiki/api/{engine/Initializable.java
=> events/CustomWikiEventListener.java} (54%)
copy
{jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages =>
jspwiki-api/src/main/java/org/apache/wiki/api/events}/package.html (91%)
copy
jspwiki-api/src/test/java/org/apache/wiki/api/{engine/EngineLifecycleExtensionTest.java
=> events/CustomWikiEventListenerTest.java} (63%)
copy
jspwiki-api/src/test/java/org/apache/wiki/api/{engine/EngineLifecycleExtensionTestImpl.java
=> events/CustomWikiEventListenerTestImpl.java} (58%)
create mode 100644
jspwiki-api/src/test/resources/META-INF/services/org.apache.wiki.api.events.CustomWikiEventListener
(jspwiki) 06/07: Update cargo to 1.10.11 - closes #324, thanks to dependabot
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 c14fb662d09526bcb2461ca9ed6a4ac76a06d881 Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Dec 2 21:00:21 2023 +0100 Update cargo to 1.10.11 - closes #324, thanks to dependabot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9fc8d1ba..a965cd751 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 3.2.2 1.11 1.0.1 -1.10.10 +1.10.11 2.8 2.7 3.10.0.2594
(jspwiki) 07/07: 2.12.2-git-10
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 1ce7f38c5bdb897793a683b81534ec70975811c8
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Dec 2 21:01:13 2023 +0100
2.12.2-git-10
---
ChangeLog.md | 12
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 4c8c882d0..ae44940ea 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -19,6 +19,18 @@ under the License.
**2023-11-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
+* _2.12.2-git-10_
+
+* Use `Engine#getContentEncoding` to call `URLConstructor#parsePageFromURL`
(related to error noted at [#322](https://github.com/apache/jspwiki/pull/322)).
The latter also url decodes the returned page name.
+
+* Introduced
[`CustomWikiEventListener`](https://jspwiki-wiki.apache.org/Wiki.jsp?page=HowToWriteACustomWikiEventListener)
as an easy way to register 3rd party `WikiEventListener`s.
+
+* Dependency updates
+* commons-lang3 to 3.14.0
+* Maven plugins: cargo to 1.10.11 (closes
[#324](https://github.com/apache/jspwiki/pull/324), thanks to dependabot)
+
+**2023-11-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
* _2.12.2-git-09_
* Make `URLConstructor#parsePageFromURL` work with default URL style (closes
[#322](https://github.com/apache/jspwiki/pull/322), thanks to Ulf Dittmer)
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 97c850251..ff567b049 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "09";
+public static final String BUILD = "10";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) branch master updated: udpate project-info-reports-plugin to 3.5.0 - no version bump
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 The following commit(s) were added to refs/heads/master by this push: new 03fba43cc udpate project-info-reports-plugin to 3.5.0 - no version bump 03fba43cc is described below commit 03fba43cc45e148cee05633610671dd3d7a8e333 Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Nov 25 21:58:23 2023 +0100 udpate project-info-reports-plugin to 3.5.0 - no version bump --- ChangeLog.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 1ea85bec8..4c8c882d0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,7 +27,7 @@ under the License. * Dependency updates * Mockito to 5.7.0 (closes [#319](https://github.com/apache/jspwiki/pull/319), thanks to dependabot) -* Maven plugins: cargo to 1.10.10 (closes [#320](https://github.com/apache/jspwiki/pull/320), thanks to dependabot) +* Maven plugins: project-info-reports-plugin to 3.5.0, cargo to 1.10.10 (closes [#320](https://github.com/apache/jspwiki/pull/320), thanks to dependabot) **2023-11-19 Juan Pablo Santos (juanpablo AT apache DOT org)** diff --git a/pom.xml b/pom.xml index 1ffdbaf4f..c5a2821e7 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.3.0 3.6.2 3.3.1 - 3.4.5 + 3.5.0 3.0.1 3.1.0 3.3.1
(jspwiki) 03/04: Update dependencies
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 2c83da12c59b6575b8f4d04577c77172ecc9ccce Author: Juan Pablo Santos Rodríguez AuthorDate: Sat Nov 25 15:27:28 2023 +0100 Update dependencies * Mockito to 5.7.0 (closes #319, thanks to dependabot) * Cargo maven plugin to 1.10.10 (closes #320, thanks to dependabot) --- LICENSE | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 6a399276f..912ad116f 100644 --- a/LICENSE +++ b/LICENSE @@ -288,7 +288,7 @@ sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LI jamm-0.4.0.jar LICENSE jetty-all-9.4.53.v20231009.jar LICENSE junit-5.10.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl -mockito-core-5.5.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit +mockito-core-5.7.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit stripes-1.7.0-async.jar LICENSE yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui diff --git a/pom.xml b/pom.xml index 6deed41f2..1ffdbaf4f 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 2023-08-07T19:55:12Z 11 -2.1.0 +2.1.1 3.5 1.02 @@ -70,7 +70,7 @@ 5.10.1 2.20.0 9.8.0 -5.5.0 +5.7.0 2.1.2 2.0.8 0.5 @@ -104,7 +104,7 @@ 3.2.2 1.11 1.0.1 -1.10.9 +1.10.10 2.8 2.7 3.10.0.2594
(jspwiki) branch master updated (4b2323ce6 -> 7b4e95c13)
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 4b2323ce6 Update Viewer.js new 87bbf3fa7 Add some unit tests for URLConstructor#parsePageFromURL new 2340cd013 fix typo new 2c83da12c Update dependencies new 7b4e95c13 2.12.2-git-09 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: ChangeLog.md | 12 ++ LICENSE| 2 +- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../java/org/apache/wiki/ui/WikiJSPFilter.java | 2 +- .../org/apache/wiki/url/UrlConstructorTest.java| 28 ++ pom.xml| 6 ++--- 6 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
(jspwiki) 04/04: 2.12.2-git-09
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 7b4e95c131a24c12113472e105c7319759ddd10d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Nov 25 15:27:48 2023 +0100
2.12.2-git-09
---
ChangeLog.md | 12
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index d6b99dd7e..1ea85bec8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,18 @@ specific language governing permissions and limitations
under the License.
-->
+**2023-11-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-09_
+
+* Make `URLConstructor#parsePageFromURL` work with default URL style (closes
[#322](https://github.com/apache/jspwiki/pull/322), thanks to Ulf Dittmer)
+
+* Update `Viewer.js` so that Vimeo uses html5 player instead of the flash
based one (closes [#321](https://github.com/apache/jspwiki/pull/321), thanks to
Ulf Dittmer)
+
+* Dependency updates
+* Mockito to 5.7.0 (closes
[#319](https://github.com/apache/jspwiki/pull/319), thanks to dependabot)
+* Maven plugins: cargo to 1.10.10 (closes
[#320](https://github.com/apache/jspwiki/pull/320), thanks to dependabot)
+
**2023-11-19 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-08_
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 b96bcaa45..97c850251 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "08";
+public static final String BUILD = "09";
/**
* This is the generic version string you should use when printing out
the version. It is of
(jspwiki) 02/04: fix typo
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 2340cd0134fecb7a29f5c4f24cddc08150f77e5d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Nov 25 15:25:47 2023 +0100
fix typo
---
jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index 9f961efea..fa8590d92 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -99,7 +99,7 @@ public class WikiJSPFilter extends WikiServletFilter {
fireEvent( WikiPageEvent.PAGE_REQUESTED, pagename );
super.doFilter( request, responseWrapper, chain );
-// The response is now complete. Lets replace the markers now.
+// The response is now complete. Let's replace the markers now.
// WikiContext is only available after doFilter! (That is after
interpreting the jsp)
(jspwiki) 01/04: Add some unit tests for URLConstructor#parsePageFromURL
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 87bbf3fa7c8c291611d2837788ebccedf6f35e66
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Nov 25 15:25:32 2023 +0100
Add some unit tests for URLConstructor#parsePageFromURL
---
.../org/apache/wiki/url/UrlConstructorTest.java| 28 ++
1 file changed, 28 insertions(+)
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
new file mode 100644
index 0..1af5a9490
--- /dev/null
+++ b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
@@ -0,0 +1,28 @@
+package org.apache.wiki.url;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
+
+class UrlConstructorTest {
+
+@Test
+void testParsePageFromURLUsingPathInfo() {
+final HttpServletRequest req = Mockito.mock( HttpServletRequest.class
);
+Mockito.doReturn( "MyPage" ).when( req ).getPathInfo();
+Assertions.assertEquals( "MyPage", URLConstructor.parsePageFromURL(
req, StandardCharsets.UTF_8 ) );
+}
+
+@Test
+void testParsePageFromURLUsingRequestParam() {
+final HttpServletRequest req = Mockito.mock( HttpServletRequest.class
);
+Mockito.doReturn( null ).when( req ).getPathInfo();
+Mockito.doReturn( "MyPage", ( String )null ).when( req ).getParameter(
"page" );
+Assertions.assertEquals( "MyPage", URLConstructor.parsePageFromURL(
req, StandardCharsets.UTF_8 ) );
+Assertions.assertNull( URLConstructor.parsePageFromURL( req,
StandardCharsets.UTF_8 ) ); // no req parameter should return null
+}
+
+}
(jspwiki) branch master updated: Update Viewer.js
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
The following commit(s) were added to refs/heads/master by this push:
new 4b2323ce6 Update Viewer.js
4b2323ce6 is described below
commit 4b2323ce6388f3c1ec0a1c7a136ac0b09f350895
Author: udittmer <34645700+uditt...@users.noreply.github.com>
AuthorDate: Wed Nov 22 17:02:05 2023 +0100
Update Viewer.js
The Flash-based Vimeo player is obsolete, and HTML 5 works fine.
---
jspwiki-war/src/main/scripts/behaviors/Viewer.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/jspwiki-war/src/main/scripts/behaviors/Viewer.js
b/jspwiki-war/src/main/scripts/behaviors/Viewer.js
index 6d534cf0c..1e538a11d 100644
--- a/jspwiki-war/src/main/scripts/behaviors/Viewer.js
+++ b/jspwiki-war/src/main/scripts/behaviors/Viewer.js
@@ -299,9 +299,7 @@ Viewer.LIB.append([
["https?://vimeo.com/", function(url){
return {
-//html5 compatible --- use iframe
-//src: "http://player.vimeo.com/video/; + url.split("/")[3],
-url:
protocol+"www.vimeo.com/moogaloop.swf?server=www.vimeo.comclip_id=" +
url.split("/")[3],
+src: protocol+"player.vimeo.com/video/" + url.split("/")[3],
width: 640,
height: 360
};
(jspwiki) branch master updated: Update URLConstructor.java
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
The following commit(s) were added to refs/heads/master by this push:
new 432361b4d Update URLConstructor.java
432361b4d is described below
commit 432361b4d237db345e0eb43a9124f2870638af4b
Author: udittmer <34645700+uditt...@users.noreply.github.com>
AuthorDate: Fri Nov 24 16:32:28 2023 +0100
Update URLConstructor.java
The method didn't work for the default URL style, causing PAGE_REQUESTED
and PAGE_DELIVERED events to have a null page name.
---
jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
index 885339472..1e64b5432 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java
@@ -77,7 +77,7 @@ public interface URLConstructor extends Initializable {
static String parsePageFromURL( final HttpServletRequest request, final
Charset encoding ) {
final String name = request.getPathInfo();
if( name == null || name.length() <= 1 ) {
-return null;
+return request.getParameter("page");
} else if( name.charAt(0) == '/' ) {
return name.substring(1);
}
(jspwiki) branch master updated: Fix test compilation due to move to Jamm 0.4.0
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
The following commit(s) were added to refs/heads/master by this push:
new 921f8bbcd Fix test compilation due to move to Jamm 0.4.0
921f8bbcd is described below
commit 921f8bbcd211e6a421b365d4b060f3e5fd9b981c
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun Nov 19 22:24:16 2023 +0100
Fix test compilation due to move to Jamm 0.4.0
---
jspwiki-main/src/test/java/org/apache/wiki/MemoryProfiling.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/MemoryProfiling.java
b/jspwiki-main/src/test/java/org/apache/wiki/MemoryProfiling.java
index 756ea355e..4a864f72c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/MemoryProfiling.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/MemoryProfiling.java
@@ -51,7 +51,7 @@ class MemoryProfiling {
final Acl acl = Wiki.acls().acl();
final AclEntry aclEntry = Wiki.acls().entry();
-final MemoryMeter meter = new MemoryMeter();
+final MemoryMeter meter = MemoryMeter.builder().build();
final long engineBytes = meter.measureDeep( engine );
final long engineWithDefaultPagesBytes = meter.measureDeep(
engineWithDefaultPages );
final long mainBytes = meter.measureDeep( main );
(jspwiki) 01/06: JSPWIKI-1184: Image missing and German text typo
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 aaf37c166b4677b08e2974c3f9f9dac3da3005a8
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun Nov 19 22:04:41 2023 +0100
JSPWIKI-1184: Image missing and German text typo
---
.../src/main/resources/templates/default_de.properties | 2 +-
.../main/webapp/templates/{210 => default}/images/note.png | Bin
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/resources/templates/default_de.properties
b/jspwiki-main/src/main/resources/templates/default_de.properties
index a255ca179..a46aa71fa 100644
--- a/jspwiki-main/src/main/resources/templates/default_de.properties
+++ b/jspwiki-main/src/main/resources/templates/default_de.properties
@@ -685,7 +685,7 @@ blog.permalink=Permalink
#
# The Javascript stuff
#
-javascript.broken.image=Inhalt nichr verf�gbar (Verweis ung�ltig)
+javascript.broken.image=Inhalt nicht verf�gbar (Verweis ung�ltig)
javascript.sbox.clearrecent=Letzte Suchen l�schen
javascript.sbox.clone=Seite duplizieren
javascript.sbox.create=Erzeuge {0}
diff --git a/jspwiki-war/src/main/webapp/templates/210/images/note.png
b/jspwiki-war/src/main/webapp/templates/default/images/note.png
similarity index 100%
rename from jspwiki-war/src/main/webapp/templates/210/images/note.png
rename to jspwiki-war/src/main/webapp/templates/default/images/note.png
(jspwiki) 06/06: 2.12.2-git-08
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 84653bf767bdf07a70ffdf5e4b303c3c87642f95 Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Nov 19 22:17:02 2023 +0100 2.12.2-git-08 --- ChangeLog.md | 24 +- LICENSE| 17 +++ .../src/main/java/org/apache/wiki/api/Release.java | 2 +- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index a38707d0b..d6b99dd7e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,13 +17,35 @@ specific language governing permissions and limitations under the License. --> +**2023-11-19 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.12.2-git-08_ + +* `AttachmentServlet` now respects `jspwiki.attachment.forceDownload` pattern and will refuse to inline content matching those extensions + +* Added `.svg` to default `jspwiki.attachment.forceDownload` patterns + +* [JSPWIKI-1184](https://issues.apache.org/jira/browse/JSPWIKI-1184) - Image missing and German text typo + Fixed as suggested by Ulf Dittmer - thanks! + +* Dependency updates +* Apache Parent to 31 +* Commons IO to 2.15.0 +* Commons Text to 1.11.0 +* Jamm to 0.4.0 (closes [#296](https://github.com/apache/jspwiki/pull/296)), thanks to dependabot +* Jetty to 9.4.53.v20231009 (closes [#313](https://github.com/apache/jspwiki/pull/313)), thanks to dependabot +* JUnit to 5.10.1 +* Tika to 2.9.1 +* Tomcat to 9.0.83 +* Maven plugins: clean to 3.3.2, dependency to 3.6.1, javadoc to 3.6.2, jxr to 3.3.1, surefire to 3.2.2, sonar to 3.10.0.2594 (closes [#308](https://github.com/apache/jspwiki/pull/308), thanks to dependabot) + **2023-10-12 Arturo Bernal (abernal AT apache DOT org)** * _2.12.2-git-07_ Replaced 'size() == 0' with 'isEmpty()' -*2023-10-08 Arturo Bernal (abernal AT apache DOT org)** +**2023-10-08 Arturo Bernal (abernal AT apache DOT org)** * _2.12.2-git-06_ diff --git a/LICENSE b/LICENSE index 9b419a041..6a399276f 100644 --- a/LICENSE +++ b/LICENSE @@ -216,10 +216,10 @@ commons-codec-1.3.jar LICENSE commons-collections-4.4.jar LICENSE commons-fileupload-1.5.jar LICENSE commons-httpclient-3.1.jar LICENSE -commons-io-2.14.0.jar LICENSE +commons-io-2.15.0.jar LICENSE commons-lang-3.13.0.jar LICENSE commons-logging-1.0.4.jar LICENSE -commons-text-1.9.jarLICENSE +commons-text-1.11.0.jar LICENSE ehcache-2.10.9.2.jarLICENSE flexmark-0.64.8.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark flexmark-ext-attributes-0.64.8.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark @@ -272,8 +272,8 @@ oro-2.0.8.jar LICENSE sandler-0.5.jar ./jspwiki-war/src/main/config/doc/LICENSE.sandler slf4-api-1.7.36.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit xercesImpl-2.10.0.jar LICENSE -tika-core-2.8.0.jar LICENSE -tika-parsers-2.8.0.jar LICENSE +tika-core-2.9.1.jar LICENSE +tika-parsers-2.9.1.jar LICENSE xml-apis-1.4.01 LICENSE xmlrpc-2.0.1.jarLICENSE xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LICENSE.cc-cod @@ -285,8 +285,9 @@ commons-el-1.0.jar LICENSE custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl hsqldb-2.7.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb -jetty-all-9.4.51.v20230217.jar LICENSE -junit-5.10.0 ./jspwiki-war/src/main/config/doc/LICENSE.cpl +jamm-0.4.0.jar LICENSE +jetty-all-9.4.53.v20231009.jar LICENSE +junit-5.10.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl mockito-core-5.5.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit stripes-1.7.0-async.jar LICENSE @@ -304,7 +305,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI RESOURCES LICENSE FILE = -Apache Tomcat 9.0
(jspwiki) branch master updated (c37247ab5 -> 84653bf76)
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 c37247ab5 Merge pull request #314 from arturobernalg/isEmpty
new aaf37c166 JSPWIKI-1184: Image missing and German text typo
new d5d66d435 AttachmentServlet now respects
jspwiki.attachment.forceDownload pattern and will refuse to inline content
matching those extensions
new 18f83cf84 Added .svg to default jspwiki.attachment.forceDownload
patterns
new 19d568ff8 Dependency updates
new ef6a509c0 update tomcat portable binaries to 9.0.83
new 84653bf76 2.12.2-git-08
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 | 24 +-
LICENSE| 17 +++--
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../apache/wiki/attachment/AttachmentServlet.java | 18 +
.../src/main/resources/ini/jspwiki.properties | 2 +-
.../main/resources/templates/default_de.properties | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35210 -> 35467 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48967 -> 49610 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3736526 -> 3800076
bytes
.../templates/{210 => default}/images/note.png | Bin
pom.xml| 28 ++---
11 files changed, 62 insertions(+), 31 deletions(-)
rename jspwiki-war/src/main/webapp/templates/{210 => default}/images/note.png
(100%)
(jspwiki) 05/06: update tomcat portable binaries to 9.0.83
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 ef6a509c0dbd9c85b106d3872700db1acfed1cf4 Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Nov 19 22:16:06 2023 +0100 update tomcat portable binaries to 9.0.83 --- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35210 -> 35467 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48967 -> 49610 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3736526 -> 3800076 bytes 3 files changed, 0 insertions(+), 0 deletions(-) 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 926756fc1..22efd7e56 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 7ddbaa151..0d835b140 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 62fbf8f54..f38d34f82 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
(jspwiki) 04/06: Dependency updates
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 19d568ff812d9661065f0476c78f33f86f5c4533
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun Nov 19 22:14:17 2023 +0100
Dependency updates
* Apache Parent to 31
* Commons IO to 2.15.0
* Commons Text to 1.11.0
* Jamm to 0.4.0
* Jetty to 9.4.53.v20231009
* JUnit to 5.10.1
* Tika to 2.9.1
* Tomcat to 9.0.83
* Maven plugins: clean to 3.3.2, dependency to 3.6.1, javadoc to 3.6.2, jxr
to 3.3.1, surefire to 3.2.2, sonar to 3.10.0.2594
closes #296, thanks to dependabot
closes #308, thanks to dependabot
closes #313, thanks to dependabot
---
pom.xml | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1dfa3aee4..6deed41f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache
apache
-30
+31
org.apache.jspwiki
@@ -50,24 +50,24 @@
4.4
1.5
3.1
-2.14.0
+2.15.0
3.13.0
-1.10.0
+1.11.0
2.10.9.2
0.64.8
0.60
2.10.1
2.7.2
-0.3.3
+0.4.0
2.0.0
1.2
1.4.7
2.3.3
3.1.0
2.0.6
-9.4.51.v20230217
+9.4.53.v20231009
0.4.2
-5.10.0
+5.10.1
2.20.0
9.8.0
5.5.0
@@ -77,27 +77,27 @@
6.19.0
1.7.36
1.7.0-async-beta
-2.8.0
-9.0.80
+2.9.1
+9.0.83
1.8.0
2.0.1
3.1.0
3.6.0
-3.3.1
+3.3.2
3.11.0
-3.6.0
+3.6.1
3.4.1
3.1.1
3.3.0
-3.6.0
-3.3.0
+3.6.2
+3.3.1
3.4.5
3.0.1
3.1.0
3.3.1
3.3.0
-3.1.2
+3.2.2
1.2.1
3.4.0
1.4.3
@@ -107,7 +107,7 @@
1.10.9
2.8
2.7
-3.9.1.2184
+3.10.0.2594
0.1
1.0.0
${jdk.version}
(jspwiki) 03/06: Added .svg to default jspwiki.attachment.forceDownload patterns
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 18f83cf84e5df9f192adfe578557b3cc6dd1f03a Author: Juan Pablo Santos Rodríguez AuthorDate: Sun Nov 19 22:08:40 2023 +0100 Added .svg to default jspwiki.attachment.forceDownload patterns --- jspwiki-main/src/main/resources/ini/jspwiki.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties index 228fdcb6e..297191d95 100644 --- a/jspwiki-main/src/main/resources/ini/jspwiki.properties +++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties @@ -181,7 +181,7 @@ jspwiki.attachment.provider = BasicAttachmentProvider #jspwiki.attachment.forbidden=.html .htm .php .asp .exe # Attachment links to HTML, HTM and JS files will force a download rather than opening the attachment -jspwiki.attachment.forceDownload= .html .htm .js +jspwiki.attachment.forceDownload= .html .htm .js .svg # # page Diff Representation
(jspwiki) 02/06: AttachmentServlet now respects jspwiki.attachment.forceDownload pattern and will refuse to inline content matching those extensions
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 d5d66d435dbccb79d6b2355f2aebe82cd4f133fc
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sun Nov 19 22:06:56 2023 +0100
AttachmentServlet now respects jspwiki.attachment.forceDownload pattern and
will refuse to inline content matching those extensions
---
.../org/apache/wiki/attachment/AttachmentServlet.java | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
index 47561c9e1..1e6375437 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
@@ -218,11 +218,8 @@ public class AttachmentServlet extends HttpServlet {
final String mimetype = getMimeType( context,
att.getFileName() );
res.setContentType( mimetype );
-//
-// We use 'inline' instead of 'attachment' so that user agents
-// can try to automatically open the file.
-//
-res.addHeader( "Content-Disposition", "inline; filename=\"" +
att.getFileName() + "\";" );
+final String contentDisposition = getContentDisposition( att );
+res.addHeader( "Content-Disposition", contentDisposition );
res.addDateHeader("Last-Modified",att.getLastModified().getTime());
if( !att.isCacheable() ) {
@@ -286,6 +283,17 @@ public class AttachmentServlet extends HttpServlet {
}
}
+String getContentDisposition( final Attachment att ) {
+// We use 'inline' instead of 'attachment' so that user agents can try
to automatically open the file,
+// except those cases in which we want to enforce the file download.
+String contentDisposition = "inline; filename=\"";
+if( m_engine.getManager( AttachmentManager.class ).forceDownload(
att.getFileName() ) ) {
+contentDisposition = "attachment; filename=\"";
+}
+contentDisposition += att.getFileName() + "\";";
+return contentDisposition;
+}
+
void sendError( final HttpServletResponse res, final String message )
throws IOException {
try {
res.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
message );
[jspwiki-asf-docs] branch master updated: [DRAFT] board report for 2023/10
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new cf7af6a [DRAFT] board report for 2023/10 cf7af6a is described below commit cf7af6a7614c174f492c3a3a0f9c5f8c2d3e9e07 Author: Juan Pablo Santos Rodríguez AuthorDate: Mon Oct 9 12:52:08 2023 +0200 [DRAFT] board report for 2023/10 --- board-reports/2023-10.txt | 34 ++ 1 file changed, 34 insertions(+) diff --git a/board-reports/2023-10.txt b/board-reports/2023-10.txt new file mode 100755 index 000..184e9f5 --- /dev/null +++ b/board-reports/2023-10.txt @@ -0,0 +1,34 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Project Status: +Current project status: Ongoing, with low activity. +Issues for the board: There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (10 years ago) +There are currently 15 committers and 9 PMC members in this project. +The Committer-to-PMC ratio is 5:3. + +Community changes, past quarter: +- Arturo Bernal was added to the PMC on 2023-06-21 +- Arturo Bernal was added as committer on 2023-06-21 + +## Project Activity: +2.12.1 release happened this quarter, which fixed the workflow approval area, +which wasn't working as expected since a lot of releases, upgraded bundled +dependencies and defaulted jspwiki working directory to +$javax.servlet.context.tempdir if it existed. + +We are having talks about incoming 2.12.2, trying to catch on with our +stated release train. + + +## Community Health: +Work on latest master shows commits from 3 different commiters. + +Other than that, we got the usual amount of emails (that is, not too much). No +unanswered questions, and there is enough people appearing on the ML and +providing project oversight. \ No newline at end of file
[jspwiki] branch master updated: revert to new default subject lines
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
The following commit(s) were added to refs/heads/master by this push:
new a468244e7 revert to new default subject lines
a468244e7 is described below
commit a468244e78b90f5f0d3bf8aa52481a9be9eca678
Author: Juan Pablo Santos Rodríguez
AuthorDate: Mon Oct 9 12:22:33 2023 +0200
revert to new default subject lines
as per
https://community.apache.org/contributors/ml#configuring-tmailing-lists.hthe-subject-lines-of-the-emails-being-sent
---
.asf.yaml | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index bb17e62fb..e9188cd1b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -27,22 +27,12 @@ github:
- java
- jspwiki
- wiki
- # Attempt to make the auto-generated github emails more easily readable in
email clients.
- custom_subjects:
-new_pr: "[PR] {title} ({repository})"
-close_pr: "Re: [PR] {title} ({repository})"
-comment_pr: "Re: [PR] {title} ({repository})"
-diffcomment: "Re: [PR] {title} ({repository})"
-merge_pr: "Re: [PR] {title} ({repository})"
-new_issue: "[I] {title} ({repository})"
-comment_issue: "Re: [I] {title} ({repository})"
-close_issue: "Re: [I] {title} ({repository})"
-catchall: "[GH] {title} ({repository})"
notifications:
- commits: commits@jspwiki.apache.org
- issues: d...@jspwiki.apache.org
- pullrequests_status: d...@jspwiki.apache.org
- pullrequests_comment: d...@jspwiki.apache.org
+ commits: commits@jspwiki.apache.org
+ discussions: d...@jspwiki.apache.org
+ issues: d...@jspwiki.apache.org
+ jobs: d...@jspwiki.apache.org
+ pullrequests: d...@jspwiki.apache.org
# Send dependabot PRs to commits@ instead
pullrequests_bot_dependabot: commits@jspwiki.apache.org
\ No newline at end of file
[jspwiki] branch master updated (41f558601 -> f9cc0c8a1)
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 41f558601 Merge pull request #310 from arturobernalg/JSPWIKI-1181 add cdd36ac22 update kendra to 1.12.565 add ed406bc16 fix failing test under windows os add 9f81a345e update portable binaries to tomcat 9.0.80 add a295baf2b update LICENSE file add 777ac8d8d Complete ChangeLog entries add f9cc0c8a1 2.12.2-git-04 No new revisions were added by this update. Summary of changes: ChangeLog.md | 24 ++- LICENSE| 80 ++--- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35211 -> 35210 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48970 -> 48967 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3732220 -> 3736526 bytes .../org/apache/wiki/util/PropertyReaderTest.java | 27 +++ mvn_cheat-sheet.md | 2 +- pom.xml| 14 ++-- 9 files changed, 86 insertions(+), 63 deletions(-)
[jspwiki-asf-docs] branch master updated: Board report for July-to-August meeting
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new 361a874 Board report for July-to-August meeting 361a874 is described below commit 361a874fcfed4cf8745067e546d17a0c4d31381c Author: Juan Pablo Santos Rodríguez AuthorDate: Mon Jul 31 20:38:34 2023 +0200 Board report for July-to-August meeting --- board-reports/2023-08.txt | 35 +++ 1 file changed, 35 insertions(+) diff --git a/board-reports/2023-08.txt b/board-reports/2023-08.txt new file mode 100755 index 000..ae4e115 --- /dev/null +++ b/board-reports/2023-08.txt @@ -0,0 +1,35 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Project Status: +Current project status: Ongoing, with low activity. +Issues for the board: There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (10 years ago) +There are currently 15 committers and 9 PMC members in this project. +The Committer-to-PMC ratio is 5:3. + +Community changes, past quarter: +- Arturo Bernal was added to the PMC on 2023-06-21 +- Arturo Bernal was added as committer on 2023-06-21 + +## Project Activity: +2.12.0 release happened this quarter, which fixed some XSS vulnerabilities and +also uplifted the JDK requirement up to JDK-11. We also got a couple of +vulnerability reports, which were discarded and, after a query on the dev ML, +we realized that the workflow approval area wasn't working as expected since a +lot of releases, so we fixed it and we're preparing a 2.12.1 release. + + +## Community Health: +Most important thing happening in this area, we finally added a PMC/committer +to our roster! After being engaged on the MLs for some time and sending some +PRs, Arturo Bernal joined JSPWiki PMC on June. He'll also be acting as RM for +2.12.1, so that's another positive thing. + +Other than that, we got the usual amount of emails (that is, not too much). No +unanswered questions, and there is enough people appearing on the ML and +providing project oversight. Traffic on dev list reflects mostly PRs movement. \ No newline at end of file
[jspwiki] branch master updated: Serializable class without serialVersionUID
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
The following commit(s) were added to refs/heads/master by this push:
new 6efcd8b15 Serializable class without serialVersionUID
6efcd8b15 is described below
commit 6efcd8b158fba68e0fc62abd3935abc8f59e76d5
Author: Arturo Bernal
AuthorDate: Fri Jun 23 22:30:21 2023 +0200
Serializable class without serialVersionUID
---
jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java | 1 +
.../src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java | 2 ++
.../java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 2 ++
3 files changed, 5 insertions(+)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java
index 43a613aad..8e7cf8292 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CsrfProtectionTag.java
@@ -26,6 +26,7 @@ import org.apache.wiki.http.filter.CsrfProtectionFilter;
*/
public class CsrfProtectionTag extends WikiTagBase {
+private static final long serialVersionUID = -6828306125406112417L;
private boolean meta;
public void setFormat( final String format ) {
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
index 0219d4988..25d66cf1a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SpamFilterInputsTag.java
@@ -32,6 +32,8 @@ import javax.servlet.jsp.PageContext;
*/
public class SpamFilterInputsTag extends WikiTagBase {
+private static final long serialVersionUID = -5224949821664626978L;
+
/**
* {@inheritDoc}
*/
diff --git
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
index 18e1ed9c7..e8feb4e5e 100644
---
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
+++
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
@@ -366,6 +366,8 @@ public class XHtmlElementToWikiTranslator {
private class PreDeque extends ArrayDeque< String > {
+private static final long serialVersionUID = 2401529529970187649L;
+
@Override
public void addFirst( final String item ) {
super.addFirst( item );
[jspwiki] branch master updated: Use placeholders in the logger message.
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
The following commit(s) were added to refs/heads/master by this push:
new 6781b97a3 Use placeholders in the logger message.
6781b97a3 is described below
commit 6781b97a36c497fdbcb9ae7b0dbdee89c0aeaa93
Author: Arturo Bernal
AuthorDate: Fri Jun 23 22:20:16 2023 +0200
Use placeholders in the logger message.
---
.../main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
index 3d6c2ed97..fccf6c1cb 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
@@ -112,7 +112,7 @@ public class DefaultGroupManager implements GroupManager,
Authorizer, WikiEventL
if( dbClassName == null ) {
dbClassName = XMLGroupDatabase.class.getName();
}
-LOG.info( "Attempting to load group database class {}" +
dbClassName );
+LOG.info( "Attempting to load group database class {}",
dbClassName );
m_groupDatabase = ClassUtil.buildInstance(
"org.apache.wiki.auth.authorize", dbClassName );
m_groupDatabase.initialize( m_engine, m_engine.getWikiProperties()
);
LOG.info( "Group database initialized." );
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index 3a3720c54..8e8ea9ac7 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -412,7 +412,7 @@ public final class MailUtil {
final Context ctx = (Context) initCtx.lookup( JAVA_COMP_ENV );
session = (Session) ctx.lookup( jndiName );
} catch( final NamingException e ) {
-LOG.warn( "JNDI mail session initialization error: {}" +
e.getMessage() );
+LOG.warn( "JNDI mail session initialization error: {}",
e.getMessage() );
throw e;
}
LOG.debug( "mail session obtained from JNDI mail factory: {}",
jndiName );
[jspwiki] branch master updated: Constant charset String literal (for example, "UTF-8") can be replaced with the predefined StandardCharsets.UTF_8 code. The code after the fix may work faster, because
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
The following commit(s) were added to refs/heads/master by this push:
new f364625fe Constant charset String literal (for example, "UTF-8") can
be replaced with the predefined StandardCharsets.UTF_8 code. The code after the
fix may work faster, because the charset lookup becomes unnecessary. Also,
catching UnsupportedEncodingException may become unnecessary as well. In this
case, the catch block will be removed automatically.
f364625fe is described below
commit f364625fe668456af09dd855c6d2d5af477c7e08
Author: Arturo Bernal
AuthorDate: Fri Jun 23 22:15:48 2023 +0200
Constant charset String literal (for example, "UTF-8") can be replaced with
the predefined StandardCharsets.UTF_8 code.
The code after the fix may work faster, because the charset lookup becomes
unnecessary. Also, catching UnsupportedEncodingException may become unnecessary
as well. In this case, the catch block will be removed automatically.
---
.../wiki/parser/CreoleToJSPWikiTranslator.java | 7 +---
.../main/java/org/apache/wiki/tags/CookieTag.java | 23 ++---
.../apache/wiki/htmltowiki/XHtmlToWikiConfig.java | 40 ++
3 files changed, 22 insertions(+), 48 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
index a073a8704..59021824e 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
@@ -503,7 +503,7 @@ public class CreoleToJSPWikiTranslator
{
final MessageDigest digest = MessageDigest.getInstance("MD5");
digest.reset();
-
digest.update(protectedMarkup.getBytes(StandardCharsets.UTF_8.name()));
+
digest.update(protectedMarkup.getBytes(StandardCharsets.UTF_8));
final String hash = bytesToHash(digest.digest());
matcher.appendReplacement(result, hash);
c_protectionMap.put(hash, protectedMarkup);
@@ -514,11 +514,6 @@ public class CreoleToJSPWikiTranslator
// FIXME: Should log properly
e.printStackTrace();
}
-catch (final UnsupportedEncodingException e)
-{
-// FIXME: Auto-generated catch block
-e.printStackTrace();
-}
}
matcher.appendTail(result);
return result.toString();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
index d41c3e647..803f0189c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
@@ -379,16 +379,7 @@ public class CookieTag
*/
private String encode(final String nvp )
{
-String coded = "";
-try
-{
-coded = URLEncoder.encode( nvp, StandardCharsets.UTF_8.name() );
-}
-catch( final UnsupportedEncodingException e )
-{
-/* never happens */
-LOG.info( "Failed to encode UTF-8", e );
-}
+final String coded = URLEncoder.encode( nvp, StandardCharsets.UTF_8 );
return coded.replaceAll( "\\+", "%20" );
}
@@ -399,16 +390,8 @@ public class CookieTag
private String decode(final String envp )
{
final String rval;
-try
-{
-rval = URLDecoder.decode( envp , StandardCharsets.UTF_8.name() );
-return rval;
-}
-catch( final UnsupportedEncodingException e )
-{
-LOG.error( "Failed to decode cookie", e );
-return envp;
-}
+rval = URLDecoder.decode( envp , StandardCharsets.UTF_8);
+return rval;
}
/**
diff --git
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
index c2600d8cf..08e0a8f6e 100644
---
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
+++
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java
@@ -186,30 +186,26 @@ public class XHtmlToWikiConfig {
if( ref == null ) {
return null;
}
-try {
-ref = URLDecoder.decode( ref, StandardCharsets.UTF_8.name() );
-ref = ref.trim();
-if( ref.startsWith( getAttachPage() ) ) {
-ref = ref.substring( getAttachPage().length() );
-}
-
[jspwiki] branch master updated (4cc284eea -> f1cb2f633)
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 4cc284eea java 11 improvements. add f1cb2f633 [JSPWIKI-1172] Improve PropertyReader and Installer for workDir setup No new revisions were added by this update. Summary of changes: .../java/org/apache/wiki/api/spi/WikiTest.java | 2 +- .../WikiBootstrapServletContextListener.java | 3 +- .../WikiBootstrapServletContextListenerTest.java | 5 ++-- .../src/main/java/org/apache/wiki/WikiEngine.java | 3 -- .../main/java/org/apache/wiki/ui/Installer.java| 3 +- jspwiki-util/pom.xml | 7 + .../java/org/apache/wiki/util/PropertyReader.java | 32 ++ .../org/apache/wiki/util/PropertyReaderTest.java | 31 + 8 files changed, 78 insertions(+), 8 deletions(-)
[jspwiki] branch master updated: java 11 improvements.
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
The following commit(s) were added to refs/heads/master by this push:
new 4cc284eea java 11 improvements.
4cc284eea is described below
commit 4cc284eea9870af3c26af5230bea6470d83e6bb0
Author: Arturo Bernal
AuthorDate: Sat May 6 23:34:32 2023 +0200
java 11 improvements.
---
.../apache/wiki/filters/DefaultFilterManager.java | 13 +++--
.../wiki/parser/CreoleToJSPWikiTranslator.java | 5 +
.../java/org/apache/wiki/plugin/InsertPage.java| 7 ++-
.../wiki/render/DefaultRenderingManager.java | 7 ++-
.../org/apache/wiki/rss/DefaultRSSGenerator.java | 7 ++-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 4 +---
.../markdown/renderer/JSPWikiLinkRenderer.java | 22 +++---
7 files changed, 22 insertions(+), 43 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
index 24c2b8c64..a427dccdc 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
@@ -42,6 +42,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
@@ -162,22 +163,14 @@ public class DefaultFilterManager extends
BaseModuleManager implements FilterMan
if( m_engine.getServletContext() != null ) {
LOG.debug( "Attempting to locate " + DEFAULT_XMLFILE + " from
servlet context." );
-if( xmlFile == null ) {
-xmlStream =
m_engine.getServletContext().getResourceAsStream( DEFAULT_XMLFILE );
-} else {
-xmlStream =
m_engine.getServletContext().getResourceAsStream( xmlFile );
-}
+xmlStream =
m_engine.getServletContext().getResourceAsStream(Objects.requireNonNullElse(xmlFile,
DEFAULT_XMLFILE));
}
if( xmlStream == null ) {
// just a fallback element to the old behaviour prior to 2.5.8
LOG.debug( "Attempting to locate filters.xml from class path."
);
-if( xmlFile == null ) {
-xmlStream = getClass().getResourceAsStream( "/filters.xml"
);
-} else {
-xmlStream = getClass().getResourceAsStream( xmlFile );
-}
+xmlStream =
getClass().getResourceAsStream(Objects.requireNonNullElse(xmlFile,
"/filters.xml"));
}
if( (xmlStream == null) && (xmlFile != null) ) {
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
index 32ce273b1..a073a8704 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
@@ -295,10 +295,7 @@ public class CreoleToJSPWikiTranslator
}
if ((inList == -1 && counter != 1) || (inList != -1 && inList + 1
< counter))
{
-for (int c = 0; c < counter; c++)
-{
-result.append(actSourceSymbol);
-}
+result.append(actSourceSymbol.repeat(Math.max(0, counter)));
inList = -1;
}
else
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
index fa192e5d8..159abf0ed 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
@@ -36,6 +36,7 @@ import org.apache.wiki.util.TextUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.ResourceBundle;
@@ -109,11 +110,7 @@ public class InsertPage implements Plugin {
final Page page;
try {
final String pageName = engine.getFinalPageName( includedPage
);
-if( pageName != null ) {
-page = engine.getManager( PageManager.class ).getPage(
pageName );
-} else {
-page = engine.getManager( PageManager.class ).getPage(
includedPage );
-}
+page =
engine.getManager(PageManager.class).getPage(Objects.requireNonNullElse(pageName,
includedPage));
} catch( final ProviderException e
[jspwiki] branch master updated (96b6b3f67 -> 5d78b49c6)
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 96b6b3f67 Remove unnecessary import add ef8e6003e Update dependencies add b9b841dbd update dependencies add e2cb24bea update tomcat's portable binaries add 5d78b49c6 2.12.1-git-02 No new revisions were added by this update. Summary of changes: ChangeLog.md | 22 + LICENSE| 26 ++--- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35212 -> 35211 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48970 -> 48970 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3725160 -> 3732220 bytes pom.xml| 18 +++--- 7 files changed, 45 insertions(+), 23 deletions(-)
[jspwiki] annotated tag 2.12.0 updated (b1e0ee3da -> f22f0a727)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to annotated tag 2.12.0 in repository https://gitbox.apache.org/repos/asf/jspwiki.git *** WARNING: tag 2.12.0 was modified! *** from b1e0ee3da (commit) to f22f0a727 (tag) tagging cbc1fc9f7fa5a77cbd10eadda18baaaf04cf2290 (tag) length 205 bytes by Juan Pablo Santos Rodríguez on Wed Jun 21 22:18:22 2023 +0200 - Log - 2.12.0 --- No new revisions were added by this update. Summary of changes:
[jspwiki] branch master updated: Remove unnecessary import
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 The following commit(s) were added to refs/heads/master by this push: new 96b6b3f67 Remove unnecessary import 96b6b3f67 is described below commit 96b6b3f67c5915bac9c77bcd81fe5529d9b9e06b Author: Arturo Bernal AuthorDate: Fri Jun 9 23:34:03 2023 +0200 Remove unnecessary import --- jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java | 1 - jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java | 1 - .../java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java | 1 - .../src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java | 1 - jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java | 2 -- jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java | 1 - jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java | 1 - jspwiki-main/src/main/java/org/apache/wiki/tags/UserProfileTag.java | 1 - 8 files changed, 9 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java index c161cf6e7..7f91a5122 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java @@ -42,7 +42,6 @@ import javax.security.auth.Subject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.security.Principal; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashSet; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java index dee79f4ad..dc7e082e1 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java @@ -33,7 +33,6 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; import java.security.Principal; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Map; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java index 5a7724ddb..f432f0a77 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java @@ -40,7 +40,6 @@ import java.io.IOException; import java.net.URL; import java.security.Principal; import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.Set; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java index 42352ee2b..8c5a7631c 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java @@ -23,7 +23,6 @@ import java.security.AccessControlContext; import java.security.AccessController; import java.security.DomainCombiner; import java.security.Permission; -import java.security.Principal; import java.util.Arrays; import java.util.Set; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java index 77ed0d7e8..acd4430e4 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java @@ -28,8 +28,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; /** * This class is an example of how to have a simple filter. It removes diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java index 16aea1466..dac3e762c 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java @@ -34,7 +34,6 @@ import org.jdom2.Namespace; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorTag.java index 3f10b9b44
[jspwiki] branch master updated (37bf55373 -> 4645cff2d)
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 37bf55373 [maven-release-plugin] prepare for next development iteration add fed7e6601 Fix workflow screen add 04d7511b4 update tomcat portable binaries to 9.0.76 add 37c100da5 Snapshots are automatically deployed as part of the Jenkinsfile build add 4645cff2d 2.12.1-git-01 No new revisions were added by this update. Summary of changes: ChangeLog.md | 18 Jenkinsfile| 8 +++- LICENSE| 46 ++--- .../src/main/java/org/apache/wiki/api/Release.java | 6 +-- .../wiki/workflow/DefaultWorkflowManager.java | 10 + .../org/apache/wiki/workflow/WorkflowManager.java | 8 .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35213 -> 35212 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48970 -> 48970 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3695338 -> 3725160 bytes jspwiki-war/src/main/webapp/Workflow.jsp | 9 ++-- .../main/webapp/templates/210/WorkflowContent.jsp | 6 +-- .../webapp/templates/default/WorkflowContent.jsp | 6 +-- pom.xml| 30 +++--- 13 files changed, 94 insertions(+), 53 deletions(-)
[jspwiki-site] branch jbake updated: CVE-2022-46907
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 The following commit(s) were added to refs/heads/jbake by this push: new 0ef51c49ea CVE-2022-46907 0ef51c49ea is described below commit 0ef51c49ea322c59c6e65f3778878f7c707bd9d7 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed May 24 22:45:46 2023 +0200 CVE-2022-46907 --- src/main/jbake/content/general/news.md | 3 +++ src/main/jbake/content/index.md| 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/jbake/content/general/news.md b/src/main/jbake/content/general/news.md index c888f6f201..b8f1d61c8f 100755 --- a/src/main/jbake/content/general/news.md +++ b/src/main/jbake/content/general/news.md @@ -6,6 +6,8 @@ type=page ## Project News + * **24-May-2023**: Apache JSPWiki [CVE-2022-46907][] vulnerability disclosure + * **23-May-2023:** Official [Apache JSPWiki 2.12.0 release][] is out! * **02-Aug-2022:** Official [Apache JSPWiki 2.11.3 release][] is out! @@ -126,4 +128,5 @@ type=page [CVE-2021-44140]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2021-44140 [CVE-2022-24947]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-24947 [CVE-2022-24948]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-24948 +[CVE-2022-46907]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-46907 [Apache Log4J's CVE-2021-44228][]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Log4J-CVE-2021-44228 \ No newline at end of file diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md index e61c6af930..608ed0ba9b 100755 --- a/src/main/jbake/content/index.md +++ b/src/main/jbake/content/index.md @@ -28,6 +28,8 @@ JSPWiki is open-source software that is released under the Apache Public License ## Project status + * **24-May-2023**: Apache JSPWiki [CVE-2022-46907][] vulnerability disclosure + * **23-May-2023:** Official [Apache JSPWiki 2.12.0 release][] is out! * **02-Aug-2022:** Apache JSPWiki [CVE-2022-27166][], [CVE-2022-28730][], [CVE-2022-28731][], [CVE-2022-28732][] and [CVE-2022-34158][] vulnerability disclosures @@ -40,8 +42,6 @@ JSPWiki is open-source software that is released under the Apache Public License * **18-Dec-2021:** Official [Apache JSPWiki 2.11.1 release][] is out! - * **13-Dec-2021:** Apache JSPWiki affected by [Apache Log4J's CVE-2021-44228][] - [Apache JSPWiki]: https://jspwiki.apache.org [WikiWiki]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiWiki [JEE]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JEE @@ -66,4 +66,4 @@ JSPWiki is open-source software that is released under the Apache Public License [CVE-2022-28731]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-28731 [CVE-2022-28732]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-28732 [CVE-2022-34158]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-34158 -[Apache Log4J's CVE-2021-44228]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Log4J-CVE-2021-44228 +[CVE-2022-46907]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2022-46907
