From 9dee4993f1e0e553915839ecd0aa6cb66d39811f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 11 Apr 2025 00:04:34 +0200 Subject: [PATCH 1/4] Do not use non-ASCII charaters in Java source code, yet --- src/main/java/helma/main/ApplicationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helma/main/ApplicationManager.java b/src/main/java/helma/main/ApplicationManager.java index e699a8d8..0e4750e5 100644 --- a/src/main/java/helma/main/ApplicationManager.java +++ b/src/main/java/helma/main/ApplicationManager.java @@ -500,7 +500,7 @@ public class ApplicationManager implements XmlRpcHandler { staticContext.start(); } - // I hope I am correct assuming Helma does not need Jetty’s session management, but using + // I hope I am correct assuming Helma does not need Jetty's session management, but using // `ServletContextHandler.SESSIONS` causes an exception: Shared scheduler not started appContext = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); appContext.setContextPath(pathPattern); From 6b88318bcdbdb78427499ae36f984872059e11da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 11 Apr 2025 11:44:35 +0200 Subject: [PATCH 2/4] Fix regression of Java sources not being processed before compiling --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 63d5400e..25eef9d1 100644 --- a/build.gradle +++ b/build.gradle @@ -147,9 +147,11 @@ installDist { dependsOn build } -tasks.register('processSource', Sync) { +def processSource = tasks.register('processSource', Sync) { def gitOutput = new ByteArrayOutputStream() + outputs.dir "${project.buildDir}/src" + exec { commandLine 'git', 'rev-parse', '--short', 'HEAD' standardOutput = gitOutput @@ -164,9 +166,11 @@ tasks.register('processSource', Sync) { .replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__commithash__', gitOutput.toString().trim()) .replaceAll('__version__', version) - } into "${project.buildDir}/src" + } into outputs.files.singleFile } +tasks.compileJava.source = processSource.map { it.outputs.files } + tasks.register('update') { dependsOn installDist From 2ec02c79403854d03ea5928e7d147cb78fa445b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 11 Apr 2025 12:23:53 +0200 Subject: [PATCH 3/4] Revert "Do not use non-ASCII charaters in Java source code, yet" This reverts commit 9dee4993f1e0e553915839ecd0aa6cb66d39811f. --- src/main/java/helma/main/ApplicationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helma/main/ApplicationManager.java b/src/main/java/helma/main/ApplicationManager.java index 0e4750e5..e699a8d8 100644 --- a/src/main/java/helma/main/ApplicationManager.java +++ b/src/main/java/helma/main/ApplicationManager.java @@ -500,7 +500,7 @@ public class ApplicationManager implements XmlRpcHandler { staticContext.start(); } - // I hope I am correct assuming Helma does not need Jetty's session management, but using + // I hope I am correct assuming Helma does not need Jetty’s session management, but using // `ServletContextHandler.SESSIONS` causes an exception: Shared scheduler not started appContext = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); appContext.setContextPath(pathPattern); From 98854ac3c9bfd122873420ccfc238e1f9b55a9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 11 Apr 2025 11:44:35 +0200 Subject: [PATCH 4/4] Fix regression of Java sources not being processed before compiling --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2b6ac197..cd60e214 100644 --- a/build.gradle +++ b/build.gradle @@ -148,9 +148,11 @@ installDist { dependsOn build } -tasks.register('processSource', Sync) { +def processSource = tasks.register('processSource', Sync) { def gitOutput = new ByteArrayOutputStream() + outputs.dir "${project.buildDir}/src" + exec { commandLine 'git', 'rev-parse', '--short', 'HEAD' standardOutput = gitOutput @@ -165,9 +167,11 @@ tasks.register('processSource', Sync) { .replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__commithash__', gitOutput.toString().trim()) .replaceAll('__version__', version) - } into "${project.buildDir}/src" + } into outputs.files.singleFile } +tasks.compileJava.source = processSource.map { it.outputs.files } + tasks.register('update') { dependsOn installDist