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 <juanpablo.san...@gmail.com> 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.jar LICENSE -log4j-1.2-api-2.20.0.jar LICENSE -log4j-api-2.20.0.jar LICENSE -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.jar LICENSE -lucene-core-9.9.0.jar LICENSE -lucene-highlighter-9.9.0.jar LICENSE -lucene-memory-9.9.0.jar LICENSE -lucene-queries-9.9.0.jar LICENSE -lucene-queryparser-9.9.0.jar LICENSE -lucene-sandbox-9.9.0.jar LICENSE +log4j-1.2-api-2.23.0.jar LICENSE +log4j-api-2.23.0.jar LICENSE +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.jar LICENSE +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.jar LICENSE 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.jar LICENSE -junit-5.10.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl -mockito-core-5.8.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit +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 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 @@ -305,7 +305,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI RESOURCES LICENSE FILE ============================================================================================================= -Apache Tomcat 9.0.83 LICENSE +Apache Tomcat 9.0.87 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 @@ -313,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.9.1/formats.html \ No newline at end of file +OSS libraries, which can be consulted at https://tika.apache.org/2.9.2/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 b3699e53a..1c6bef6af 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 = "11"; + public static final String BUILD = "12"; /** * This is the generic version string you should use when printing out the version. It is of