(jspwiki) 02/03: Update tomcat binaries and dependencies

juanpablo Fri, 24 May 2024 14:21:20 -0700

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 <juanpablo.san...@gmail.com>
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.88                        LICENSE
+Apache Tomcat 9.0.89                        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 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 @@
     <ehcache.version>2.10.9.2</ehcache.version>
     <flexmark.version>0.64.8</flexmark.version>
     <freshcookies-security.version>0.60</freshcookies-security.version>
-    <gson.version>2.10.1</gson.version>
+    <gson.version>2.11.0</gson.version>
     <hsqldb.version>2.7.2</hsqldb.version>
     <jamm.version>0.4.0</jamm.version>
     <jaxen.version>2.0.0</jaxen.version>
@@ -70,7 +70,7 @@
     <junit.version>5.10.2</junit.version>
     <log4j2.version>2.23.1</log4j2.version>
     <lucene.version>9.10.0</lucene.version>
-    <mockito.version>5.11.0</mockito.version>
+    <mockito.version>5.12.0</mockito.version>
     <nekohtml.version>2.1.2</nekohtml.version>
     <oro.version>2.0.8</oro.version>
     <sandler.version>0.5</sandler.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.88</tomcat.version>
+    <tomcat.version>9.0.89</tomcat.version>
     <wro4j.version>1.8.0</wro4j.version>
     <xmlrpc.version>2.0.1</xmlrpc.version>

(jspwiki) 02/03: Update tomcat binaries and dependencies

Reply via email to