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

Make deploy script executable
Fix regression of Java sources not being processed before compiling
2025-04-11 13:22:10 +02:00 · 2025-04-11 12:41:44 +02:00 · 2025-04-11 11:48:32 +02:00
2 changed files with 6 additions and 2 deletions
--- 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
--- a/src/dist/extras/deploy.sh
+++ b/src/dist/extras/deploy.sh
Author	SHA1	Message	Date
Tobi Schäfer	745ce5bfca	Merge branch 'main' into renovate/major-jetty-packages	2025-04-11 13:22:10 +02:00
Tobi Schäfer	c4abd27ac7	Make deploy script executable All checks were successful Build / build (push) Successful in 11s Details	2025-04-11 12:41:44 +02:00
Tobi Schäfer	6b88318bcd	Fix regression of Java sources not being processed before compiling All checks were successful Build / build (push) Successful in 11s Details	2025-04-11 11:48:32 +02:00