Merge branch 'main' into origin/renovate/major-jetty-packages

# Conflicts: # build.gradle
2025-01-10 20:09:53 +01:00 · 2025-01-10 20:09:53 +01:00 · 11b226b272
commit 11b226b272
parent 1925916220 44f2375749
9 changed files with 30 additions and 31 deletions
--- a/src/main/java/helma/main/Server.java
+++ b/src/main/java/helma/main/Server.java
@ -36,7 +36,13 @@ import helma.util.ResourceProperties;
 */
 public class Server implements Runnable {
    // version string
-    public static final String version = "🐜 (__builddate__)";
+    public static final String version = "🐜";
+
+    // build date
+    public static final String buildDate = "__builddate__";
+
+    // commit hash
+    public static final String commitHash = "__commithash__";

    // static server instance
    private static Server server;