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 <[email protected]> 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.jar LICENSE +commons-text-1.11.0.jar LICENSE ehcache-2.10.9.2.jar LICENSE 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.jar LICENSE 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.80 LICENSE +Apache Tomcat 9.0.83 LICENSE 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 @@ -312,4 +313,4 @@ SilkIconSet ./jspwiki-war/src/main/config/doc/LI OTHER ============================================================================================================= While not bundled by default, Apache Tika extracts content from a lot of different file formats using several -OSS libraries, which can be consulted at https://tika.apache.org/2.8.0/formats.html \ No newline at end of file +OSS libraries, which can be consulted at https://tika.apache.org/2.9.1/formats.html \ No newline at end of file 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 025ec3294..b96bcaa45 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 = "07"; + public static final String BUILD = "08"; /** * This is the generic version string you should use when printing out the version. It is of
