You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2024/09/26 21:34:43 UTC
(jspwiki) branch master updated (5eeb34041 -> 7bf665751)
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 5eeb34041 minor change to use the os utils class commons-lang3 that was already in the classpath
new 9073db5b8 jspwiki.attachment.forceDownload now accepts * as a way to always enforce attachment download
new abb701cd0 add .pdf and .xml extensions to jspwiki.attachment.forceDownload default value
new 008c9f7f3 Dependency updates, closes #353, closes #364, closes #365
new e438af054 Update portable binaries + provide working URLs to download launch4j files
new 7bf665751 2.12.3-git-02
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 | 25 ++++++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../wiki/attachment/DefaultAttachmentManager.java | 5 ++--
.../src/main/resources/ini/jspwiki.properties | 18 ++++++------
jspwiki-portable/build.xml | 4 +--
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35451 -> 35459 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49608 -> 49610 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3821398 -> 3831321 bytes
pom.xml | 32 ++++++++++-----------
9 files changed, 56 insertions(+), 30 deletions(-)
(jspwiki) 03/05: Dependency updates, closes #353, closes #364, closes #365
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 008c9f7f3f390980ce38ce74c6e147d6107c155e
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Sep 26 23:33:09 2024 +0200
Dependency updates, closes #353, closes #364, closes #365
---
pom.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28792fad4..6a2ddbc20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>32</version>
+ <version>33</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
@@ -41,7 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2024-06-12T19:47:50Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases -->
<jdk.version>11</jdk.version>
- <jdk.javadoc.doclet.version>2.1.2</jdk.javadoc.doclet.version>
+ <jdk.javadoc.doclet.version>2.2.0</jdk.javadoc.doclet.version>
<maven.version>3.5</maven.version>
<akismet-java.version>1.02</akismet-java.version>
@@ -51,7 +51,7 @@
<commons-fileupload.version>1.5</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.16.1</commons-io.version>
- <commons-lang.version>3.14.0</commons-lang.version>
+ <commons-lang.version>3.17.0</commons-lang.version>
<commons-text.version>1.12.0</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
<flexmark.version>0.64.8</flexmark.version>
@@ -67,9 +67,9 @@
<jdom2.version>2.0.6</jdom2.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
- <junit.version>5.10.2</junit.version>
- <log4j2.version>2.23.1</log4j2.version>
- <lucene.version>9.11.0</lucene.version>
+ <junit.version>5.11.1</junit.version>
+ <log4j2.version>2.24.0</log4j2.version>
+ <lucene.version>9.11.1</lucene.version>
<mockito.version>5.12.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
@@ -78,7 +78,7 @@
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.9.2</tika.version>
- <tomcat.version>9.0.90</tomcat.version>
+ <tomcat.version>9.0.95</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
@@ -86,25 +86,25 @@
<plugin.assembly.version>3.7.1</plugin.assembly.version>
<plugin.clean.version>3.4.0</plugin.clean.version>
<plugin.compiler.version>3.13.0</plugin.compiler.version>
- <plugin.dependency.version>3.7.1</plugin.dependency.version>
+ <plugin.dependency.version>3.8.0</plugin.dependency.version>
<plugin.enforcer.version>3.5.0</plugin.enforcer.version>
- <plugin.install.version>3.1.2</plugin.install.version>
+ <plugin.install.version>3.1.3</plugin.install.version>
<plugin.jar.version>3.4.2</plugin.jar.version>
- <plugin.javadoc.version>3.7.0</plugin.javadoc.version>
- <plugin.jxr.version>3.4.0</plugin.jxr.version>
- <plugin.project-info-reports.version>3.6.1</plugin.project-info-reports.version>
- <plugin.release.version>3.1.0</plugin.release.version>
+ <plugin.javadoc.version>3.10.0</plugin.javadoc.version>
+ <plugin.jxr.version>3.5.0</plugin.jxr.version>
+ <plugin.project-info-reports.version>3.7.0</plugin.project-info-reports.version>
+ <plugin.release.version>3.1.1</plugin.release.version>
<plugin.remote-resources.version>3.2.0</plugin.remote-resources.version>
<plugin.resources.version>3.3.1</plugin.resources.version>
<plugin.source.version>3.3.1</plugin.source.version>
- <plugin.surefire.version>3.3.0</plugin.surefire.version>
- <plugin.surefire.junit5-tree-reporter.version>1.2.1</plugin.surefire.junit5-tree-reporter.version>
+ <plugin.surefire.version>3.5.0</plugin.surefire.version>
+ <plugin.surefire.junit5-tree-reporter.version>1.3.0</plugin.surefire.junit5-tree-reporter.version>
<plugin.war.version>3.4.0</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
<plugin.jspc.version>3.2.2</plugin.jspc.version>
<plugin.checksum.version>1.11</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
- <plugin.cargo.version>1.10.13</plugin.cargo.version>
+ <plugin.cargo.version>1.10.15</plugin.cargo.version>
<plugin.clirr.version>2.8</plugin.clirr.version>
<plugin.cobertura.version>2.7</plugin.cobertura.version>
<plugin.cyclonedx.version>2.8.0</plugin.cyclonedx.version>
(jspwiki) 04/05: Update portable binaries + provide working URLs to download launch4j files
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit e438af054b83df96e416eea20e726f21ada47d37
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Sep 26 23:33:58 2024 +0200
Update portable binaries + provide working URLs to download launch4j files
---
jspwiki-portable/build.xml | 4 ++--
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35451 -> 35459 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49608 -> 49610 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3821398 -> 3831321 bytes
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index b8758553a..1d50df3f9 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -225,7 +225,7 @@
<target name="woas:download-launch4j-for-win" description="Download the Win32 launch4j distribution">
<delete dir="${jspwiki.launch4j.install.dir}"/>
<mkdir dir="${jspwiki.launch4j.install.dir}"/>
- <get src="https://netix.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-win32.zip" dest="${jspwiki.launch4j.install.dir}"/>
+ <get src="https://altushost-swe.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-win32.zip?viasf=1" dest="${jspwiki.launch4j.install.dir}"/>
<unzip src="${jspwiki.launch4j.install.dir}/launch4j-3.14-win32.zip" dest="${jspwiki.launch4j.install.dir}/.."/>
<delete file="${jspwiki.launch4j.install.dir}/launch4j-3.14-win32.zip"/>
</target>
@@ -233,7 +233,7 @@
<target name="woas:download-launch4j-for-mac" description="Download the Mac OS X launch4j distribution">
<delete dir="${jspwiki.launch4j.install.dir}"/>
<mkdir dir="${jspwiki.launch4j.install.dir}"/>
- <get src="https://netix.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}"/>
+ <get src="https://altushost-swe.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-macosx-x86.tgz?viasf=1" dest="${jspwiki.launch4j.install.dir}"/>
<untar src="${jspwiki.launch4j.install.dir}/launch4j-3.14-macosx-x86.tgz" dest="${jspwiki.launch4j.install.dir}/.." compression="gzip"/>
<delete file="${jspwiki.launch4j.install.dir}/launch4j-3.14-macosx-x86.tgz"/>
<chmod dir="${jspwiki.launch4j.install.dir}/bin" includes="*" perm="ugo+x"/>
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 62b1d2441..a88b245d3 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 c289baa9e..641db87d8 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 f2be6c7b1..8b76bf9e4 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
(jspwiki) 02/05: add .pdf and .xml extensions to jspwiki.attachment.forceDownload default value
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit abb701cd04cb404ed1fbd9eefcf03e2d831433e5
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Sep 26 23:31:48 2024 +0200
add .pdf and .xml extensions to jspwiki.attachment.forceDownload default value
---
jspwiki-main/src/main/resources/ini/jspwiki.properties | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties
index 297191d95..d58b43b23 100644
--- a/jspwiki-main/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties
@@ -166,10 +166,10 @@ jspwiki.attachment.provider = BasicAttachmentProvider
#jspwiki.attachment.maxsize=100000
#
-# By default JSPWiki accepts all types of attachments. However, you
+# By default, JSPWiki accepts all types of attachments. However, you
# can allow some types only, or forbid some other types. By default,
# all file types are allowed (if you do not specify the "allow" list
-# at all or it is empty).
+# at all, or it is empty).
# These allow/forbid statements are not enforced for users with AdminPermissions.
#
# These both are space-separated lists of file suffixes
@@ -180,8 +180,9 @@ jspwiki.attachment.provider = BasicAttachmentProvider
# Example: Forbid HTML, PHP, ASP and EXE
#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 .svg
+# Attachment links to HTML, HTM and JS, etc. files will force a download rather than opening the attachment.
+# Set to * to always enforce attachment download
+jspwiki.attachment.forceDownload= .html .htm .js .pdf .svg .xml
#
# page Diff Representation
@@ -199,7 +200,7 @@ jspwiki.attachment.forceDownload= .html .htm .js .svg
# new and not much tested. YMMV.
# * ExternalDiffProvider - uses a system diff program (which
# can be configured using "jspwiki.diffCommand") to
-# create an unified (!) diff.
+# create a unified (!) diff.
#
# Example for a diff command:
# jspwiki.diffCommand = /usr/bin/diff -u %s1 %s2
@@ -221,12 +222,11 @@ jspwiki.refManager = org.apache.wiki.references.DefaultReferenceManager
# to support all languages in your Wiki, you probably want to enable
# this. From JSPWiki 2.2, it is strongly suggested that you use UTF-8.
#
-# Note that you can't switch these in the mean time, since the way the
+# Note that you can't switch these in the meantime, since the way the
# files are encoded on disk is incompatible between ISO-Latin1 and UTF-8.
# Don't try. You'll get all sorts of interesting problems, if you do.
#
-# Possible values are 'ISO-8859-1' (default, if none has been specified)
-# and 'UTF-8'.
+# Possible values are 'ISO-8859-1' and 'UTF-8' (default, if none has been specified).
jspwiki.encoding = UTF-8
@@ -292,7 +292,7 @@ jspwiki.translatorReader.matchEnglishPlurals = true
# known as "CamelCase", or "BumpyCase", or "InterCapping". I personally
# like CamelCase as a word, which is why this property is named as it is :-).
#
-# By default this is false, since traditional WikiLinks may confuse newbies.
+# By default, this is false, since traditional WikiLinks may confuse newbies.
#
# This option can be overridden on a per-page basis using the SET directive.
#
(jspwiki) 05/05: 2.12.3-git-02
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 7bf6657511dfd7224dcabac2482f6171a21276f8
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Sep 26 23:34:20 2024 +0200
2.12.3-git-02
---
ChangeLog.md | 25 ++++++++++++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index ac891eaf6..dcc979882 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,31 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-09-26 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.3-git-02_
+
+* Add `.pdf` and `.xml` to `jspwiki.attachment.forceDownload`, so by default those kind of attachments are downloaded rather than opened in browser
+
+* `jspwiki.attachment.forceDownload` now accepts `*` as a way to always enforce attachment download
+
+* Fix `SampleAjaxPlugin`
+ * Provided in [PR #357](https://github.com/apache/jspwiki/pull/357) by Ulf Dittmer, thanks!
+
+* Fix MBeans when multiple JSPWiki instances are running in a JVM
+ * Provided in [PR #358](https://github.com/apache/jspwiki/pull/358) by Ulf Dittmer, thanks!
+
+* Minor change to use the os utils class commons-lang3 that was already in the classpath
+ * Provided in [PR #363](https://github.com/apache/jspwiki/pull/363) by Alex O'Ree, thanks!
+
+* Dependency updates
+ * Commons Lang to 3.17.0
+ * JUnit to 5.11.1 (closes [PR #365](https://github.com/apache/jspwiki/pull/365), thanks to Dependabot)
+ * Log4J2 to 2.24.0
+ * Lucene to 9.11.1 (closes [PR #353](https://github.com/apache/jspwiki/pull/353), thanks to Dependabot)
+ * Tomcat to 9.0.95
+ * Maven plugins: dependency to 3.8.0, install to 3.1.3, javadoc to 3.10.0, jxr to 3.5.0, project-info-reports to 3.7.0, release to 3.1.1, surefire to 3.5.0, surefire.junit5-tree-reporter to 1.3.0, umldoclet to 2.2.0, cargo to 1.10.15 (closes [PR #364](https://github.com/apache/jspwiki/pull/364), thanks to Dependabot)
+
**2024-07-07 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.3-git-01_
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index e98d39a60..36064f02e 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "01";
+ public static final String BUILD = "02";
/**
* This is the generic version string you should use when printing out the version. It is of
(jspwiki) 01/05: jspwiki.attachment.forceDownload now accepts * as a way to always enforce attachment download
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 9073db5b81b562c876101018819ba3e120fbe6f2
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Thu Sep 26 23:30:39 2024 +0200
jspwiki.attachment.forceDownload now accepts * as a way to always enforce attachment download
---
.../java/org/apache/wiki/attachment/DefaultAttachmentManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
index 6fb3dd935..027d25142 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
@@ -18,6 +18,7 @@
*/
package org.apache.wiki.attachment;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Attachment;
@@ -102,7 +103,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
}
final String forceDownload = TextUtil.getStringProperty( props, PROP_FORCEDOWNLOAD, null );
- if( forceDownload != null && !forceDownload.isEmpty() ) {
+ if( StringUtils.isNotEmpty( forceDownload ) ) {
m_forceDownloadPatterns = forceDownload.toLowerCase().split( "\\s" );
} else {
m_forceDownloadPatterns = new String[ 0 ];
@@ -210,7 +211,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
}
for( final String forceDownloadPattern : m_forceDownloadPatterns ) {
- if( name.endsWith( forceDownloadPattern ) && !forceDownloadPattern.isEmpty() ) {
+ if( ( name.endsWith( forceDownloadPattern ) && !forceDownloadPattern.isEmpty() ) || "*".equals( forceDownloadPattern ) ) {
return true;
}
}