From d5c34511b9b968e651d42bad8a4410a1323039b0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 7 Feb 2025 14:42:51 +0000 Subject: [PATCH 1/3] Update dependency uikit to v3 --- package-lock.json | 17 +++++------------ package.json | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17857c6e..66609a5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "jquery": "3.7.1", "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4", "js-md5": "0.8.3", - "uikit": "2.27.4" + "uikit": "3.23.0" }, "devDependencies": { "browserify": "17.0.1", @@ -3732,11 +3732,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/node-promise": { - "version": "0.5.14", - "resolved": "https://registry.npmjs.org/node-promise/-/node-promise-0.5.14.tgz", - "integrity": "sha512-kbd+ABY2XRdByRVHPcBDemymfNL8+msGyKNxG/ziZnh9RjneuuGQl3/CE5UkNWxCInkJS+ztc5B31/t2kIO4Yw==" - }, "node_modules/nopt": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.0.0.tgz", @@ -5594,12 +5589,10 @@ } }, "node_modules/uikit": { - "version": "2.27.4", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-2.27.4.tgz", - "integrity": "sha512-dylNikIJ8sB6Sd1AP6YETb+R5bIkjTnGeuu/yLhO9elQ4oLu8CIA+u5zCC7a9m7axbDUALy12qr32nvgRyO5HA==", - "dependencies": { - "node-promise": "^0.5.10" - } + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.23.0.tgz", + "integrity": "sha512-8lPL2pzmtvDga1wVnHOKpyG1vL1d68hSYLwu7eHmtY0s+1h6v/J+f9vKvW9EBW5mRbyirOanq+4DgE0ybcDemw==", + "license": "MIT" }, "node_modules/umd": { "version": "3.0.3", diff --git a/package.json b/package.json index bb49a3e2..13d383e1 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "jquery": "3.7.1", "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4", "js-md5": "0.8.3", - "uikit": "2.27.4" + "uikit": "3.23.0" }, "devDependencies": { "browserify": "17.0.1", From 12023e23e0ed3464c56dd22436abdf3b889686fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 15 Feb 2025 21:02:14 +0100 Subject: [PATCH 2/3] Fix issue with modern Servlet API --- code/Root/Root.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/code/Root/Root.js b/code/Root/Root.js index 0b8a71c8..0207fea6 100644 --- a/code/Root/Root.js +++ b/code/Root/Root.js @@ -254,9 +254,18 @@ Root.prototype.sitemap_xml_action = function() { } Root.prototype.health_action = function() { - var jvm = java.lang.Runtime.getRuntime(); - var totalMemory = jvm.totalMemory() / 1024 / 1024; - var freeMemory = jvm.freeMemory() / 1024 / 1024; + const jvm = java.lang.Runtime.getRuntime(); + const totalMemory = jvm.totalMemory() / 1024 / 1024; + const freeMemory = jvm.freeMemory() / 1024 / 1024; + let servletApi; + + try { + const getJavaClass = Packages.java.lang.Class.forName; + servletApi = getJavaClass('jakarta.servlet.Servlet'); + } catch { + // Fall back to older Servlet API + servletApi = getJavaClass('javax.servlet.Servlet'); + } var param = { uptime: formatNumber((new Date - app.upSince.getTime()) / Date.ONEDAY, '0.##'), @@ -270,7 +279,7 @@ Root.prototype.health_action = function() { helmaCommitHash: Packages.helma.main.Server.server.commitHash, jetty: Packages.org.eclipse.jetty.util.Jetty.VERSION, rhino: Packages.org.mozilla.javascript.ImplementationVersion.get(), - servlet: Packages.java.lang.Class.forName('javax.servlet.Servlet').package.specificationVersion, + servlet: servletApi.package.specificationVersion, java: java.lang.System.getProperty('java.version') }; From ef56d0e397e79b217ec396bd2af9b9a9942b23f6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 22 Feb 2025 10:42:50 +0000 Subject: [PATCH 3/3] Update dependency uikit to v3 --- package-lock.json | 17 +++++------------ package.json | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17857c6e..d67db4f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "jquery": "3.7.1", "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4", "js-md5": "0.8.3", - "uikit": "2.27.4" + "uikit": "3.23.1" }, "devDependencies": { "browserify": "17.0.1", @@ -3732,11 +3732,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/node-promise": { - "version": "0.5.14", - "resolved": "https://registry.npmjs.org/node-promise/-/node-promise-0.5.14.tgz", - "integrity": "sha512-kbd+ABY2XRdByRVHPcBDemymfNL8+msGyKNxG/ziZnh9RjneuuGQl3/CE5UkNWxCInkJS+ztc5B31/t2kIO4Yw==" - }, "node_modules/nopt": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.0.0.tgz", @@ -5594,12 +5589,10 @@ } }, "node_modules/uikit": { - "version": "2.27.4", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-2.27.4.tgz", - "integrity": "sha512-dylNikIJ8sB6Sd1AP6YETb+R5bIkjTnGeuu/yLhO9elQ4oLu8CIA+u5zCC7a9m7axbDUALy12qr32nvgRyO5HA==", - "dependencies": { - "node-promise": "^0.5.10" - } + "version": "3.23.1", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.23.1.tgz", + "integrity": "sha512-WuC7cB44/BGZ02IDaesEY2CvtEQtK88rdJv4X3AyqrZOU1FYoLGJBXhMKnT2VvpDeGS3owVA7FPDmJLkjdD8Tw==", + "license": "MIT" }, "node_modules/umd": { "version": "3.0.3", diff --git a/package.json b/package.json index bb49a3e2..ee70939f 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "jquery": "3.7.1", "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4", "js-md5": "0.8.3", - "uikit": "2.27.4" + "uikit": "3.23.1" }, "devDependencies": { "browserify": "17.0.1",