This is an automated email from the ASF dual-hosted git repository.

mraible pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git

commit f55fc2b14e69ad868e7090ccfeaee3afab8c0253
Merge: edb3d110e 3c8149de6
Author: Matt Raible <[email protected]>
AuthorDate: Sat Nov 14 19:56:41 2026 -0700

    Merge pull request #262 from mraible/jquery-4
    
    Upgrade the admin UI to jQuery 4.0.0

 CHANGES.md                                         |  1 +
 app/pom.xml                                        |  8 +++--
 app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp    |  6 ++--
 .../roller-ui/scripts/jquery4-summernote-compat.js | 39 ++++++++++++++++++++++
 .../main/webapp/roller-ui/scripts/media-library.js |  4 +--
 5 files changed, 51 insertions(+), 7 deletions(-)

diff --cc CHANGES.md
index e89399d13,6f01fe021..5ea137a46
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -147,17 -132,9 +147,18 @@@
  
  ### Build and packaging
  
 +- Apache XML-RPC (`xmlrpc-common`, `xmlrpc-server`) and `ws-commons-util`
 +  are no longer shipped. Apache XML-RPC is end of life, and 3.1.3 has an
 +  unfixed denial-of-service issue (CVE-2016-5004).
 +- Third-party libraries are updated to their latest patch and minor releases,
 +  among them Struts 7.4.0, Spring 7.0.10 and Spring Security 7.1.2. OGNL is
 +  pinned to 3.4.17, which fixes CVE-2026-113730.
 +- **The WAR no longer includes jcl-over-slf4j.** Roller logs through
 +  commons-logging 1.4, which sends everything straight to Log4j. A deployment
 +  that added its own commons-logging bridge should remove it.
  - The source distribution now extracts to `apache-roller-<version>-source/`,
    matching its file name, instead of `roller-weblogger-<version>-source/`.
+ - The admin UI now uses jQuery 4.0.0 and jQuery Validation 1.22.1.
  
  ## 6.1.7
  
diff --cc app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
index 6a24dd9d0,f78b4e050..9c55aee48
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
@@@ -34,10 -34,10 +34,10 @@@ You can override it with your own file 
  <link href="<s:url value='/webjars/jquery-ui/1.14.2/jquery-ui.css' />" 
rel="stylesheet" />
  <script src="<s:url value='/roller-ui/scripts/date-fields.js' />"></script>
  
- <script src="<s:url 
value='/webjars/jquery-validation/1.21.0/jquery.validate.min.js' />"></script>
+ <script src="<s:url 
value='/webjars/jquery-validation/1.22.1/dist/jquery.validate.min.js' 
/>"></script>
  
  <link href="<s:url value='/webjars/bootstrap/5.3.8/css/bootstrap.min.css' />" 
rel="stylesheet" />
 -<link href="<s:url 
value='/webjars/bootstrap-icons/1.13.1/font/bootstrap-icons.css' />" 
rel="stylesheet" />
 +<link href="<s:url 
value='/webjars/bootstrap-icons/1.13.2/font/bootstrap-icons.css' />" 
rel="stylesheet" />
  <script src="<s:url 
value='/webjars/bootstrap/5.3.8/js/bootstrap.bundle.min.js' />"></script>
  
  <script src="<s:url value='/webjars/clipboard.js/2.0.11/clipboard.min.js' 
/>"></script>

Reply via email to