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

# Conflicts:
#	build.gradle
This commit is contained in:
Tobi Schäfer 2025-01-10 20:09:53 +01:00
commit 11b226b272
Signed by: tobi
GPG key ID: 91FAE6FE2EBAC4C8
9 changed files with 30 additions and 31 deletions

View file

@ -1,18 +1,14 @@
name: Deploy (Production) name: Deploy (Production)
on: on: workflow_dispatch
workflow_dispatch: {}
push:
branches:
- helma-🐜
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: environment:
name: p3k.org name: weblogs.at
url: https://blog.p3k.org url: https://weblogs.at
steps: steps:
- name: Set up SSH agent - name: Set up SSH agent

View file

@ -8,7 +8,7 @@ jobs:
environment: environment:
name: stage name: stage
url: https://antville-test.click url: https://antville-test.online
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

View file

@ -17,8 +17,10 @@ def textFiles = ['**/*.hac', '**/.html', '**/*.js', '**/*.md', '**/*.properties'
allprojects { allprojects {
apply plugin: 'java' apply plugin: 'java'
java {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
}
repositories { repositories {
mavenCentral() mavenCentral()
@ -155,31 +157,26 @@ installDist {
dependsOn build dependsOn build
} }
task processSource(type: Sync) { tasks.register('processSource', Sync) {
def date = new Date().format("d MMMM yyyy")
def gitOutput = new ByteArrayOutputStream() def gitOutput = new ByteArrayOutputStream()
exec { exec {
commandLine 'git', 'describe' commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = gitOutput standardOutput = gitOutput
errorOutput = new ByteArrayOutputStream() errorOutput = new ByteArrayOutputStream()
ignoreExitValue = true ignoreExitValue = true
} }
def description = date
def tag = gitOutput.toString().trim()
// TODO: Implement extended description in Java code
if (tag) description = "$tag; $description"
from 'src' from 'src'
filter { filter {
line -> line.replaceAll('__builddate__', date) line -> line
.replaceAll('__builddate__', new Date().format("d MMM yyyy"))
.replaceAll('__commithash__', gitOutput.toString().trim())
} into "${project.buildDir}/src" } into "${project.buildDir}/src"
} }
task update { tasks.register('update') {
dependsOn installDist dependsOn installDist
def rsyncArgs = ['--archive', '--filter', '- backups'] def rsyncArgs = ['--archive', '--filter', '- backups']
@ -225,7 +222,7 @@ task update {
} }
} }
task jsdoc(type: Exec) { tasks.register('jsdoc', Exec) {
description 'Generates JSDoc API documentation for the included JavaScript modules.' description 'Generates JSDoc API documentation for the included JavaScript modules.'
group 'Documentation' group 'Documentation'
@ -239,7 +236,7 @@ task jsdoc(type: Exec) {
args = ['jsdoc', '-d', "$destination"].plus(sources) args = ['jsdoc', '-d', "$destination"].plus(sources)
} }
task xgettext(type: JavaExec) { tasks.register('xgettext', JavaExec) {
description 'Extracts translatable message strings from source code.' description 'Extracts translatable message strings from source code.'
group 'i18n' group 'i18n'
@ -256,7 +253,7 @@ task xgettext(type: JavaExec) {
] ]
} }
task po2js(type: JavaExec) { tasks.register('po2js', JavaExec) {
description 'Converts translated message strings from PO format to JavaScript.' description 'Converts translated message strings from PO format to JavaScript.'
group 'i18n' group 'i18n'
@ -271,7 +268,7 @@ task po2js(type: JavaExec) {
] ]
} }
task rhinoShell(type: JavaExec) { tasks.register('rhinoShell', JavaExec) {
description 'Runs the interactive Rhino JavaScript shell.' description 'Runs the interactive Rhino JavaScript shell.'
group 'Application' group 'Application'
@ -283,7 +280,7 @@ task rhinoShell(type: JavaExec) {
// Call this task with a function definition using the `-P` parameter, e.g. // Call this task with a function definition using the `-P` parameter, e.g.
// `./gradlew commandLine -Pfunction=manage.getAllApplications` // `./gradlew commandLine -Pfunction=manage.getAllApplications`
task commandLine(type: JavaExec) { tasks.register('commandLine', JavaExec) {
description 'Runs a function in a Helma application with `-Pfunction=app.functionName`.' description 'Runs a function in a Helma application with `-Pfunction=app.functionName`.'
group 'Application' group 'Application'

0
lib/ext/.keep Normal file
View file

View file

@ -12,7 +12,7 @@ processResources.enabled = false
processTestResources.enabled = false processTestResources.enabled = false
test.enabled = false test.enabled = false
task deps(type: Copy) { tasks.register('deps', Copy) {
from sourceSets.main.runtimeClasspath from sourceSets.main.runtimeClasspath
into '.' into '.'
} }

View file

@ -15,7 +15,7 @@ processResources.enabled = false
processTestResources.enabled = false processTestResources.enabled = false
test.enabled = false test.enabled = false
task deps(type: Copy) { tasks.register('deps', Copy) {
from sourceSets.main.runtimeClasspath from sourceSets.main.runtimeClasspath
into 'lib' into 'lib'
} }

View file

@ -10,7 +10,7 @@ processResources.enabled = false
processTestResources.enabled = false processTestResources.enabled = false
test.enabled = false test.enabled = false
task deps(type: Copy) { tasks.register('deps', Copy) {
from sourceSets.main.runtimeClasspath from sourceSets.main.runtimeClasspath
into 'lib' into 'lib'
} }

View file

@ -10,7 +10,7 @@ processResources.enabled = false
processTestResources.enabled = false processTestResources.enabled = false
test.enabled = false test.enabled = false
task deps(type: Copy) { tasks.register('deps', Copy) {
from sourceSets.main.runtimeClasspath from sourceSets.main.runtimeClasspath
into 'code' into 'code'
} }

View file

@ -36,7 +36,13 @@ import helma.util.ResourceProperties;
*/ */
public class Server implements Runnable { public class Server implements Runnable {
// version string // 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 // static server instance
private static Server server; private static Server server;