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 2021/11/15 23:26:30 UTC
[jspwiki] branch master updated: Update Tomcat to 9.0.55
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 08cca48 Update Tomcat to 9.0.55
08cca48 is described below
commit 08cca489fe802c25f1dc8dcbd7cd08ee0d987539
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Tue Nov 16 00:23:44 2021 +0100
Update Tomcat to 9.0.55
no version bump
---
ChangeLog.md | 3 +++
LICENSE | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34754 -> 34755 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46607 -> 46607 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3674646 -> 3677361 bytes
pom.xml | 2 +-
6 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index c537546..5435210 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -27,9 +27,12 @@ under the License.
* Fixed login when using `CookieAuthenticationLoginModule`, http response was being written after being committed
+* Fixed Dockerfile/JDK8 build
+
* Dependency updates
* cargo-maven2-plugin to cargo-maven3-plugin
* hsqldb to 2.6.1, thanks to dependabot [#151](https://github.com/apache/jspwiki/pull/151)
+ * Tomcat to 9.0.55
**2021-10-28 Juan Pablo Santos (juanpablo AT apache DOT org)**
diff --git a/LICENSE b/LICENSE
index 0f32ccc..5ed8c61 100644
--- a/LICENSE
+++ b/LICENSE
@@ -301,7 +301,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.54 LICENSE
+Apache Tomcat 9.0.55 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
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 4c32ab3..1d10a69 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 163abbf..ea10717 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 433beeb..503887e 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 2053021..7e6f7d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<slf4j.version>1.7.32</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.1.0</tika.version>
- <tomcat.version>9.0.54</tomcat.version>
+ <tomcat.version>9.0.55</tomcat.version>
<wro4j.version>1.8.0</wro4j.version> <!-- 1.9.0 and above require JDK >= 9 to execute -->
<xmlrpc.version>2.0.1</xmlrpc.version>