Compare commits

..

2 commits

Author SHA1 Message Date
ef56d0e397 Update dependency uikit to v3
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2025-02-22 10:42:50 +00:00
12023e23e0
Fix issue with modern Servlet API 2025-02-15 21:06:27 +01:00
3 changed files with 18 additions and 9 deletions

View file

@ -254,9 +254,18 @@ Root.prototype.sitemap_xml_action = function() {
} }
Root.prototype.health_action = function() { Root.prototype.health_action = function() {
var jvm = java.lang.Runtime.getRuntime(); const jvm = java.lang.Runtime.getRuntime();
var totalMemory = jvm.totalMemory() / 1024 / 1024; const totalMemory = jvm.totalMemory() / 1024 / 1024;
var freeMemory = jvm.freeMemory() / 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 = { var param = {
uptime: formatNumber((new Date - app.upSince.getTime()) / Date.ONEDAY, '0.##'), 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, helmaCommitHash: Packages.helma.main.Server.server.commitHash,
jetty: Packages.org.eclipse.jetty.util.Jetty.VERSION, jetty: Packages.org.eclipse.jetty.util.Jetty.VERSION,
rhino: Packages.org.mozilla.javascript.ImplementationVersion.get(), 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') java: java.lang.System.getProperty('java.version')
}; };

8
package-lock.json generated
View file

@ -14,7 +14,7 @@
"jquery": "3.7.1", "jquery": "3.7.1",
"jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4", "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4",
"js-md5": "0.8.3", "js-md5": "0.8.3",
"uikit": "3.23.0" "uikit": "3.23.1"
}, },
"devDependencies": { "devDependencies": {
"browserify": "17.0.1", "browserify": "17.0.1",
@ -5589,9 +5589,9 @@
} }
}, },
"node_modules/uikit": { "node_modules/uikit": {
"version": "3.23.0", "version": "3.23.1",
"resolved": "https://registry.npmjs.org/uikit/-/uikit-3.23.0.tgz", "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.23.1.tgz",
"integrity": "sha512-8lPL2pzmtvDga1wVnHOKpyG1vL1d68hSYLwu7eHmtY0s+1h6v/J+f9vKvW9EBW5mRbyirOanq+4DgE0ybcDemw==", "integrity": "sha512-WuC7cB44/BGZ02IDaesEY2CvtEQtK88rdJv4X3AyqrZOU1FYoLGJBXhMKnT2VvpDeGS3owVA7FPDmJLkjdD8Tw==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/umd": { "node_modules/umd": {

View file

@ -36,7 +36,7 @@
"jquery": "3.7.1", "jquery": "3.7.1",
"jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4", "jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4",
"js-md5": "0.8.3", "js-md5": "0.8.3",
"uikit": "3.23.0" "uikit": "3.23.1"
}, },
"devDependencies": { "devDependencies": {
"browserify": "17.0.1", "browserify": "17.0.1",